[PR PATCH] New package: wally-cli-2.0.0

[PR PATCH] New package: wally-cli-2.0.0

[waynevanson]

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

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

https://github.com/waynevanson/void-packages package/wally-cli
https://github.com/void-linux/void-packages/pull/28000

New package: wally-cli-2.0.0


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/wally-cli-28000.patch --]
[-- Type: text/x-diff, Size: 3994 bytes --]

From 0bb01bcd94dabd189ee75afb7526410f7a7879f6 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 18 Jan 2021 16:17:48 +0000
Subject: [PATCH] New package: wally-cli-2.0.0

---
 srcpkgs/wally-cli/patches/license.diff | 26 +++++++++++++++++++
 srcpkgs/wally-cli/template             | 36 ++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 srcpkgs/wally-cli/patches/license.diff
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/patches/license.diff b/srcpkgs/wally-cli/patches/license.diff
new file mode 100644
index 00000000000..a6ccf686666
--- /dev/null
+++ b/srcpkgs/wally-cli/patches/license.diff
@@ -0,0 +1,26 @@
+From b832f6b1997c0a7ee206e08f3d03127885378265 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
+ <Mailaender@users.noreply.github.com>
+Date: Sat, 16 Jan 2021 11:25:55 +0100
+Subject: [PATCH] Create license.md
+
+---
+ license.md | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 license.md
+
+diff --git license.md license.md
+new file mode 100644
+index 0000000..45bbd40
+--- /dev/null
++++ license.md
+@@ -0,0 +1,9 @@
++## License (MIT)
++
++Copyright 2019-2020, ZSA Technology Labs Inc.
++
++Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 00000000000..b5e889edb2d
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,36 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+archs="x86_64"
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+go_import_path="github.com/zsa/wally-cli"
+
+post_install() {
+    # license is in the wally-cli/patches/license.diff
+    # see PR for license https://github.com/zsa/wally-cli/pull/3/commits/b832f6b1997c0a7ee206e08f3d03127885378265
+    vlicense license.md
+
+    # WALLY UDEV RULE FOR DEVICE RELATED EVENT
+    cat <<EOF | sudo tee /etc/udev/rules.d/50-wally.rules
+    # Teensy rules for the Ergodox EZ
+    ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+    ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+    KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+    # STM32 rules for the Moonlander and Planck EZ
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
+EOF
+
+    # ADD USER TO PLUGDEV GROUP
+    groupadd plugdev
+    usermod -aG plugdev "$USER"
+}

Re: [PR PATCH] [Updated] New package: wally-cli-2.0.0

[waynevanson]

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

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

https://github.com/waynevanson/void-packages package/wally-cli
https://github.com/void-linux/void-packages/pull/28000

New package: wally-cli-2.0.0


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/wally-cli-28000.patch --]
[-- Type: text/x-diff, Size: 3949 bytes --]

From c51b29397f9abc584a9b89ef0e9c62253d2d742d Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 18 Jan 2021 16:17:48 +0000
Subject: [PATCH] New package: wally-cli-2.0.0

---
 srcpkgs/wally-cli/patches/license.diff | 26 +++++++++++++++++++
 srcpkgs/wally-cli/template             | 36 ++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 srcpkgs/wally-cli/patches/license.diff
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/patches/license.diff b/srcpkgs/wally-cli/patches/license.diff
new file mode 100644
index 00000000000..a6ccf686666
--- /dev/null
+++ b/srcpkgs/wally-cli/patches/license.diff
@@ -0,0 +1,26 @@
+From b832f6b1997c0a7ee206e08f3d03127885378265 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
+ <Mailaender@users.noreply.github.com>
+Date: Sat, 16 Jan 2021 11:25:55 +0100
+Subject: [PATCH] Create license.md
+
+---
+ license.md | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 license.md
+
+diff --git license.md license.md
+new file mode 100644
+index 0000000..45bbd40
+--- /dev/null
++++ license.md
+@@ -0,0 +1,9 @@
++## License (MIT)
++
++Copyright 2019-2020, ZSA Technology Labs Inc.
++
++Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 00000000000..132da9069a3
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,36 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+archs="x86_64"
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+go_import_path="github.com/zsa/wally-cli"
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+
+post_install() {
+	# license is in the wally-cli/patches/license.diff
+	# see PR for license https://github.com/zsa/wally-cli/pull/3/commits/b832f6b1997c0a7ee206e08f3d03127885378265
+	vlicense license.md
+
+	# WALLY UDEV RULE FOR DEVICE RELATED EVENT
+	cat <<EOF | sudo tee /etc/udev/rules.d/50-wally.rules
+	# Teensy rules for the Ergodox EZ
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+	KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+	# STM32 rules for the Moonlander and Planck EZ
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
+EOF
+
+	# ADD USER TO PLUGDEV GROUP
+	groupadd plugdev
+	usermod -aG plugdev "$USER"
+}

Re: New package: wally-cli-2.0.0

[Piraty]

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#issuecomment-762298989

Comment:
[NOMERGE] until upstream settles on a license. https://github.com/zsa/wally-cli/issues/2

Re: [PR PATCH] [Updated] [NOMERGE] New package: wally-cli-2.0.0

[waynevanson]

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

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

https://github.com/waynevanson/void-packages package/wally-cli
https://github.com/void-linux/void-packages/pull/28000

[NOMERGE] New package: wally-cli-2.0.0


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/wally-cli-28000.patch --]
[-- Type: text/x-diff, Size: 2603 bytes --]

From 88dc212dd2a9df46a5377ce3dfb1491481153b34 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 18 Jan 2021 16:17:48 +0000
Subject: [PATCH] New package: wally-cli-2.0.0

---
 srcpkgs/wally-cli/INSTALL  | 12 ++++++++++++
 srcpkgs/wally-cli/template | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 srcpkgs/wally-cli/INSTALL
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/INSTALL b/srcpkgs/wally-cli/INSTALL
new file mode 100644
index 00000000000..11bde37ab92
--- /dev/null
+++ b/srcpkgs/wally-cli/INSTALL
@@ -0,0 +1,12 @@
+case "$ACTION" in
+post)
+    if [ "$UPDATE" = "no" ]; then
+        # Add $USER
+        usermod -aG plugdev "$USER"
+        echo "Please add your user to the group 'plugdev' by executing the following:"
+        echo "usermod -aG plugdev \"$USER\""
+
+    fi
+
+    ;;
+esac
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 00000000000..b938c2df6d7
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,35 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+archs="x86_64"
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+go_import_path="github.com/zsa/wally-cli"
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+conf_files="/usr/lib/udev/rules.d/50-wally.rules"
+system_groups="plugdev"
+
+post_install() {
+	# 	# [NOMERGE] - License required by package
+	# 	# https://github.com/zsa/wally-cli/pull/3/commits/b832f6b1997c0a7ee206e08f3d03127885378265
+	vlicense license.md
+
+	# WALLY UDEV RULE FOR DEVICE RELATED EVENT
+	vmkdir /usr/lib/udev/rules.d/
+	cat <<EOF | tee "$PKGDESTDIR/usr/lib/udev/rules.d/50-wally.rules"
+	# Teensy rules for the Ergodox EZ
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+	KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+	# STM32 rules for the Moonlander and Planck EZ
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
+EOF
+}

Re: [PR PATCH] [Updated] [NOMERGE] New package: wally-cli-2.0.0

[waynevanson]

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

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

https://github.com/waynevanson/void-packages package/wally-cli
https://github.com/void-linux/void-packages/pull/28000

[NOMERGE] New package: wally-cli-2.0.0


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/wally-cli-28000.patch --]
[-- Type: text/x-diff, Size: 2439 bytes --]

From f934b9d8ecdb3a9163a31dcd6e73a99a5488b816 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 18 Jan 2021 16:17:48 +0000
Subject: [PATCH] New package: wally-cli-2.0.0

---
 srcpkgs/wally-cli/INSTALL.msg |  2 ++
 srcpkgs/wally-cli/template    | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/wally-cli/INSTALL.msg
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/INSTALL.msg b/srcpkgs/wally-cli/INSTALL.msg
new file mode 100644
index 00000000000..c160cdb19fc
--- /dev/null
+++ b/srcpkgs/wally-cli/INSTALL.msg
@@ -0,0 +1,2 @@
+Please add your user to the group 'plugdev' by executing the following:
+usermod -aG plugdev \"$USER\"
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 00000000000..b938c2df6d7
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,35 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+archs="x86_64"
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+go_import_path="github.com/zsa/wally-cli"
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+conf_files="/usr/lib/udev/rules.d/50-wally.rules"
+system_groups="plugdev"
+
+post_install() {
+	# 	# [NOMERGE] - License required by package
+	# 	# https://github.com/zsa/wally-cli/pull/3/commits/b832f6b1997c0a7ee206e08f3d03127885378265
+	vlicense license.md
+
+	# WALLY UDEV RULE FOR DEVICE RELATED EVENT
+	vmkdir /usr/lib/udev/rules.d/
+	cat <<EOF | tee "$PKGDESTDIR/usr/lib/udev/rules.d/50-wally.rules"
+	# Teensy rules for the Ergodox EZ
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+	KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+	# STM32 rules for the Moonlander and Planck EZ
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
+EOF
+}

Re: [PR PATCH] [Updated] [NOMERGE] New package: wally-cli-2.0.0

[waynevanson]

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

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

https://github.com/waynevanson/void-packages package/wally-cli
https://github.com/void-linux/void-packages/pull/28000

[NOMERGE] New package: wally-cli-2.0.0


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/wally-cli-28000.patch --]
[-- Type: text/x-diff, Size: 2440 bytes --]

From 999a47cfe0f71acbdba34e0ffd70fbf3a8a55a02 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 18 Jan 2021 16:17:48 +0000
Subject: [PATCH] New package: wally-cli-2.0.0

---
 srcpkgs/wally-cli/INSTALL.msg |  2 ++
 srcpkgs/wally-cli/template    | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/wally-cli/INSTALL.msg
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/INSTALL.msg b/srcpkgs/wally-cli/INSTALL.msg
new file mode 100644
index 00000000000..bf74d3bf595
--- /dev/null
+++ b/srcpkgs/wally-cli/INSTALL.msg
@@ -0,0 +1,2 @@
+Please add your user to the group 'plugdev' by executing the following:
+usermod -aG plugdev \"\$USER\"
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 00000000000..b938c2df6d7
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,35 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+archs="x86_64"
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+go_import_path="github.com/zsa/wally-cli"
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+conf_files="/usr/lib/udev/rules.d/50-wally.rules"
+system_groups="plugdev"
+
+post_install() {
+	# 	# [NOMERGE] - License required by package
+	# 	# https://github.com/zsa/wally-cli/pull/3/commits/b832f6b1997c0a7ee206e08f3d03127885378265
+	vlicense license.md
+
+	# WALLY UDEV RULE FOR DEVICE RELATED EVENT
+	vmkdir /usr/lib/udev/rules.d/
+	cat <<EOF | tee "$PKGDESTDIR/usr/lib/udev/rules.d/50-wally.rules"
+	# Teensy rules for the Ergodox EZ
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+	KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+	# STM32 rules for the Moonlander and Planck EZ
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
+EOF
+}

Re: [NOMERGE] New package: wally-cli-2.0.0

[waynevanson]

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

New comment by waynevanson on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#issuecomment-798823974

Comment:
https://github.com/zsa/wally-cli/issues/2 has been closed.

Re: [PR PATCH] [Updated] New package: wally-cli-2.0.0

[waynevanson]

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

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

https://github.com/waynevanson/void-packages package/wally-cli
https://github.com/void-linux/void-packages/pull/28000

New package: wally-cli-2.0.0


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/wally-cli-28000.patch --]
[-- Type: text/x-diff, Size: 10018950 bytes --]

From 999a47cfe0f71acbdba34e0ffd70fbf3a8a55a02 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 18 Jan 2021 16:17:48 +0000
Subject: [PATCH 0001/3458] New package: wally-cli-2.0.0

---
 srcpkgs/wally-cli/INSTALL.msg |  2 ++
 srcpkgs/wally-cli/template    | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 srcpkgs/wally-cli/INSTALL.msg
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/INSTALL.msg b/srcpkgs/wally-cli/INSTALL.msg
new file mode 100644
index 000000000000..bf74d3bf5954
--- /dev/null
+++ b/srcpkgs/wally-cli/INSTALL.msg
@@ -0,0 +1,2 @@
+Please add your user to the group 'plugdev' by executing the following:
+usermod -aG plugdev \"\$USER\"
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 000000000000..b938c2df6d73
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,35 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+archs="x86_64"
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+go_import_path="github.com/zsa/wally-cli"
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+conf_files="/usr/lib/udev/rules.d/50-wally.rules"
+system_groups="plugdev"
+
+post_install() {
+	# 	# [NOMERGE] - License required by package
+	# 	# https://github.com/zsa/wally-cli/pull/3/commits/b832f6b1997c0a7ee206e08f3d03127885378265
+	vlicense license.md
+
+	# WALLY UDEV RULE FOR DEVICE RELATED EVENT
+	vmkdir /usr/lib/udev/rules.d/
+	cat <<EOF | tee "$PKGDESTDIR/usr/lib/udev/rules.d/50-wally.rules"
+	# Teensy rules for the Ergodox EZ
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+	KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+	# STM32 rules for the Moonlander and Planck EZ
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
+EOF
+}

From cbe48d789186178274da2be4cba9cb6d70823519 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Wed, 13 Jan 2021 14:19:21 +0100
Subject: [PATCH 0002/3458] 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 7a7260a14653ce42d7de09c01f4f94a24bdc6630 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 18 Jan 2021 10:16:38 +0100
Subject: [PATCH 0003/3458] 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 9807dda039cbe88e524a9c0bdaadbf346f65e5ad Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 18 Jan 2021 10:32:57 +0100
Subject: [PATCH 0004/3458] 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 a58e1553a679642c5aed20c3231b986cfbb469f2 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 18 Jan 2021 10:43:04 +0100
Subject: [PATCH 0005/3458] 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 f7f63f2a854f5cf3b8ed20ea5299b0b50343eea0 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 0006/3458] 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 b61c1c3573365bd4cbc0e05bb2af2c935cb22b9a 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 0007/3458] 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 528cd1bd768ab10ecf0882dbba2267a4f62ece4f 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 0008/3458] 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 482a2a973a977e9ba78e39d7a10fc172fc1da5b1 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 0009/3458] 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 75588e82384030c09ee3fa851e7207cc8a8c4cf3 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 0010/3458] 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 67f01357e499bedca4be7c2d736cec85571c4c8f 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 0011/3458] 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 902d8247704a7852c88bb7b8c4f5b78f050cd98d 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 0012/3458] 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 e3bee0b34c69562271a63baf5531d4bc91f4ed76 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 0013/3458] 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 8039044acdf05522494a4ab3f386693364083588 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 0014/3458] 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 ebf70beb3cb4fb75376016bb485fa002e67cfb31 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 0015/3458] 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 78fe5703cf586b19fe6ac4fcfd5b906b4342bfba Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 26 Oct 2019 00:56:58 +0200
Subject: [PATCH 0016/3458] .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 52510e3135bf28e325150cba4b36a049765d9566 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Jan 2021 10:33:23 +0100
Subject: [PATCH 0017/3458] 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 3494d68770b41cdf5739f870cccb5342d25f3b8f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Jan 2021 10:34:11 +0100
Subject: [PATCH 0018/3458] 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 fd503ad3fc17525087bf1ba9afa17553a5695910 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 18 Jan 2021 14:01:24 +0100
Subject: [PATCH 0019/3458] .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 5c49b3ba3f6945f4c0309865d657086cd80bcc97 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 0020/3458] 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 1caebdbd7b102607967fe6583434c501f73db0ba 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 0021/3458] 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 3bd2fdb415d3d59a1b631af2b8e03178ee040fff 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 0022/3458] 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 c4c16702a33bec4ef57e3d569b7c888920f89bd2 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 0023/3458] 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 27f23d5748337cc1920b455cfc9c7e37f2c4bc66 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 0024/3458] 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 3a8eddf1cd21ceade3c65fcc3e67dbed0ccc2f09 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 0025/3458] 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 9ded2b2e89b96006e65a53940e72445e286a53fe 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 0026/3458] 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 5bf50725ae419de4111830b41d0eafc21f57eb5d 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 0027/3458] 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 fdd258ed324e2497420175de4660b291dd310d82 Mon Sep 17 00:00:00 2001
From: Nafis <mnabid.25@outlook.com>
Date: Mon, 18 Jan 2021 13:02:58 +0600
Subject: [PATCH 0028/3458] 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 8ff776918da1ac18df88cbf8f69094c88bba7ea7 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 0029/3458] 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 3aefa4978def07dcace10633cad67d4b4e9b0b30 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 0030/3458] 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 1b690aef7964a323943957926e143d8fe1695587 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 0031/3458] 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 8fb95d9d4d240143c3fae0125b4d89ff068776df 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 0032/3458] 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 cdd98f71a007423cb75a9daf302a0c58255eff6f 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 0033/3458] 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 56385c9439186d094867d7edaaf382cdf54f7795 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 12 Jan 2021 23:21:31 +0200
Subject: [PATCH 0034/3458] 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 dbe0bf32115cd2769030e33af54c9c9bbaf98005 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 0035/3458] 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 66c89014a4292354ffc60d51ab294ada68e1fd58 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 0036/3458] 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 b86eead95fbadb5870a28898a47591804118ec8b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 7 Jan 2021 00:36:39 +0200
Subject: [PATCH 0037/3458] 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 4f0ae3552f9c9ac4cd03967be274c0eb3288f04f 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 0038/3458] 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 bbbc4638f6da3e5dcb31e8ff5ca5e8b7690afd21 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 12 Jan 2021 06:52:49 +0100
Subject: [PATCH 0039/3458] 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 9be6fa25ffc20ed712cfe6546988cae836bb178f 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 0040/3458] 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 b401f2140a64adaa8eb1b17a4672a612921c079b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 4 Jan 2021 20:42:38 +1100
Subject: [PATCH 0041/3458] 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 022c901d295d9a996a083146ec4c854f52e14df8 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Mon, 4 Jan 2021 20:42:51 +1100
Subject: [PATCH 0042/3458] 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 6207895baf654778771baf609718a0150f36dca5 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 0043/3458] 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 b69521cdb61f84f571d3b5b14d5a2ba5b55e267b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 18 Jan 2021 23:20:52 +0100
Subject: [PATCH 0044/3458] 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 f561c16761908d1c259389a0c584f88fc48ddaa8 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 0045/3458] 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 c565f9c4cbed6ac0393b145c565a375b528a6d6e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 11 Jan 2021 17:40:16 -0600
Subject: [PATCH 0046/3458] 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 1cc33ea5774bfa8c520153a504dbc0e183539672 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 11 Jan 2021 17:40:17 -0600
Subject: [PATCH 0047/3458] 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 e1e95755299038c695dd3e1dc0f179e4e4a2f854 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 11 Jan 2021 17:40:17 -0600
Subject: [PATCH 0048/3458] 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 6ead7f9deecf631114995e4d1f1396a43d739919 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 0049/3458] 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 11aade61cd0b62fdb9a2a5ba0c2228ff234bb13b 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 0050/3458] 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 ca0c7df0c4757b412b5db38529f004be4abca2ea 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 0051/3458] 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 a31b2fb3aa087cf643f5c0bf2ca25686be88e5db 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 0052/3458] 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 95f821dab37943709d72b33a03e071d3000d0eff 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 0053/3458] 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 a74f7797fa71e779a331334f2f9d4b0956a54de9 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 0054/3458] 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 0950427761149e7540587f584dc26c0bce1d963b Mon Sep 17 00:00:00 2001
From: Anshul Sirur <anshul@vixus0.dev>
Date: Mon, 18 Jan 2021 14:24:52 +0100
Subject: [PATCH 0055/3458] 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 28674433e6a9cbbe4f5bb8885d6aced95f9dccb3 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 0056/3458] 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 0eef2871e3c951005f7da61835d5b99902b0c7b9 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 19 Jan 2021 15:24:46 +0100
Subject: [PATCH 0057/3458] 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 a99671c38c2edf2fc61ead746bc71f28cb7bede7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 14:40:13 +0100
Subject: [PATCH 0058/3458] 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 a0bd7a01e1813e6ae2d31fbf8eb2ee3dfe3dc777 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 14:40:38 +0100
Subject: [PATCH 0059/3458] 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 0932104fc4881be65f248ac8c4668bd0f1a9df27 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 14:52:30 +0100
Subject: [PATCH 0060/3458] 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 953389d9c63eddf4874ecd37452c663a73775ed8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 14:55:47 +0100
Subject: [PATCH 0061/3458] 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 3e53ada9a91b3d7d4529a296d1ef760d79f0ee88 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Jan 2021 15:12:18 +0100
Subject: [PATCH 0062/3458] 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 1e6393945ec0b690db08a370d5446b213fd52f9e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 19 Jan 2021 19:05:08 +0100
Subject: [PATCH 0063/3458] 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 58ff2538c6b149f15c0f5cd957b1fd309803f1aa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 19 Jan 2021 19:15:44 +0100
Subject: [PATCH 0064/3458] 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 2733e113b804e6527fa7ec9d12fabb8dd71333d1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:31:50 +1100
Subject: [PATCH 0065/3458] 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 ae2bd797a1ba9a37b23a8ba1aa9042557260ee2c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:24:33 +1100
Subject: [PATCH 0066/3458] 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 8f959a5c5a3af1ae917e4bf97d4aaf61f7e388da Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:25:09 +1100
Subject: [PATCH 0067/3458] 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 1a2ad3e9d43fc9a3c380ff014c0a4f866a3665c2 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:25:31 +1100
Subject: [PATCH 0068/3458] 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 1c00a8eff721073bd1e8c816586353d6e45e4742 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:25:50 +1100
Subject: [PATCH 0069/3458] 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 ddc290b9a798529f61c4052c7aeea8c34604d941 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:26:10 +1100
Subject: [PATCH 0070/3458] 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 b7a318cba7449c347bbd8eb4169f925e7ab9d191 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:26:48 +1100
Subject: [PATCH 0071/3458] 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 c0fb85c543c3f6ed975a95a69f7518fd8d693be5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:27:17 +1100
Subject: [PATCH 0072/3458] 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 714703a5e6b7af5faab9cca3a86b2564b813fe72 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:27:43 +1100
Subject: [PATCH 0073/3458] 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 6361d21df332dcf6c0e65fe41d9ecb15c4f17666 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:28:05 +1100
Subject: [PATCH 0074/3458] 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 711c3e849529207417802503a55d80e067a159f1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:28:30 +1100
Subject: [PATCH 0075/3458] 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 10975ff18ab29fb0f139d6f2fd3f5266e70a369a Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:28:51 +1100
Subject: [PATCH 0076/3458] 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 1ae04587191820a739fae20284d18a573bd71d8c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:29:12 +1100
Subject: [PATCH 0077/3458] 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 8eb5c630f83b26bfbc9b38e34e0aeb7bb6323583 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:29:36 +1100
Subject: [PATCH 0078/3458] 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 fe48f3221eb6101e837699fcc6b8dfc2dd6d16c2 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:29:54 +1100
Subject: [PATCH 0079/3458] 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 194f9c5dd5fd6484112a7baaf938521023eac4cd Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:30:10 +1100
Subject: [PATCH 0080/3458] 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 9a512ed01bc06009ed79b59f955d22d522d0f5b9 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:30:32 +1100
Subject: [PATCH 0081/3458] 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 8af5e9e7ccc93c86a91dea5fd7dc13bc833d7f13 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:30:51 +1100
Subject: [PATCH 0082/3458] 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 2f98c89f30c0d49e78295fc51b7376153104c56f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:31:09 +1100
Subject: [PATCH 0083/3458] 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 ae3e345b9f1742d297e5c926b7567be8d5c4651b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:32:42 +1100
Subject: [PATCH 0084/3458] 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 4cc917405d741dade2c59f9132910ff5a908fd04 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:33:02 +1100
Subject: [PATCH 0085/3458] 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 7914ccef851c5d1ff1da00e57aac86dceac7ff39 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:33:16 +1100
Subject: [PATCH 0086/3458] 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 33365afb4f1002d1eaa7c65a830d39dff4dfc9f8 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:33:29 +1100
Subject: [PATCH 0087/3458] 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 42f65609b08fd3e8059c6a51d82f797bbd93b1ce Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 31 Dec 2020 11:33:39 +1100
Subject: [PATCH 0088/3458] 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 086a3edabf0bd3505937d1696d13be29eec89747 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 0089/3458] 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 be2d8e2cca7b46420d58e8c3f51f396b72a71413 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 0090/3458] 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 575d2970103ba33bbb20567476a9cc0569003aa2 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 0091/3458] 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 24fd5f783fe63471d608f6638a8807c720d4cf47 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 0092/3458] 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 4f32436e8d0f2ad87fe3231c4143f0700f1c1e6b 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 0093/3458] 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 fea9766f7243ee9620c32e19f1b5ef94794705c6 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 8 Dec 2020 15:58:26 -0600
Subject: [PATCH 0094/3458] 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 38629d42c5c74f39dd7551cda563f6d28af00da6 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 8 Dec 2020 16:21:48 -0600
Subject: [PATCH 0095/3458] 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 fb7d586954746bead484d30d36da71a84e7eb5a7 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 8 Dec 2020 16:29:17 -0600
Subject: [PATCH 0096/3458] 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 ed4e5eb0e8237b5ed7e6f326cd8aa460d76e34bb Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Tue, 8 Dec 2020 16:44:50 -0600
Subject: [PATCH 0097/3458] 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 7227ffd33993c6f36f5b28045540aed132dd40da Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Mon, 18 Jan 2021 22:23:31 -0800
Subject: [PATCH 0098/3458] 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 c5d72cb60dec08b7115e8f529c04ba613a8ff7b9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 19 Jan 2021 08:45:47 +0100
Subject: [PATCH 0099/3458] 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 5149225e38f3a2cd40642d20964bc60425304925 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 16:08:51 +0200
Subject: [PATCH 0100/3458] 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 c7a4011b118a49a1b8bcfe554dd63f780acc17ea Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 13:44:33 +0200
Subject: [PATCH 0101/3458] 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 63c109317ed47d19d65519b4f149a4e1fb872c32 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 14:16:48 +0200
Subject: [PATCH 0102/3458] 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 b420ff636e3b75bf2e76fe2954b02da4e96d33fd Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 18 Jan 2021 13:26:37 +0100
Subject: [PATCH 0103/3458] 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 8115cb04f5c20050bb803af7712fd518e6d412a5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 16:22:18 +0200
Subject: [PATCH 0104/3458] 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 3baa69be4719296acbb8001eeafa93b35342b068 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 18 Jan 2021 16:41:08 +0200
Subject: [PATCH 0105/3458] 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 ec4298e5f00abc25ff770e3a24792ed54c8f81bd 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 0106/3458] 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 080a008e3d85c770dc80cbfe8b0706aecb7398c5 Mon Sep 17 00:00:00 2001
From: mojamuto <carlosme@protonmail.ch>
Date: Mon, 18 Jan 2021 18:04:28 +0100
Subject: [PATCH 0107/3458] 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 a1ca8ab4e897de1acb9318e811a1fcbb674f286a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 18 Jan 2021 18:11:55 +0100
Subject: [PATCH 0108/3458] 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 f348f7dbea5a51a4a06310ee6b59f6fca42945b5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 19 Jan 2021 00:20:34 +0200
Subject: [PATCH 0109/3458] 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 dee5a8956fd78ce483e80af549e0455824faabfe Mon Sep 17 00:00:00 2001
From: Ulf <ulf@voidlinux.home>
Date: Mon, 18 Jan 2021 20:10:48 +0000
Subject: [PATCH 0110/3458] 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 445fa337340586216f14d1c95ffc7872dc5219c0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 19 Jan 2021 00:41:22 +0200
Subject: [PATCH 0111/3458] 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 f1961d29aefc402ff6cc4bb8af19bdf356270733 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 19 Jan 2021 00:35:04 +0200
Subject: [PATCH 0112/3458] 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 35c5fc0615e1fc35623850185360cf00f1ad3350 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 21:14:24 +0100
Subject: [PATCH 0113/3458] 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 47d7570628c5c0c8b82403eefaadebe542b2a09e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 21:08:40 +0100
Subject: [PATCH 0114/3458] 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 58325f69d402ad163091f3925daf9f883b2f9d59 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 20:48:59 +0100
Subject: [PATCH 0115/3458] 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 0fcc7f7f8ffd14f78745b5fa2a7c1b16afe29fc6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Jan 2021 00:11:20 +0100
Subject: [PATCH 0116/3458] 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 f92652d246346763c7dddea184f0b4461a95d2e2 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 0117/3458] 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 c80b6e59c38324dc770f13a9175cb07b40d77d2b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 20:49:35 +0100
Subject: [PATCH 0118/3458] 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 b6dc4f5aa7a67b5234daaf48ff7270a9b1d23a1d Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sun, 17 Jan 2021 10:01:37 -0800
Subject: [PATCH 0119/3458] 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 dd5d73d51c71fc6fbdb38b355534ee16f3f5a0b1 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:39:43 +0000
Subject: [PATCH 0120/3458] 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 22c779da1cc81b665e03b1752e622a6fec7b878f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:40:41 +0000
Subject: [PATCH 0121/3458] 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 d5718e2dd790c59d6835b64ec37fb6a630f9cf31 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:41:24 +0000
Subject: [PATCH 0122/3458] 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 8e8c749b99a47c17ed5661c0e1fff8ece298b50f Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:41:49 +0000
Subject: [PATCH 0123/3458] 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 3e92675a6d811d1dccee28c7cdf2292ae1fc6c1a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 20:48:10 +0000
Subject: [PATCH 0124/3458] 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 da488d1bb0b551fcefe55016992ec1350671547a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 23:12:58 +0000
Subject: [PATCH 0125/3458] 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 fb3a5d3393b0ee54d7f1a73dd23fc8983292b8ae Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 23:14:12 +0000
Subject: [PATCH 0126/3458] 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 f3387b00e95d3d62db9ea0c37b325b90f3553102 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 19 Jan 2021 23:18:14 +0000
Subject: [PATCH 0127/3458] 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 6ec0669cf0751849000e37457119439d4b79889a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 16:43:49 +0100
Subject: [PATCH 0128/3458] 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 b2af44285a0c804e0c87539334ac32a4bf0362ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 21:49:38 +0100
Subject: [PATCH 0129/3458] 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 df6c1953bd3fb9c3c307a6c05e7b0d64f3046301 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Jan 2021 22:03:00 +0100
Subject: [PATCH 0130/3458] 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 482be3b6d5427787c5d4f432c492324495bc2bb5 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 17 Jan 2021 11:43:18 +0100
Subject: [PATCH 0131/3458] 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 9ac3c107c05adc74402ae54b46e319022bb5c922 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Wed, 13 Jan 2021 21:41:21 +0600
Subject: [PATCH 0132/3458] 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 d72be497a12aa1f3e375951f8fc2a2ab76b40f50 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 14 Jan 2021 17:51:17 +0100
Subject: [PATCH 0133/3458] 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 0b3ea8b10cf2dfe94cf7020087b629121dc1abe5 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 14 Jan 2021 17:49:08 +0100
Subject: [PATCH 0134/3458] 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 3b3a01d4db846f8d681daa2d987e23342f83727b Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 14 Jan 2021 16:39:18 +0100
Subject: [PATCH 0135/3458] 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 55c29d6df68aca1a2f231c331520c695984754b9 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Wed, 13 Jan 2021 22:13:16 +0100
Subject: [PATCH 0136/3458] 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 586f18964aea71306a9e78e91b9c0e9bdfe8c8cc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 13 Jan 2021 22:52:21 +0200
Subject: [PATCH 0137/3458] 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 07bab09f0bc2fc30ea525d4afaa24b6dda64c421 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 13 Jan 2021 16:07:44 -0700
Subject: [PATCH 0138/3458] 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 7fbd51c2dfd48c8e5a4fda3aa1a74446cb27d0f8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:33:48 +0100
Subject: [PATCH 0139/3458] 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 ce5693f3e9fd5cad3374137458211bf185f409ce Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:34:10 +0100
Subject: [PATCH 0140/3458] 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 490e0ea70edaefefaf89877139f861cb9870d9ac Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:35:30 +0100
Subject: [PATCH 0141/3458] 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 5a8d7a10da2d02f73027b303ad0800b9afaa7010 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 0142/3458] 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 adf8c163742bbddf3e6c77ceb93ec7e504371ca4 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <unknown>
Date: Wed, 13 Jan 2021 15:26:53 +0100
Subject: [PATCH 0143/3458] 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 fbc7a4f9418593cf604a8bfad2ee53714d9724c0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 9 Jan 2021 13:58:11 -0600
Subject: [PATCH 0144/3458] 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 4df1415d1cde85d0b6383d4140fe4e15d0fc5b6b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:51:19 +0200
Subject: [PATCH 0145/3458] 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 f785fd02bcae0ca6df97f642c387970804755bad Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Jan 2021 22:51:23 +0200
Subject: [PATCH 0146/3458] 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 5e3ad5e4687bff2c3311beb51ac86e007f59aa55 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Fri, 8 Jan 2021 15:43:46 -0700
Subject: [PATCH 0147/3458] 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 5de67bb292e9fd97bb44d08f8336ddc240d9bdc7 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 12 Jan 2021 07:27:44 +0100
Subject: [PATCH 0148/3458] 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 de1ff325fc257c8c08a47d6a3ae30a6d782a4910 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 12 Jan 2021 07:28:31 +0100
Subject: [PATCH 0149/3458] 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 4e179fce7cb0b5a002285609dace7e276cef7187 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 0150/3458] 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 2aa1694e752652fe54d5c98bdcc1e32d1422a8df Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 20 Jan 2021 01:03:05 +0100
Subject: [PATCH 0151/3458] 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 0cc80b4dc8f57a29c8baf1a03ad5993b5efaf9ed Mon Sep 17 00:00:00 2001
From: whoizit <whoami@systemli.org>
Date: Sat, 9 Jan 2021 10:32:39 +0300
Subject: [PATCH 0152/3458] 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 6f6f7029758b68e404a50adf59d642aa9c655666 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 0153/3458] 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 ff5ba185ae14038399a2e845aa799d0daf2e70d3 Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Wed, 20 Jan 2021 02:43:15 +0000
Subject: [PATCH 0154/3458] 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 d6cab76e4a729613f9c0cd070c95420c5518ad32 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 0155/3458] 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 b5d70924e6d7435ac90dcca030796815bea1e28b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:46:54 +0100
Subject: [PATCH 0156/3458] 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 0601f1455598308fba207643e9be51e2fd2ede05 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 12:28:38 +0100
Subject: [PATCH 0157/3458] 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 550b9137ecfecc0669220faa3861e9b1cc17ad40 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 01:47:08 +0100
Subject: [PATCH 0158/3458] 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 e5793f1723581364ea73ae118f6aacdaf287f9c7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 12:34:45 +0100
Subject: [PATCH 0159/3458] 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 1d82bb35477f80afed29607dc6572e9138519a68 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 20 Jan 2021 12:55:11 +0100
Subject: [PATCH 0160/3458] 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 0879ba4e33a6f73341e0bb41f91a9c438b0f0ed9 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 0161/3458] 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 94e9ea5d60672103bf49712d65cb1c25a3c1ac01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Aug 2020 22:36:02 +0200
Subject: [PATCH 0162/3458] 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 19976711c449b01d0b07f6434735b8ff5f15b592 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 15:46:26 +0100
Subject: [PATCH 0163/3458] 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 123b31ac4b5ba988efce8b9c96adcb59a44aaad2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 15:57:14 +0100
Subject: [PATCH 0164/3458] 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 74100a9746789f0766e6cb580e45dfd2c9fcfe8a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:00:28 +0100
Subject: [PATCH 0165/3458] 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 272f509fa6703b88461c3d4af75a79691104b03c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Jan 2021 21:46:22 +0100
Subject: [PATCH 0166/3458] 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 2c19978ed49e920bedd1c6a515d3f099819aa340 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 1 Jan 2021 22:13:51 +0100
Subject: [PATCH 0167/3458] 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 82c5aeb812ff301a7f5f35dc9600c6d23cac001c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 1 Jan 2021 17:29:22 +0100
Subject: [PATCH 0168/3458] 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 0bd351765794557de04adf2605420ed467a68cdb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:04:01 +0100
Subject: [PATCH 0169/3458] 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 2f06c1dd5124b33d537fd1b318a32c9d075f2595 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:07:24 +0100
Subject: [PATCH 0170/3458] 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 2568847b6df4e13f7a22aa9fcb067c701fc5ae6b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 17:28:29 +0100
Subject: [PATCH 0171/3458] 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 63f17a8b99fddeb00a303005a0e7f428f722a0f0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0172/3458] 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 21bb7c2b171c9cd5ad3d37ce10a6c1dc67df853f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0173/3458] 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 07a8cdbb8126fd5d0005baf625426371783a948b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0174/3458] 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 6382d37387a66671a64426c86195220e581a0b34 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0175/3458] 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 eb71d70667d752ae27f3ee03dd374422f1ab200f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0176/3458] 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 f7d863ea5bccdd1e1b050ff6d8660c435ac87e1a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:04 +0100
Subject: [PATCH 0177/3458] 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 a8db0607d4698edeb14e8ad78548f369df156d2a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0178/3458] 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 8a3059e1e7873575be4c12fd46b792c6ab6f1678 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0179/3458] 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 ade8e5e840800c1efe9c06df4a6765961b31240b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0180/3458] 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 9f0cf4f5cdc18ea05ce742130a140e9b7e3be5d8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0181/3458] 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 ebec39634c21a93750bec392b73e67dc1856669a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0182/3458] 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 90916339bbf90bb833a675daefc3e57e88152e14 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0183/3458] 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 0f3c432999f25dbd83c16c1c182e8b9ca8f5f1c7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:05 +0100
Subject: [PATCH 0184/3458] 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 d8b3b30405876e786d28f29b725279b158419eb5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0185/3458] 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 aa5f0db85dea6ca53f76c2f4fb885d5ddf1a8ece Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0186/3458] 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 201647c0de543fa72fbdccb9901c2e6206fcc02d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0187/3458] 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 5bd778559ef775fa9d58165eda039d28cbba961b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0188/3458] 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 24f3d451930c0a0280c87ec249d3547296152a14 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0189/3458] 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 3de5746a06125560eaffa84fec7b05612b10ad2e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0190/3458] 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 629e51fa192b7113161625ca6dac6135ac3bab2c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:06 +0100
Subject: [PATCH 0191/3458] 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 5167d5d3ffac21043e27c93f2b19fc66eed9284e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:07 +0100
Subject: [PATCH 0192/3458] 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 eba2f94ea74b48c25db8077f1df0c48c1ec59063 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:07 +0100
Subject: [PATCH 0193/3458] 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 9e6a13077ed2425e05ac125b541b8666185ec7e4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:07 +0100
Subject: [PATCH 0194/3458] 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 63bca4f35d0aea186607c093203987c875c57e08 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 16:42:07 +0100
Subject: [PATCH 0195/3458] 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 980cf1ae3e556dee59de83887434883b6d307dc6 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 0196/3458] 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 734b0437d004269172ebd82941d63ba879e4e1aa 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 0197/3458] 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 ebf45cbb5dfef3f22cfd0e5488a43c462a4d7e37 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 21 Jan 2021 06:40:49 +0100
Subject: [PATCH 0198/3458] 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 78ae8d39ad487a2e1a26d0f67dc34bd064053eab Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 06:39:12 +0100
Subject: [PATCH 0199/3458] 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 05dcedacfbea0fce517cfb64e9c6adba5b93a611 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 15:57:40 +0100
Subject: [PATCH 0200/3458] 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 996de937411d9f95e71f06dbed4e3a65aebeefc8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Jan 2021 15:55:52 +0100
Subject: [PATCH 0201/3458] 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 aec6ff764d516925d0aa06cf4b7501c42017efa7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 18 Jan 2021 23:04:58 +0100
Subject: [PATCH 0202/3458] 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 2a5c58fdaf65364c6ae97f069f9903491f584fd2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 11:13:53 +0100
Subject: [PATCH 0203/3458] 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 4f6f13ff783957e96ca5d1e30a7240437d7d3f34 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 12:13:15 +0100
Subject: [PATCH 0204/3458] 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 fb4acabf78e645a1ee2333c7568209e4172e318f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 12:16:46 +0100
Subject: [PATCH 0205/3458] 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 419abc8e98aac6e4a8d8933f4230735e9ad07f49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 12 Nov 2020 21:29:37 +0100
Subject: [PATCH 0206/3458] 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 f5181ee4aaf929da3de9b4eb37be67e159fb152f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Jan 2021 00:30:54 +0100
Subject: [PATCH 0207/3458] 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 e9da1ef43c70731d049d9376d630a3bceb0d3685 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 10:31:32 +0100
Subject: [PATCH 0208/3458] 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 c04baed6c2b61703d41619b7100a4316d7c4305e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 10:32:25 +0100
Subject: [PATCH 0209/3458] 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 d8572acaf5e3c2142b9d49b7e2f329f28a7f6801 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 10:33:31 +0100
Subject: [PATCH 0210/3458] 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 d1ac95b1112a90b1664e733c1e0ab403c1808185 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 10:38:14 +0100
Subject: [PATCH 0211/3458] 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 f3cda8abfc39d2e440a702b147f9249f8dfce066 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 13:24:35 +0100
Subject: [PATCH 0212/3458] 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 0fae8a8620857cee32fbee0849fe658ba329434d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Thu, 21 Jan 2021 00:03:27 -0500
Subject: [PATCH 0213/3458] 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 f72075f01100eae70878ae83f63654e4b6e8ed4b 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 0214/3458] 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 0fe0243ccb3a6374f7cd8bdd3fae784dc22fdf7b 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 0215/3458] 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 0cd70b735204a2b55516c2fe566f0e5464a5fd24 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 0216/3458] 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 47a1c7c3c35277b4d06260454da9d904b55732d4 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 0217/3458] 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 405a396f78c115b84fb9245dff75761c6e21216a 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 0218/3458] 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 292c56fd9387c894f011f5e834e2b6578a214841 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 0219/3458] 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 744510690a1414149fea892860dc08bbfd258251 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 0220/3458] 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 673429aa78e78de5dbea066d0fdb0838bae30e36 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 0221/3458] 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 9030ef3868e4388082e6ee729c046baef76c0fac 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 0222/3458] 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 107a9f835fdd4195ab3afcabe3c58dd7b08a426a 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 0223/3458] 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 c8c047769b31823936778d96a8b1d452b6460813 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 0224/3458] 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 e854d9e8a06617a1c217f9a73d4178d6146f96a4 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 0225/3458] 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 844cb7b5eb421938be4c0754591943c201567812 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 0226/3458] 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 1df4e3492a613792486dbfac2e306d02d252e627 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 0227/3458] 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 81187517e8c701f03179d59b3ba85773549a964b 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 0228/3458] 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 197cb1c122bd31341fa2de2bf6b6a1bd9053556b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 21 Jan 2021 21:26:04 +1100
Subject: [PATCH 0229/3458] 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 08bb4b3675253fde12a737593dbaa89f68c27d88 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Thu, 21 Jan 2021 21:27:06 +1100
Subject: [PATCH 0230/3458] 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 fd6c6164300a39b8bfc47a1c4f4e9f138c6dc018 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 0231/3458] 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 9ebafd2ec96402fe85970aae47bc3b12ef4983ae 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 0232/3458] 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 39ec5b9941a8bab14b5f0f9bf1942cfa03a83f5d 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 0233/3458] 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 c65967f70dac73e2c58ff094f895a4067976aa4e Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 21 Dec 2020 18:18:51 +0100
Subject: [PATCH 0234/3458] 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 99ad50380d7adcc8fcc511c5f5b36a261044096e Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 14:13:32 +0100
Subject: [PATCH 0235/3458] 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 19d0d7458997e1499f00f64f39e08c85af1926ce Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 20 Jan 2021 12:36:15 +0100
Subject: [PATCH 0236/3458] 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 cce66500152d4efdbee1c8b20dcaf6b01f12ccfc 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 0237/3458] 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 748bdc0ee66c1ef8cc35c107bfcc3e7d621f4bb5 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 21 Jan 2021 16:08:33 +0100
Subject: [PATCH 0238/3458] 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 126307964659af2b22947c1f051d78cb9bdba760 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 0239/3458] 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 879cf57ab0eb2e4bf95eaf90f783963f0ddf3923 Mon Sep 17 00:00:00 2001
From: Georgian Fire <gfire@tuta.io>
Date: Tue, 19 Jan 2021 14:43:05 -0500
Subject: [PATCH 0240/3458] 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 7c1faca94f02ba489c373e214a37889b69b3eb38 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 0241/3458] 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 7f900b5d852bacf11d551d0fabd659ab77fd901c 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 0242/3458] 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 96d49bffa0750fceece2305b0d2cef1ec6797002 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 20 Jan 2021 22:43:56 +0100
Subject: [PATCH 0243/3458] 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 7f28d58e992d36971d84f1314466c50626798648 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 20 Jan 2021 18:37:20 +0200
Subject: [PATCH 0244/3458] 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 4b14cb6a91112f1b184379df845cf437a639f887 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 20 Jan 2021 09:23:03 +0100
Subject: [PATCH 0245/3458] 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 6042c8ed9e705f353910935156137553fcdc0224 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 17:56:31 +0100
Subject: [PATCH 0246/3458] 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 f543675aaad5d52f22731698ae0a15b22877ce1f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 20 Jan 2021 20:09:22 +0100
Subject: [PATCH 0247/3458] 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 568ce79b28d13d7802320f3134cd532638993dbb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 20 Jan 2021 20:05:27 +0100
Subject: [PATCH 0248/3458] 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 fabf70bcde7c6919df9abf8afd7bac2403f088e9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 20 Jan 2021 20:12:45 +0100
Subject: [PATCH 0249/3458] 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 5605c9619bc83d46ad9059a7f41428ea6ee8bcfe Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 20 Jan 2021 20:19:10 +0100
Subject: [PATCH 0250/3458] 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 793268fb38ceae85f990ddd654f3305cd156396d 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 0251/3458] 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 5520d072b76d1bd147b16226002ef4a15a2f245f Mon Sep 17 00:00:00 2001
From: Oliver Nutter <mrnoname1000@riseup.net>
Date: Sun, 2 Aug 2020 04:44:52 -0500
Subject: [PATCH 0252/3458] 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 ad44482f9a25f5a5921cd8d966dcca7fcd86bebc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Jan 2021 18:59:35 +0100
Subject: [PATCH 0253/3458] 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 0eb87ff3739ad0fa2bb1e9836ebfe23ab4b3d12f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 21 Jan 2021 19:34:10 +0200
Subject: [PATCH 0254/3458] 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 502912515bf5a13a4a08bcda74bfd112febbe295 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 21 Jan 2021 19:48:16 +0200
Subject: [PATCH 0255/3458] 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 2b7fc2a9b1596a2471d335fd5630e1133e47cc54 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 21 Jan 2021 12:07:11 +0530
Subject: [PATCH 0256/3458] 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 389b7272a1a24002df0d38bbe30ed0ec0477ebf0 Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Wed, 20 Jan 2021 19:21:29 -0800
Subject: [PATCH 0257/3458] 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 80c947e70fe419d33f8c428047449b3f2a94a8c5 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 21 Jan 2021 11:59:22 +0530
Subject: [PATCH 0258/3458] 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 5297bed6dda96420864ea30c37a464eaa0b85d79 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 21 Jan 2021 20:34:16 +0200
Subject: [PATCH 0259/3458] 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 71e8d6fbd29e84cc796066e4d2e8e1ac0ed51deb 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 0260/3458] 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 ffbb84c0f9a0947282a5a9eddc0e373bee87f382 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 22:02:31 +0100
Subject: [PATCH 0261/3458] 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 50ddd53bde0bc33647c5cc2ba4418483a6d5c958 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Jan 2021 22:23:00 +0100
Subject: [PATCH 0262/3458] 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 d3a17f1f5ad361e6107bbf7bd812196bc436d3a4 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 0263/3458] 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 371fc5c14e76d77894200a1232655f6506f940ba 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 0264/3458] 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 e8ceb33c24271db7fc118d5b5d66f60d42512f2c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 18 Jan 2021 18:53:43 +0100
Subject: [PATCH 0265/3458] 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 988d3bafeff515e292c11f453005a4d142ad4979 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 21 Jan 2021 22:13:15 +0100
Subject: [PATCH 0266/3458] 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 ac8963f418d314a05fe3264a5945ba91031c9b1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 22 Jan 2021 00:11:43 +0100
Subject: [PATCH 0267/3458] 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 84edf07e3159b572d6ca8f3e13f8fa48a3236477 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:25:24 +0100
Subject: [PATCH 0268/3458] 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 ab9a37a5db5f43071f9d376e192081b019ab66b1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:25:37 +0100
Subject: [PATCH 0269/3458] 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 47423ebe78415a7ccc6e4a1cc2327d965a8892d4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:25:54 +0100
Subject: [PATCH 0270/3458] 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 78c7a9d2b7f25c86dbe2958576429ebe80ed7c5b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:26:07 +0100
Subject: [PATCH 0271/3458] 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 48868e4a28edd50cfab31ddafbea49a5fa027734 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:26:19 +0100
Subject: [PATCH 0272/3458] 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 a31c7a277ea6d5738bd31b4d2dd6fc4c780202a6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:26:31 +0100
Subject: [PATCH 0273/3458] 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 5a98825234c01acf9cb99cf79493fefcd75c7fcb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 01:26:39 +0100
Subject: [PATCH 0274/3458] 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 0dcf5633d33816f2c1f6b968dd442a5a145a87e9 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 0275/3458] 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 bf31960e882e052341fe4699889c5cf75e0a8a6b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 03:47:18 +0100
Subject: [PATCH 0276/3458] 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 d52d84b36298d75d17298c682a765943f641bfca Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 03:47:34 +0100
Subject: [PATCH 0277/3458] 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 6daaf2fc603896a4d4aff46e155bc96602d7d2bd 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 0278/3458] 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 8a472885ce2e8b92dc178ee583ecd2d5b0d72261 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 6 Jan 2021 15:11:50 -0300
Subject: [PATCH 0279/3458] 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 e6b454fb01df86b91f89ad812f7e118ebfc67abd Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Thu, 21 Jan 2021 19:30:15 +0100
Subject: [PATCH 0280/3458] 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 42035be763f5f37a72e4b5b0a5a75bef42821585 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 0281/3458] 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 43faa6b2f8823ad1ce9b7e0e8d709224dc283241 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Thu, 21 Jan 2021 14:19:36 +0100
Subject: [PATCH 0282/3458] 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 e44cd8d57d8f1088c2d71f9a20d4dcf4f9ceca3a Mon Sep 17 00:00:00 2001
From: mojamuto <carlosme@protonmail.ch>
Date: Thu, 21 Jan 2021 14:32:05 +0100
Subject: [PATCH 0283/3458] 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 137061a34ed54e1f4c66f70852609615ae844a71 Mon Sep 17 00:00:00 2001
From: Ulf <ulf@ulf-voidlinux.home>
Date: Thu, 21 Jan 2021 11:45:53 +0000
Subject: [PATCH 0284/3458] 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 f9d72023b52c8708e7d92fde43ec8a2f2bc91b02 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 21 Jan 2021 20:11:47 +0200
Subject: [PATCH 0285/3458] 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 571f448e561c896257c84b3ded0e6c4beb7aaeef Mon Sep 17 00:00:00 2001
From: Ulf <ulf@ulf-voidlinux.home>
Date: Thu, 21 Jan 2021 12:04:24 +0000
Subject: [PATCH 0286/3458] 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 86931e1adedceaedc2f60c4dca78f658647d1a8a Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 20 Jan 2021 18:28:56 +0100
Subject: [PATCH 0287/3458] 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 28cc4604eb3765f2f1a3ce4e77f17c152de9e381 Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Mon, 18 Jan 2021 19:15:35 -0800
Subject: [PATCH 0288/3458] 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 897a9837f5079b19aac5e8a1235185b5cdc696c8 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 0289/3458] 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 fe360ced20baed49e92d797f283d7584e8c1c365 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 0290/3458] 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 ef3d97380a6dcdecfb8ad56de01788af9acf5e6a 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 0291/3458] 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 bf7c85da8f989bfe84a7d29eae73d3b40c56a2d1 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Jan 2021 21:33:02 +0100
Subject: [PATCH 0292/3458] 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 c17b937225e80fd2b6e72e6ce012efa9b59b6512 Mon Sep 17 00:00:00 2001
From: Robert Karszniewicz <avoidr@posteo.de>
Date: Thu, 21 Jan 2021 23:23:15 +0100
Subject: [PATCH 0293/3458] 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 fd47c18a049d9bbc9a291ef2ab2220e61eff0165 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 19 Jan 2021 23:55:02 +0100
Subject: [PATCH 0294/3458] 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 643cb742e492ac4a928ae1de745df41a13f732c5 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 0295/3458] 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 d71372db4803781df4a4a35f5641471a13ea20f1 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 0296/3458] 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 8ef318167f4f5f933ab74e653a125fbedb60958e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <>
Date: Thu, 14 Jan 2021 14:18:30 +0100
Subject: [PATCH 0297/3458] 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 6741e5499ce8c2526151bd81092c5761d638e0ae 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 0298/3458] 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 2c9049a7987b33dee9269daf6c26b6a115744261 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 0299/3458] 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 f0d7269fa1c4932e136a5e198d283da1bc2e1b70 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 0300/3458] 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 28596c802e00ccf4fc6a714ed61031b2ad4900bc 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 0301/3458] 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 9b5c80b1c9e236165c8c0ba2ddfc369924ace362 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 0302/3458] 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 21b5a2ef98e4fa8a4fe51f6b50b9d79f462b1f40 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 22 Jan 2021 09:14:21 +0100
Subject: [PATCH 0303/3458] 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 65b1455c01acc3a4609ff7cdc4cca430cc2ada3f Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Fri, 22 Jan 2021 11:29:23 +0100
Subject: [PATCH 0304/3458] 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 62ab3b0c7887ed775f96f4ac2c964420696ba879 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 15:34:51 +0100
Subject: [PATCH 0305/3458] 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 7a7751eb4bc96ab18bd12f002debee49e820a284 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 0306/3458] 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 e2ae82facaeb7bf995858badc1eb34302f3fdd86 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 0307/3458] 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 e719e1710dffd39ffb66ff1aeb696a554621e77b Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 22 Jan 2021 16:26:37 +0100
Subject: [PATCH 0308/3458] 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 9e79b74ba7e3941ab2a4ef66d6da4ac64dfe08c0 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 22 Jan 2021 16:26:06 +0100
Subject: [PATCH 0309/3458] 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 c71acd7934f14efab4b17cadae1a5c7888f8fecf Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 21 Jan 2021 17:51:23 +0100
Subject: [PATCH 0310/3458] 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 c6a743c96c365101f0aa066d2d9645d6ec5cf796 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 0311/3458] 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 f188007cf7eae01621a91d619fe22f86a91ea468 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 0312/3458] 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 3a04bd2580169d67a0441a9fdd1d9c1e95265a02 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 21:33:21 +0100
Subject: [PATCH 0313/3458] 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 d1d4c7d4c3fe4350eb5643b450a7d50350700286 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 22 Jan 2021 21:58:51 +0100
Subject: [PATCH 0314/3458] 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 6b4122902348d321444bbdae2cd4d13379548ed6 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 0315/3458] 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 83fbbe790cdf3bf156939b9496d018c3e12ff97d 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 0316/3458] 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 2621865f6ac8e98c04668df3511b7fdc1e8b2b71 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 0317/3458] 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 f4b7e7691e10979264a58fb8d5dcb653228c961b 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 0318/3458] 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 1cc734967660fcabdf3072d3bd5392ba0a82a3c4 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 0319/3458] 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 432c749fe2f0cb283338ac35979ca2d38351620e 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 0320/3458] 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 ef72a41856daf45f0869d1c76cef9fcbf1767ed3 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 0321/3458] 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 2988dbf52817e1542ffbda11fd79b5774d3690e4 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 0322/3458] 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 eff0ccc5607ed690a13861dbb6856a200033f69a 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 0323/3458] 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 d5702e5cc1b7ca058261a2308298120b345a83dd 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 0324/3458] 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 8886eb8285d017c8be5cbf2fce5b8f5f0d0689e4 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 0325/3458] 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 e84f7af088b1d9d0a63fd0e0aed4f61a932af340 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 0326/3458] 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 34a8ff38c2232fd7975ab1309fd057f7e923c74b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:26:19 +0100
Subject: [PATCH 0327/3458] 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 46ce1a0630a2fdd8b59f99f34c11a7490213578d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:28:02 +0100
Subject: [PATCH 0328/3458] 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 3b3149e937ebf813fb3cc1d424a43b20215bc8e8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:28:52 +0100
Subject: [PATCH 0329/3458] 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 4b52886d5582527510ca99a88daeb6d79a66ccd1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:28:58 +0100
Subject: [PATCH 0330/3458] 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 6a60340d810d6852497f86f578f6bf8e72350685 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:35:17 +0100
Subject: [PATCH 0331/3458] 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 4ae0869ec17da93d69d0a6a692c81283eee2fe7b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Jan 2021 12:45:42 +0100
Subject: [PATCH 0332/3458] 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 ae80393969577573da2faf9d6105287982b5c732 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 14:43:47 +0100
Subject: [PATCH 0333/3458] 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 34c396321012bddbd28b3dc83cab84821ebdf31c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 14:45:36 +0100
Subject: [PATCH 0334/3458] 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 f1137197c0f51b9148fea8b507d91883feff9c26 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 14:45:37 +0100
Subject: [PATCH 0335/3458] 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 e6ad81afaae9ecd8bd2b9cf437837fea04b658b4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 14:46:19 +0100
Subject: [PATCH 0336/3458] 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 ca278cd89ff32442db301c210c21f5da311b1520 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 0337/3458] 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 3d62a7bec5515aba325bf0e8cf79b19cf643b5e7 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 0338/3458] 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 b391bea9178c2af2cbb059fd68b5d2689d211195 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 0339/3458] 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 84abfd8ea4c31173d90b408722964721d5628940 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 0340/3458] 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 8bc5bddb1375938e591e7060255c3493f40d22e4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Jan 2021 17:27:18 +0100
Subject: [PATCH 0341/3458] 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 167d3e0c9028782a0aa8d4402afa0f347eb7a175 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 22 Jan 2021 22:52:17 +0200
Subject: [PATCH 0342/3458] 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 d49989deffd0d79377db4e01ea42f0da407aa454 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 23 Jan 2021 17:20:41 +0200
Subject: [PATCH 0343/3458] 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 17a578d433e7cc7d4023ddfecb1094472f3ca031 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 0344/3458] 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 fc6b31022b09c83ec0002e59a8896d97466571b5 Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Wed, 13 Jan 2021 16:20:33 +0100
Subject: [PATCH 0345/3458] 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 e7320fedb4a88f1bc56b3ebadccf803ab8f9feec Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Sat, 23 Jan 2021 11:28:23 -0700
Subject: [PATCH 0346/3458] 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 f99485930518a34a7ce22a5842181b78ce6b8c5b 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 0347/3458] 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 ced6f4436585844004e8c0c1d68e83d9c318a710 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 0348/3458] 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 0804c9b5a35664dfe61e7e321380023de0f780a2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 22 Jan 2021 22:31:33 +0200
Subject: [PATCH 0349/3458] 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 ec75398c003685334d81f468c3b76128d4510244 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 22 Jan 2021 22:31:38 +0200
Subject: [PATCH 0350/3458] 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 eca23dce46bfc848d4c66889dcdc9e2bcc75e22d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 19 Jan 2021 23:55:22 +0100
Subject: [PATCH 0351/3458] 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 2829b018b98c9fd267e58807ba9f1a9288b9a744 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 0352/3458] 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 45cc0b1596b9992e67ffd0434af237809be8c13f 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 0353/3458] 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 40f6df28ce755dbe21df5721ba6881523f6ed878 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 0354/3458] 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 bfcbac96a5bea6229d19c8e2d31c8492f9d00b37 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 0355/3458] 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 7f5d67e6d3e3abe410fb1d1219b9c06efd6e8856 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 0356/3458] 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 5d38738575fcf66ef9df0f1bbe1059d963a057a2 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 0357/3458] 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 7b37f39809234b31fa98fe9f79c3a8ebe36037f3 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 0358/3458] 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 d5554b0f0c329fb82779bda08c48f67ae6e3b5bb 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 0359/3458] 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 641e4d2667599401978b5db3991ba997e44e28bd 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 0360/3458] 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 d5683b5720f2d30aa9f68b755ffd26f6177e7dc9 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 0361/3458] 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 d2ce9cfb38af2b8b81eb813e922b7188876577d9 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 0362/3458] 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 ed0ca6f1d3b2467ac27f9f66783af24e66786376 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Jan 2021 11:39:09 +0100
Subject: [PATCH 0363/3458] 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 ac9d75acfc934128a89e53fab2d9efc40e1dca8a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Jan 2021 11:41:52 +0100
Subject: [PATCH 0364/3458] 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 59def8f217becb27ff881b408670c5348fc95b58 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 24 Jan 2021 11:44:08 +0100
Subject: [PATCH 0365/3458] 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 43b13f09bc64a7c034e7d4bed48bc42d3c788c35 Mon Sep 17 00:00:00 2001
From: Robert Karszniewicz <avoidr@posteo.de>
Date: Sun, 24 Jan 2021 03:34:25 +0100
Subject: [PATCH 0366/3458] 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 2cce38d5ca645acae44ca345739c1527d63a5fad 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 0367/3458] 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 ccc78ed34e7f19242d38ad2cfc199eb83c42b96f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 15:52:59 +0100
Subject: [PATCH 0368/3458] 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 e684503e92434e6024efbe49a1a7faf4e396a70c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 15:56:30 +0100
Subject: [PATCH 0369/3458] 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 e6660a5438836682b88bc99d8b43352a65e80049 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 15:57:20 +0100
Subject: [PATCH 0370/3458] 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 7b80dfea32e0c299165e6ea8f80ba4ca1a9bbe53 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 16:07:31 +0100
Subject: [PATCH 0371/3458] 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 8c347a15391f54de1f3c25185f6e7d43bd66aaff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 16:08:29 +0100
Subject: [PATCH 0372/3458] 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 e7de65ea377455ca7cb78e9bad14d9ce2d83dd9f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Jan 2021 16:09:02 +0100
Subject: [PATCH 0373/3458] 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 5804cd1c933a9c7a77af546eb5371ad705c8b789 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 0374/3458] 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 b0d46582806cd350fe2fdc16dd9791bcf922eeef 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 0375/3458] 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 20d65173da49a99454058a2be9a6162835d3bbc0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 24 Jan 2021 17:11:59 +0100
Subject: [PATCH 0376/3458] 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 293efc4b3d48d8d6e9f472c6122290adf9964027 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 24 Jan 2021 17:27:18 +0100
Subject: [PATCH 0377/3458] 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 da731f4b6f79c61ca9335c77821da42c51964fa0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 24 Jan 2021 17:36:40 +0100
Subject: [PATCH 0378/3458] 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 8ec4165038c3805b54c28f64f7fc37af68a6433f 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 0379/3458] 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 44b7511caf00df3ebdbb84abb6f20662073604b0 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 0380/3458] 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 f113d486aa259024d557b6e338ba66de72412c1a 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 0381/3458] 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 77342832a1e71695b60da803580afdc277648cd6 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 0382/3458] 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 3ae0579e3c2748e8a2c25e84be025060fd496c9e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 23 Jan 2021 09:04:03 +0100
Subject: [PATCH 0383/3458] 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 0abd22b34ad7cd44aa75c0b59762767c5ec0ffef Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 23 Jan 2021 12:43:40 +0100
Subject: [PATCH 0384/3458] 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 5f8b21f2d2fc8d2cd25702b277deb19bf2138cae 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 0385/3458] 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 5bfba6a0d30ba2bbe425d10a91ae5af12e7d7908 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 0386/3458] 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 cf24eb0a138be866855975b89c41b60f8eb7dd91 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 0387/3458] 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 19db71c1c21abfdb4e835621d4714e35de6de803 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 0388/3458] 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 e5663ff4663b18c837604e01c89f80a4624d34c2 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 0389/3458] 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 e06cc4dd34ae1999bfa39b61742901dded9249ad Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 23 Jan 2021 12:23:45 +0100
Subject: [PATCH 0390/3458] 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 0ccf186a03d063e8754575ba945a624b8565a36a 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 0391/3458] 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 a724548b09d28d5b4d27f0e4dace70b65c530468 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 0392/3458] 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 c0ee4f57bd6a3951e83e554ea10877e6d1e881f5 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 10:37:15 +0000
Subject: [PATCH 0393/3458] 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 2b7d5418542396a8c5be6d7147de00f97193ceb4 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 0394/3458] 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 168345f70b77396c2ab10b7b51ba154e073a2991 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 0395/3458] 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 00d4fd0161a4557790b163caefac4c56078b84b0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:00 +0200
Subject: [PATCH 0396/3458] 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 665ce2477560ae97c2ec0c5fc293e740dcee999e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:13 +0200
Subject: [PATCH 0397/3458] 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 d1bffc4511cdc1cdc0f3e6e6f1d21512a104766d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:21 +0200
Subject: [PATCH 0398/3458] 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 f761cae8948f3c1c962f093a1e18bbd0b50aa344 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:28 +0200
Subject: [PATCH 0399/3458] 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 7de9d9ee7cd953eec2d85c7653c6aeafbc179419 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:36 +0200
Subject: [PATCH 0400/3458] 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 dd18cd531ab71405a59abbff29c40610ffe140a6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:42 +0200
Subject: [PATCH 0401/3458] 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 24f1968653989ec8ab3ff82b12b82135242ba539 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 21:01:50 +0200
Subject: [PATCH 0402/3458] 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 a084c1e15af21316333fc260b7732593f2a38f21 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:39 +0200
Subject: [PATCH 0403/3458] 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 1a299856b41076899ca6da0df4ec66ebd2a60394 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:27 +0200
Subject: [PATCH 0404/3458] 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 b7d77e69eb06b19c853fda0bfaf81ec4659b985f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:48 +0200
Subject: [PATCH 0405/3458] 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 32466da3846948cc4d1437a89c22c403f148c081 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:03:58 +0200
Subject: [PATCH 0406/3458] 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 dad395656add98e060e7f2679071eeea50a0bf3c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:15 +0200
Subject: [PATCH 0407/3458] 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 024ccc31879502099f2e6ad8610e90e24e4a4a2a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 21 Dec 2020 22:04:20 +0200
Subject: [PATCH 0408/3458] 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 734485d8e778438890b3202e8ee37dbd78a3f32a 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 0409/3458] 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 c800aba94925bbe9469961f1cad443df48e13c3d 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 0410/3458] 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 cbe92b44c4c6c410f255ff4662718002592e8312 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 0411/3458] 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 1902de239034c74ed92bb61b4f6e0b573d407938 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 24 Jan 2021 22:49:41 +0100
Subject: [PATCH 0412/3458] 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 ead658ddaec0f031216b8087d97c81fe00a39ecd Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:32:36 +0000
Subject: [PATCH 0413/3458] 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 d760b834e95cb5ded805fc91b798e4d8435c679a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:39:15 +0000
Subject: [PATCH 0414/3458] 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 76762eb305ae28034ae45cc782fa211b5df62538 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:40:41 +0000
Subject: [PATCH 0415/3458] 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 ea297ff7c19aafd5d9623a92a94dc756714e5ad8 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 24 Jan 2021 23:47:38 +0000
Subject: [PATCH 0416/3458] 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 94439acfa86a1051930590f3b97d7a739cb88e5c 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 0417/3458] 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 e9df8ec3e97fbf65e8fe71b0379f647a7be996b8 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 00:22:17 +0000
Subject: [PATCH 0418/3458] 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 e983a2dca9a773e93acf83c4a2704aa073d7e53e 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 0419/3458] 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 df482a7fb63e4f27095eab7e826c05d5e71cf59a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 00:24:29 +0000
Subject: [PATCH 0420/3458] 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 1cff7b0367ac5b18298d2a5238d8d8b47969d203 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 01:28:22 +0100
Subject: [PATCH 0421/3458] 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 ff81db06093b4fcbe0b960bd087aa8e3ac86aaab Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 03:02:34 +0100
Subject: [PATCH 0422/3458] 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 ea3de6faca93d918369cbb4abee2a62ba02489a8 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 08:48:10 +0000
Subject: [PATCH 0423/3458] 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 2caefe0ad858db9b4c02da5f611da5ef85258a8a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 09:31:03 +0100
Subject: [PATCH 0424/3458] 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 8dc5136b4d2f55f7bec36e15e6a0096d8db0c36b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 09:53:57 +0100
Subject: [PATCH 0425/3458] 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 b2473b3588a98ea20e00b59f50aa7ce35d2a076e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 10:12:07 +0100
Subject: [PATCH 0426/3458] 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 915bf50efa425beaaf0557e9ff385dd6851bbb32 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 0427/3458] 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 6305bd9bf53e4696b9ccb67976f4d2c15dd5830e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Jan 2021 11:07:01 +0100
Subject: [PATCH 0428/3458] 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 f8fe18e6121bfcc439ddddb9cae80a7444a33b93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Jan 2021 12:36:02 +0100
Subject: [PATCH 0429/3458] 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 c9a18cda4d30095b40f3a96e08d9f197bcf0ff43 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 0430/3458] 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 c38249b7b9851bbc4737821aab50d475645c6a06 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 23 Jan 2021 17:17:52 +0100
Subject: [PATCH 0431/3458] 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 9d782ec1ebdbb0263e96d2d3f794625a54114054 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 25 Jan 2021 09:55:30 +0100
Subject: [PATCH 0432/3458] 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 4acbda38fa7b1b97d3096267ba5442a1ee119a49 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 24 Jan 2021 22:55:56 +0100
Subject: [PATCH 0433/3458] 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 aeff2d2c4e48a2e32f141ffd1e3acbf871706bd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Jan 2021 22:21:50 +0200
Subject: [PATCH 0434/3458] 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 798ce35b8cfb1c88b35eb602b5898f7230d6546c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 24 Jan 2021 22:03:35 +0100
Subject: [PATCH 0435/3458] 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 3869cdfab884bbaf6fcf980c50010c2e3651a6c0 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Mon, 25 Jan 2021 07:32:48 +1100
Subject: [PATCH 0436/3458] 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 d9a4eef791540d3742f21e0faced342d113bb797 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 0437/3458] 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 81a601d980182b05e2ee4d31f74871ea74a01890 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 0438/3458] 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 b470ec9f2663323ace9f45b5eeb982ed82954aad 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 0439/3458] 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 9f7030aa5701b5fab9c089eef4b99b5c03a6377e 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 0440/3458] 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 2ea1ac7411d8f2d6380dcd892f953f91de346f78 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Jan 2021 03:07:13 +0100
Subject: [PATCH 0441/3458] 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 09c198c1f1b6c0d031c82231b021afbe336844e1 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 0442/3458] 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 b70344e04f00f71e467b53c59e3a8519209d3de0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Jan 2021 15:11:53 +0100
Subject: [PATCH 0443/3458] 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 31227fc8a9d89b31eb473ba070cce9ae1e8e1682 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 0444/3458] 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 7bdfc52d87c628e5047668b670e0b66c9337193a 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 0445/3458] 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 d69cb248ea600562fc8973786fa0856a9682bab6 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 0446/3458] 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 b173a2cd991bed941ba92be4e72c42d291d153b3 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 0447/3458] 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 16c65837ac063ccb9521f79e0e365d2b7d5b1370 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 0448/3458] 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 743dc85306d0d8bb09a6b76f3d1fcf9a901d4113 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 0449/3458] 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 740130aeda543f9e599fa6b02a7235ff86e38eb7 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 0450/3458] 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 1ebd4757555b032abd9e2dc3426ac5e59167a56b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 12:51:27 +0100
Subject: [PATCH 0451/3458] 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 0d19b34fd55145077717033d39065b64d5118059 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 0452/3458] 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 8267e4c76f1c21d379b3c49409161bee0e02b4ca Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Jan 2021 18:05:23 +0100
Subject: [PATCH 0453/3458] 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 cecc1099c868367349a128de05d6b4af8d67c0c9 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 0454/3458] 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 2c2a0ecf595f8d9de27d26a0be5e43d6fd513bdb 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 0455/3458] 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 4007ce404a3b77e93f1a74e7a5585242f8a0c24a 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 0456/3458] 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 bf0f169913ca23ab03cca9d2ecd3825c8920ad2a 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 0457/3458] 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 1aeafe4628ccfefedcbbb5aa8067070c4368cef5 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 0458/3458] 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 2063c7d5524731a934d7b9b95f3ed10824a046b2 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 0459/3458] 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 c0f152a326b6b91eb40847301f4a05c35f342812 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 0460/3458] 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 fdf55705212e46090085209b7ef8895232e0543f 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 0461/3458] 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 17530d00b3cdd9b20bd656a49a70a4a8d0196229 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 0462/3458] 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 f5e430186d4b38f5b600b2f4b43b1194cc5c1ad3 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 0463/3458] 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 7d520ca76849d645e0f71fb2c94bc75925747e34 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 0464/3458] 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 3dbafcc0d4f173e58676a89cec2ed451264dadd0 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 0465/3458] 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 fba7dd8d14c9933b4df71be2f0e30ebd58888e9b 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 0466/3458] 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 05de6d4cb0df81a6b4eab336eabd87e6ac298114 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 22:54:18 +0100
Subject: [PATCH 0467/3458] 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 0b0aa76d005e40be52d01b432b6d154ae825cec4 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 21:32:23 +0000
Subject: [PATCH 0468/3458] 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 38b8bd667f8341d6489b50ed4d6273a52d033ef2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:32:22 +0000
Subject: [PATCH 0469/3458] 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 b316f870ead50f502285af459eba6214d251edfd Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:33:50 +0000
Subject: [PATCH 0470/3458] 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 4bb6e545b21713133d01875412f57e8a721d1fe3 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:35:45 +0000
Subject: [PATCH 0471/3458] 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 0e9848c2786d9e148145e566d3e12461a408d4e5 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 22:35:54 +0000
Subject: [PATCH 0472/3458] 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 ac3d28ef1f0f06d9b8d71e67e9441a4136329574 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 23:06:29 +0000
Subject: [PATCH 0473/3458] 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 0541c26520ce891f09727d525641d777d1417d40 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 25 Jan 2021 23:17:16 +0000
Subject: [PATCH 0474/3458] 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 c31a03731e9096baf8c7b04cc0b126d4c488f6fb 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 0475/3458] 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 afad69e7ed5eb5038c47a18d13181910cceea077 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 0476/3458] 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 afdb9fb776a98e010481160414479a4794077708 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 0477/3458] 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 d7ff60d31dde1877ab46d57d897a8048bbb22b7f Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Mon, 25 Jan 2021 21:58:50 +0100
Subject: [PATCH 0478/3458] 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 663322de25cdca32b39d5599689f2f554aea799d 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 0479/3458] 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 87174de05ca6a92fefa4256d846a5aadf274283b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 24 Jan 2021 23:03:29 +0200
Subject: [PATCH 0480/3458] 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 f403b87966519b803b22a11832cecc0d8b21ad3a Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 24 Jan 2021 20:26:38 +0000
Subject: [PATCH 0481/3458] 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 fcd5cb46a540766440dbc042e2ca2755ef113616 Mon Sep 17 00:00:00 2001
From: John Rowley <hey@johnrowley.me>
Date: Sun, 24 Jan 2021 18:24:47 +0100
Subject: [PATCH 0482/3458] 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 504f26d4617bf483e3ac1347402d4bd6cce02ebd Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 18:08:32 +0300
Subject: [PATCH 0483/3458] 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 30b9f77a205a2028c2468ebd30c7c36529e042a2 Mon Sep 17 00:00:00 2001
From: Jaume Devesa <jaume@mailbox.org>
Date: Sun, 24 Jan 2021 06:52:18 +0100
Subject: [PATCH 0484/3458] 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 50448f0f0560c5533b7a422508cc4db26f59c61d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 11:31:24 +0100
Subject: [PATCH 0485/3458] 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 75168bd914a440ad9a0f3103405278eaa34f89b5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 03:29:34 +0100
Subject: [PATCH 0486/3458] 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 ba462cc714ddd17646c386e77d658e99e5d5457e 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 0487/3458] 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 5b3ff97d68dd9ea2b69afb5ec500392bd8fb3cd9 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 0488/3458] 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 be8a80a60ff04ad3b1a2594a8f57118af808bdcf Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Fri, 22 Jan 2021 19:29:20 +0100
Subject: [PATCH 0489/3458] 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 1b299529bf18ff1394629e2b2575485c9aa3f09e Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 17 Jan 2021 06:11:42 -0700
Subject: [PATCH 0490/3458] 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 c5096e0c8a702a86a05cc6651fb42a03ac048588 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 17 Jan 2021 06:11:37 -0700
Subject: [PATCH 0491/3458] 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 03df76622f1d99a78bd2b2c42ff34b8caf586be8 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 17 Jan 2021 06:11:32 -0700
Subject: [PATCH 0492/3458] 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 40720c293032fd07950c2d1686702aa6b62f254c Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Tue, 19 Jan 2021 23:41:04 -0700
Subject: [PATCH 0493/3458] 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 56f01a4d80d92c997f06de357b8e0422fdb119ee 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 0494/3458] 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 3ca8a7602e113d0a299c1287a0e153133d187ade 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 0495/3458] 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 2fd1e67521a1c876b8d5a3e6d8edd1c1f82dbb9f 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 0496/3458] 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 c7c8d0566a6406bd02863509ad3aca328ecd09a9 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 0497/3458] 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 58d81e17aa45bdbdb705afcef6349ec8af1fa03c 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 0498/3458] 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 56f00c0703895b2d5c561ae3dddc4d261caa5a3d Mon Sep 17 00:00:00 2001
From: Will Springer <skirmisher@protonmail.com>
Date: Thu, 17 Dec 2020 23:57:55 -0800
Subject: [PATCH 0499/3458] 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 993a3c38f9b1ab66bbe04a3047fbca1eafb50aca Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 06:21:15 +0100
Subject: [PATCH 0500/3458] 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 0e4f91d82bc1fa0b80fdcfe28b45a83f91cb7cf2 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 0501/3458] 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 d690da08af9fa67f38860b2504ffcaa392624487 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Jan 2021 10:10:33 +0100
Subject: [PATCH 0502/3458] 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 6a945ebecf9e9eb04814851dc5bd48e320cba60c 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 0503/3458] 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 a90a6ce06b13492283bf6bc040da63e62b1b2b96 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 0504/3458] 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 f7c965142c2df091c386342ae036a0429073e475 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 0505/3458] 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 ff2e3afc302cd95c71d43309fe8df1330f186874 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 0506/3458] 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 589b7ee46705c6e7e759109b01a5983102511bef 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 0507/3458] 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 eb333ac65d5e733297752280b663a03ccb551319 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 0508/3458] 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 fc516b3124b0c91602ee53345b9957c941e217b1 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 0509/3458] 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 e13cf992caa24538df1bfd8324a6582d661f1f52 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Fri, 22 Jan 2021 22:43:40 +0600
Subject: [PATCH 0510/3458] 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 7b5c9664ee17f342e60ca936862f842765b77391 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 0511/3458] 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 a96b2eaf96c30b77dc4c8fa1ca59ed3506f8b97f 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 0512/3458] 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 43198ba40d8b2396d66825ce240f6b5d1a240ba9 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 0513/3458] 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 c41ae7ff38b114375b424516dcc48cd333f24fe7 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 0514/3458] 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 42bfe9480e316d30d5678eee11f70265f43d2b5c 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 0515/3458] 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 829795e3cde3e91706b0ab71a9a2e8d7c603a085 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 0516/3458] 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 c933bb3ac93556e0333984dfe30ddbd4348b2b41 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 26 Jan 2021 16:50:23 +0300
Subject: [PATCH 0517/3458] 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 5462e83fc8f986a1d1c0edabbf505a497d76ac19 Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Sun, 24 Jan 2021 14:46:10 -0300
Subject: [PATCH 0518/3458] 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 d4a491fe9ad3cf536335386dac85d4f9d3888a2b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Jan 2021 14:30:43 +0100
Subject: [PATCH 0519/3458] 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 c04055045a156f6f361961e7d889cc81fd007c95 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 11:35:15 +0100
Subject: [PATCH 0520/3458] 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 c471ecbdb7bbb4886fa8a096d88d1dae2026bec8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 19:53:19 +0100
Subject: [PATCH 0521/3458] 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 c1353b06bbad531f21f4fab1911bb1e20f3c5462 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 Jan 2021 20:04:43 +0100
Subject: [PATCH 0522/3458] 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 cb911f6544e9af916ef7f08db488182a5dce5f13 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 0523/3458] 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 4470ef8f8c99dfa360e1ac7afbad6a0a2364745b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 20:17:55 +0100
Subject: [PATCH 0524/3458] 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 d2db3637156821d9c6772b79d6d057baac48ffd7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 20:46:36 +0100
Subject: [PATCH 0525/3458] 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 8fa8358830828072407b18b22e24037d1b55be01 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 26 Jan 2021 20:47:28 +0100
Subject: [PATCH 0526/3458] 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 ba5b922f7f6f46e1eaf0bdc1288938a6235314c5 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 26 Jan 2021 18:51:23 +0100
Subject: [PATCH 0527/3458] 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 518a2b4460657eab27ed15bcc82c3fb05ef68f42 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 26 Jan 2021 18:59:36 +0100
Subject: [PATCH 0528/3458] 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 c6f19e9514a213f7cdb53632556b44988307ab2b 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 0529/3458] 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 b3189e7787072d6cdd11ce8f781389b5e7ea3de3 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 0530/3458] 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 0e7fd68c06e5b51b1dbc4fe2f9339e9f881d18f4 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 0531/3458] 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 e184e852d4ebe371e921757b3c36c1526dd62b71 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 0532/3458] 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 9d4756ca0b3e64346f9b73eed2c8486a0ee75e50 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 0533/3458] 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 5785f91ef547b68c2815580b7e16cbc60764dfdf 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 0534/3458] 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 0cdc4faa09bf5654d049511a0f11c8b58c3a9010 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 0535/3458] 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 6f0618d554540512fa854a8d42cd68fce69ce3f1 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 0536/3458] 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 0ceaaf33ff310f1890d92b010143195b64f34fd7 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 0537/3458] 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 449a8fade82d533a8d7c356649aa46aa2ecd464c 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 0538/3458] 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 dbdb9542aa2e19eb050526b75d5fbfd68388b12e 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 0539/3458] 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 2fde866bf64490d38a3518108372326f2f73baab 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 0540/3458] 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 03d653f28984f56446a2a31191beca0de6f13faa 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 0541/3458] 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 cbad35be804fe3ca6a7092e34bd5948f6b4502c9 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 0542/3458] 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 f09b5e630e7fdde61aabb370aea74995d1d3d6eb 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 0543/3458] 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 80317ce691d51c3ac04214fecfcb520a1015ae5a 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 0544/3458] 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 e5504782750d28dbbaf77aef7a1e89cb1abcb78a 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 0545/3458] 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 06f9b7835f49ea94577fdeb5482e428f14b66dad 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 0546/3458] 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 4432349ca1127076fc3cadee05061d7740395a5c 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 0547/3458] 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 2c1e56ad77593c0eacda7736604b5c6b48f67b77 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 0548/3458] 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 c6b930f3905e9a86df3feb5f1827c3217cf3bc24 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 0549/3458] 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 351cb4468fa76c9771ed4e8eda9e9b35ed5c4b0e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 00:29:52 -0500
Subject: [PATCH 0550/3458] 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 6ce56c7b65dc52bb6923d768ce338a28542357dc Mon Sep 17 00:00:00 2001
From: Enfau Kerus <kerus@enfa.uk>
Date: Wed, 27 Jan 2021 15:44:28 +0800
Subject: [PATCH 0551/3458] 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 636ac1781b9ecdabb5c3ebe7160b7950f63bce72 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Jan 2021 12:58:18 +0100
Subject: [PATCH 0552/3458] 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 c10875bebbc2e26f03b2dc653bafc06007b4297b 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 0553/3458] 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 dd2eb60ec9ecd61261d39943708527edbb538575 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 0554/3458] 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 4ab139a20d2c3ddcae1d963e93ac1a6bf0eb3f8b Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 26 Jan 2021 17:56:39 +0000
Subject: [PATCH 0555/3458] 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 4098879dff4b60166d9d7b3a019dad22a5a15812 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 0556/3458] 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 c091c6b008ad484abd7a83958b0f50d1763ce353 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 0557/3458] 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 b1520418ce213e69a385c639910613ad7b87fe21 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 0558/3458] 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 2f484bc7df2ba5d0e1d5593a2346b2b68487f068 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 0559/3458] 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 4d65c7d1ec1a44fc942a1d475319aaa9bb6f9481 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 0560/3458] 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 ca866c2c7d7376e4771f41b6f2070e824646d213 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 0561/3458] 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 00b5c356d054560079faf09be75fad2778bdca4d 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 0562/3458] 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 f368e4ffa499081ffb9fc74430e900371ca91297 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 0563/3458] 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 fa10e4c2727020676dfc8a0bc7dffa670896b213 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 0564/3458] 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 ea9339a1bf8848ab34cd6c522290375fe54e9a34 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 0565/3458] 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 4e0ac22826f73f543ad3b7102839e50a82b7854c 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 0566/3458] 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 91563ecc4e84a4636e9e8113298f60249968b9b4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 27 Jan 2021 19:06:21 +0100
Subject: [PATCH 0567/3458] 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 648935ca30c351f6e88b02599b061a624d6e9948 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 0568/3458] 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 b7c5d7e99455a9d724f93d71a8081779c138a05a 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 0569/3458] 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 beedfe47c1d7c2eebad88c90d00cc881d2af94d9 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 0570/3458] 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 86a9305c2c5aaf0408318563c8590888b107e9b1 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 0571/3458] 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 069a994db661467369a1de01abc8a20f9d548e80 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 0572/3458] 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 9d1fc21d236047900d26822225b0cc225a33bd16 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 0573/3458] 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 be1e7a1c75e3bf7c4a6bbbd403b9cda208bd82d9 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 0574/3458] 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 97177d55462dbf3bec9d51182bb51321768af054 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 0575/3458] 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 196b3488f571c14a892d7f7d295eaf5e219e28b0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 27 Jan 2021 01:11:52 +0100
Subject: [PATCH 0576/3458] 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 a34f2dc3d9c0e188d65f3d3dc68882ba8df5426a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 27 Jan 2021 19:42:53 +0100
Subject: [PATCH 0577/3458] 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 5757c557f3816ee9828924c6cb9b8c6cd58f9bb4 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 0578/3458] 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 92b2e1a8637a86e0643c97049324888fe5596c51 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 0579/3458] 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 05846d3bff0adcb4a1b8578d5af47bccafcd1455 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 0580/3458] 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 50d893066853c80e42ea2bebe84d0f0004df6958 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 26 Jan 2021 16:19:39 +0100
Subject: [PATCH 0581/3458] 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 8479c305d9ad5825eae16a763d2f2b299a2e801c Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 13:49:59 -0500
Subject: [PATCH 0582/3458] 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 9ea704260c6599841248594c65b743fb786a2d5c Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 15:46:27 -0500
Subject: [PATCH 0583/3458] 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 dc1845701679fcb566d1d2ffcbf54a495444707c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 28 Jan 2021 00:31:40 +0100
Subject: [PATCH 0584/3458] 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 660dd7d92948dbb83f32fb9e740ab0f2be2a3adc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Jan 2021 16:55:23 +0100
Subject: [PATCH 0585/3458] 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 dbc71f107bc82b337644a2e216d14fc25a1208ad Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 28 Jan 2021 00:59:14 +0100
Subject: [PATCH 0586/3458] 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 df3ed5f2b2504ba9f94606aee4534c50953bf63d 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 0587/3458] 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 21f3d6ee07c036ba13eb4e194b85d83683d5df04 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:28 +0100
Subject: [PATCH 0588/3458] 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 b2fb5a5dafdc1bb24c080d01f4d37ef6cd0d2e14 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:31 +0100
Subject: [PATCH 0589/3458] 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 29459e75d229b449f8f856b5bcbb999df7d05710 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 23 Jan 2021 19:58:33 +0100
Subject: [PATCH 0590/3458] 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 63294489b4f009ab2c28cb31e2be3ff3215e3f1e Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 27 Jan 2021 19:52:21 +0100
Subject: [PATCH 0591/3458] 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 5b2048c14060a491862f6f7bab24ef07ba7ffef5 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 27 Jan 2021 19:52:42 +0100
Subject: [PATCH 0592/3458] 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 b87a84064a4bace3d9d26c699c58e20d86f7263a 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 0593/3458] 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 2fb7298f69bb7e2685cf89ed62dd3d74deaeeda3 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 0594/3458] 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 053892614a0bb15a8b8da0c767bac4e352d7dc5a 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 0595/3458] 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 a6a9527feafd482f45d9f02fa5ef2b51bf5cdf4e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:27:23 +0100
Subject: [PATCH 0596/3458] 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 66cc206fe057788b168247a196ad8291e0cee79e Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 24 Jan 2021 19:51:36 +0000
Subject: [PATCH 0597/3458] 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 696bb3c1393d558dbfe04f76490f0f1a8c8a1eb0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 25 Jan 2021 23:51:26 +0200
Subject: [PATCH 0598/3458] 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 3f4e8d47ea24c8bf36576c4e41592ec99db5bb07 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 26 Jan 2021 17:34:18 +0300
Subject: [PATCH 0599/3458] 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 8f749aebfe509381f7139490d7ed9dc104855e4b Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 26 Jan 2021 16:24:33 +0100
Subject: [PATCH 0600/3458] 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 6c78c4dac02ee3b21b76f94255b87b3009deeef8 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 26 Jan 2021 19:40:24 +0100
Subject: [PATCH 0601/3458] 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 f10ad3c0ba975ec9593533031ce8373a0a7e9a40 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 0602/3458] 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 ca4e80903afa015ff4c4202b320f6d8d44e4b702 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Wed, 27 Jan 2021 16:24:01 +0100
Subject: [PATCH 0603/3458] 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 0488da3415825f4fdefa22197250570d2afb6af9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 27 Jan 2021 18:21:09 +0100
Subject: [PATCH 0604/3458] 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 65be4c8d4e497dfd159c6cfe4f84d3d3e0567e34 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:28:09 +0100
Subject: [PATCH 0605/3458] 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 a7a360953b9cac7221a82ef23467feb79790edcb Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 27 Jan 2021 19:54:05 +0100
Subject: [PATCH 0606/3458] 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 1ca1f3023dcd0d98b9acdb6535cbf5d05ebb5952 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 26 Jan 2021 00:08:20 +0200
Subject: [PATCH 0607/3458] 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 df4a11f64386344286b392c3a85092f019e8aa6e Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 14:55:42 +0000
Subject: [PATCH 0608/3458] 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 e311e94d98a319bea687a2ad83a85521e424c2d4 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 21 Jan 2021 21:08:13 +0000
Subject: [PATCH 0609/3458] 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 9e97b527958b9ca936d92b301255a8013839464c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 21 Jan 2021 09:46:56 +0100
Subject: [PATCH 0610/3458] 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 1e51bb0a9adffdf6411bc040fa662498dec74051 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 0611/3458] 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 27a9f7e76e5e396ff50d29003c97d64a94956d31 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 16:50:57 +0100
Subject: [PATCH 0612/3458] 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 6024db6618810813f1b1541d1184cb6a5fda424f Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 24 Jan 2021 17:05:56 +0000
Subject: [PATCH 0613/3458] 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 dc925cebcdb44a116379b25db91b6850f3146e7b Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sat, 23 Jan 2021 13:54:00 -0800
Subject: [PATCH 0614/3458] 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 483863f3a39b293180195bf6d26715e61d174262 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 20:37:21 +0000
Subject: [PATCH 0615/3458] 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 6c35ebf7efcbcb366ac6327988567f98f5669723 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 27 Jan 2021 17:11:07 +0200
Subject: [PATCH 0616/3458] 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 e31091d93142e5f8b7324ea130eefb93175a2201 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 26 Dec 2020 18:50:34 +1100
Subject: [PATCH 0617/3458] 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 d4655a1ebdcf751f875985c540598a9596e3ecaa Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 26 Dec 2020 18:59:08 +1100
Subject: [PATCH 0618/3458] 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 9273a4656d23992158e64d7a7b92a8888d724e61 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 23 Jan 2021 08:40:57 +1100
Subject: [PATCH 0619/3458] 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 35dd3b033c34d43842e1858265fa4dcf7eb76918 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 12:10:26 +0100
Subject: [PATCH 0620/3458] 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 1cb1dbc500537190795159c19c6ec151628086a0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 13:19:09 +0100
Subject: [PATCH 0621/3458] 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 2342d4ab8fa68f2de47167dcaeb79a8bc9b11c3d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 13:31:13 +0100
Subject: [PATCH 0622/3458] 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 608f56bbf2a9865dbb1b5f5c2554149e1380adeb Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 26 Jan 2021 09:46:25 +0000
Subject: [PATCH 0623/3458] 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 8ad43d378e8d7ff362148ef99d3b2e4be36be3b3 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 28 Jan 2021 08:10:28 +0000
Subject: [PATCH 0624/3458] 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 bfada977bc3119a8bc5d5e8a6b5bc83d380e0964 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 0625/3458] 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 ffa97c4c02f9c5cf8bf7c62ae804c5f42e3881df 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 0626/3458] 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 76f0f5ce5fe8beb81d2eae596fb2615b61f06da0 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 28 Jan 2021 11:20:34 +0300
Subject: [PATCH 0627/3458] 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 f9f3975c4f3ea3e0728bba3b921fe64a6ad3c65e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 15:56:41 +0100
Subject: [PATCH 0628/3458] 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 5c628f038173cc519f17774d13781233fbee0ddb 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 0629/3458] 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 1a195782ed47586da10791b306d4d5636b17d3ce 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 0630/3458] 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 a68e89f643d933e02752d5e3854c166ef5a5a89e 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 0631/3458] 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 33a6b34e33bf102472e15ff8649562dd346c4215 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 28 Jan 2021 18:49:27 +0100
Subject: [PATCH 0632/3458] 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 3a3025a7164e4f5bb905939783d523b1b6e5f049 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 28 Jan 2021 19:13:36 +0100
Subject: [PATCH 0633/3458] 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 50b6aaed5da332a284dc152f2075a842c87200ad Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 27 Jan 2021 21:36:26 +0100
Subject: [PATCH 0634/3458] 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 d940fa12804bb6d246284d7e38957c271a82f4d5 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 27 Jan 2021 21:36:32 +0100
Subject: [PATCH 0635/3458] 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 90cebaf167c780b23aef07bffce87c4d661f4549 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 27 Jan 2021 21:44:14 +0100
Subject: [PATCH 0636/3458] 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 e0902374eed19417ddd0071d4912ea017cd2c0c9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 28 Jan 2021 19:22:41 +0200
Subject: [PATCH 0637/3458] 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 9d4b17ef9c57c6d97d08f3f48a697078e365d504 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 28 Jan 2021 19:02:26 +0200
Subject: [PATCH 0638/3458] 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 f244a98da56d920140c1d5ab45d4c8875ce87380 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 0639/3458] 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 8da332fed3945b01114a6b40f525c8afb7542424 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 0640/3458] 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 15acb1c8a1d88d787b61f16359bb3d089ce763e7 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 0641/3458] 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 a38a918d689dd39198cb2e3dd7f291e666534f6a 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 0642/3458] 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 9e3c033220f1cbf6a86db648d6b14960ef96225f 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 0643/3458] 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 7a48d35ca4b21f652070541d9815f59afcd0d19a 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 0644/3458] 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 fdca661f5361e43530db69d30e54b534bef7776d 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 0645/3458] 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 3a3b5e4ab3955197b171f7f4719723eacb75ff75 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 0646/3458] 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 3d4962452e50fae6b560cd0a9dfb672c4f085d8d 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 0647/3458] 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 e550d379234b24a270fa63facb8f77c9938dfb62 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 0648/3458] 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 a47ad95e47f626dcb43e23b2d2ebc8b3eae5eb77 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 0649/3458] 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 fd928b4834d406506d946310afeea3fc638a4399 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 0650/3458] 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 eaca270c47c9f7ed63c43608a6340d25c773e715 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 0651/3458] 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 80b5c4ed097caa6173e7fd81e9dddf3fb796c6ce 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 0652/3458] 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 c616bc62c7cf26be5917d4c13fde0c4e53b59a42 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 0653/3458] 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 4b3ff2ed02d8650f4a6821fc548aaf5ecd2e934b 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 0654/3458] 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 d909cd28022364394ea6e3230c12f77fa5405fe4 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 0655/3458] 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 ba1b7afbf7c5e8d2b37dc19024d6a4f023536466 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 0656/3458] 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 ae9b5897e415e74f8fd92d11b1872a4627e36f45 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 0657/3458] 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 70db9a444e56d42be0121e16341ee5fb50976cc7 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 0658/3458] 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 52da3c9d367d556fba823ef11b64aa87f5e157eb 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 0659/3458] 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 640ab646201fab3e7c9a7d4a2573b0623ce5abd1 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 0660/3458] 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 57c9c3d8069a3c0135e14fc35dfabbf31693e055 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 0661/3458] 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 1e804f971ad7bf5f3a5415fac05dedb2e19f05e2 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 0662/3458] 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 eb20cdf809f08f275bff8d1aca3bb87a6d073cf6 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 0663/3458] 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 f3b1e8d7dbe5cb8ee8e8a75f57441063d192d481 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 0664/3458] 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 e957e64598e952fca57eadaa823422c3b610555f 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 0665/3458] 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 6a06215c83e4a86f845ed29d233e3317779c167f 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 0666/3458] 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 ed55702dae7b9013b312d99e93c402fd23315c24 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 0667/3458] 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 1a8487c528f57ce4e76a506851f0f24884f511af 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 0668/3458] 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 468a76943dce38a015df185805f7deb3fc8cf7ba 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 0669/3458] 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 91a2e88a1d661f0e9714d5d320f3a21e88d5ff37 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 0670/3458] 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 f48515bda8345ef47942117cc51a8842ebc1d1c9 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 0671/3458] 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 7e6f68ccca733ab3f81c016ab097be55a0e80dd2 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 0672/3458] 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 6e8a0f9aacff55b65d5944abe1544a307f2c3cf7 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 0673/3458] 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 b7406f7a605cf7aeb421051ff5f5b090b903a822 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 0674/3458] 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 3e39a7d760a15c809bda7817c6a87a167478395f 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 0675/3458] 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 27161347ca60f9c7b4ff93f43d673c621b1c9910 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 0676/3458] 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 0fd7e0b26e95984a980109c9e4aebddc61ee916b 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 0677/3458] 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 20920512cf7101bfbb9304b21beb4ebc9d76edab 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 0678/3458] 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 3f1dfeb7b96e5b692a63d70b6f1728e42c0e8740 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 28 Jan 2021 22:20:42 +0100
Subject: [PATCH 0679/3458] 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 bae26d401ead1c6a506a6987419b1115bdb17d76 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 28 Jan 2021 22:25:01 +0100
Subject: [PATCH 0680/3458] 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 af5e65989c3914b8760908f7aefd4a55293e391a 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 0681/3458] 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 cdaabecc52dcfe596391b2dc72d6ad615744e7fb Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 26 Jan 2021 21:04:54 +0300
Subject: [PATCH 0682/3458] 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 9ef50101be872c586bb9cf4e2789df3a18bc5596 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 29 Jan 2021 01:45:20 +0100
Subject: [PATCH 0683/3458] 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 11db9b27444d8e8c175a2d30311bebe7d4d666dc Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 27 Jan 2021 18:08:11 +0100
Subject: [PATCH 0684/3458] 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 66eeed1b19f8bf98c84a1c596ecd050e0207146c Mon Sep 17 00:00:00 2001
From: George Matsumura <gmmatsumura01@bvsd.org>
Date: Wed, 8 Jul 2020 21:16:47 -0600
Subject: [PATCH 0685/3458] 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 fb7ac7d06c011947128b296d534cafbc5cfca42a 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 0686/3458] 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 6a88cc0459441a605ed80343fd3f95dfdfc42371 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 23 Dec 2020 23:42:29 -0700
Subject: [PATCH 0687/3458] 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 ed900f097a1c69083d19f9f56aa8c89d30cf773d 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 0688/3458] 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 a96e5c87e2f45e2aaeffdbbcfc7254152eb114bf 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 0689/3458] 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 f61647e2ed68bceaffd9577c93cf697078d21186 Mon Sep 17 00:00:00 2001
From: John Sullivan <jsullivan@csumb.edu>
Date: Mon, 21 Sep 2020 21:58:31 -0700
Subject: [PATCH 0690/3458] 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 be4bbe1994b6311b632d2d1b7a378612323bd617 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 0691/3458] 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 b31d2db19f063f56c5130d368f3a3fa114166ff3 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 0692/3458] 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 cad41dc4278118713066b48b8a258ecc528ef5fb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 11:54:38 +0100
Subject: [PATCH 0693/3458] 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 c0e8875ebee4032f1668cfda67af834e768f82d3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 12:01:19 +0100
Subject: [PATCH 0694/3458] 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 68991b456d65fda8fb99d4b0fb0df53256b924f7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 13:19:57 +0100
Subject: [PATCH 0695/3458] 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 e7de98af20e40c475f60b4bb2f142c4c3178814d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 13:23:53 +0100
Subject: [PATCH 0696/3458] 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 1160c36fe3b7c69b475390e17928bf017707f88d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 13:24:31 +0100
Subject: [PATCH 0697/3458] 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 0fd9bb2773c9e486dd3d2989b7b38dd0b4bc9939 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 0698/3458] 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 3af36fe34634b333b67a246ed960c8ed29b85afb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 14:20:39 +0100
Subject: [PATCH 0699/3458] 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 fffd26670885340fa26c4ad3a399e129702818f8 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 0700/3458] 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 7ca2be6d92f999f103c936007b312ed9c7604ff7 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 0701/3458] 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 f1ea26381e95d4101f65d31bbbb88f18656a9acf 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 0702/3458] 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 803c1786437b0a3ade208a144f4e248e6f2d9165 Mon Sep 17 00:00:00 2001
From: bhagwan <bhagwan@disroot.org>
Date: Wed, 27 Jan 2021 13:59:23 -0800
Subject: [PATCH 0703/3458] 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 06c09e02c6d171a02221bcf3bb83fab0e233a9ff Mon Sep 17 00:00:00 2001
From: bhagwan <bhagwan@disroot.org>
Date: Wed, 27 Jan 2021 18:08:00 -0800
Subject: [PATCH 0704/3458] 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 8cc674860f1fdbeae397ebc13a7d1a808738463e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 16:56:24 +0100
Subject: [PATCH 0705/3458] 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 473cfc88139f663ea00be98d8678148c78bd77a5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 16:13:41 +0100
Subject: [PATCH 0706/3458] 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 affdddeca4f8b6f8e9351e3f320048b4ba422b01 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 0707/3458] 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 8c5c55e5ceb4db53914d573fe8d6d8de179b64bd 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 0708/3458] 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 6028b9a76717892a556101daebd12bdced368a31 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 0709/3458] 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 77029ce725afa2305ba8b2cf812c4b3158eae7fe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Jan 2021 19:42:11 +0100
Subject: [PATCH 0710/3458] 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 bac945626fd3e965ebfd320ce04f7f46dc110c13 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 0711/3458] 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 d10ff2b0f09987a683638eab88db8a5bc12839d5 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 0712/3458] 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 7cdcd73d715a1a9db01ba88e53fe1fd5a16fffbb Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 29 Jan 2021 19:39:28 +0100
Subject: [PATCH 0713/3458] 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 1a7e068b643a526bbc7a30ff6c7b166c12150da9 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 0714/3458] 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 a43de4a8bac929604baeb1de1fcdf9411d6c2206 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 0715/3458] 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 52dc7a8138239c48aac3ff51fd588e506eef5a84 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 0716/3458] 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 badfee714c9f8225d91e75524a20a2b504104cb8 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 0717/3458] 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 8b8c0b2fb3ed76bf605bf957567565acee9fc639 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 22:44:49 +0100
Subject: [PATCH 0718/3458] 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 05185b85426e9628bdd882cd6d4231291a3ab5c6 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 0719/3458] 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 463dcae9dfc0ae857299f94bbf703d8da80a9794 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 29 Jan 2021 23:56:44 +0100
Subject: [PATCH 0720/3458] 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 a542f5f58cf1852be4cc11567813ff28ec5a029f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 01:32:58 +0100
Subject: [PATCH 0721/3458] 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 f221dfe6360e364bc63208862bcf495f6807b1ab Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 01:38:25 +0100
Subject: [PATCH 0722/3458] 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 adf3a971582f41cc667ec9044a26dec581ab4ab9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 01:40:47 +0100
Subject: [PATCH 0723/3458] 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 8ac8291038041bc2b48c92f90cde1cc02a1c2ee3 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 0724/3458] 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 453fe7a22496d573ea1b9b37f197bc825a2fd7cd 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 0725/3458] 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 ea873f7770987e02bfb4a7f680adda2907df1f80 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 0726/3458] 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 9cbd23e431e6e34f252524a27b6623c5f080a89b 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 0727/3458] 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 251f38854ac630adc75277e7c93126b8a13597a7 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 0728/3458] 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 5818c1425fa7ee9aa569696bc3ff9ef8fcbf1802 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 0729/3458] 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 bf2ad41b328aa212a72917127f32c621ef699bff Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 30 Jan 2021 13:52:45 +0000
Subject: [PATCH 0730/3458] 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 9b61461f50f95c429462d66fc687cb166ef2b9c5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 09:58:07 +0100
Subject: [PATCH 0731/3458] 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 6c98ee2b629b93e33f6d69f71e2465e7c339aefe Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 01:58:11 -0700
Subject: [PATCH 0732/3458] 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 1a55025f4c46f483ea04873bad69266ae3eb2334 Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sat, 30 Jan 2021 05:53:35 +0000
Subject: [PATCH 0733/3458] 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 110860be992fdc0e63ce3c4ce8539f790302ef27 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 09:53:36 +0100
Subject: [PATCH 0734/3458] 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 caf75f4859c7543d960ddf697ca9a8f9994b0ae2 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 09:50:21 +0100
Subject: [PATCH 0735/3458] 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 90351a83a961cae91c33d3f67a308f5b3d8bf7f4 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 0736/3458] 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 4ed28a5c6426a567f2b90e548668b7037648e145 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 00:42:31 +0100
Subject: [PATCH 0737/3458] 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 47ff8b11fbe4f91018a414277b07ff2419013510 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Jan 2021 01:18:07 +0100
Subject: [PATCH 0738/3458] 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 de5380bbaad02e6dce30331a2a2a2c3deec7caae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Jan 2021 15:19:31 +0100
Subject: [PATCH 0739/3458] 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 4d822486d9db43a16225a9944a07989ac1bcd8c0 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 0740/3458] 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 93d1a03fed938b53ba0fd249fa15ea4fd8d4975e 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 0741/3458] 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 079b3622712be3c1222462842b29e0a725f0e9e2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 30 Jan 2021 19:39:42 +0100
Subject: [PATCH 0742/3458] 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 deb1921400c8ef2e95e1aa0daba3cdf91b7f7c93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 08:34:46 +0100
Subject: [PATCH 0743/3458] 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 4bb7b91c55bac8f4c89a2df7742431e95f37ad3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 20:10:08 +0100
Subject: [PATCH 0744/3458] 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 9c40cfbfbf8039b081b4f5f85a64afd1ebe3e482 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 0745/3458] 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 f18bf6751e0a6ae518da760f5a693e051134b255 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 0746/3458] 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 7fcfb3ab2366b2d730db977d741896685063a62a 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 0747/3458] 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 55bf9dcb67f899ffca2b97e51c660d220644695f 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 0748/3458] 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 83c0d81d6ac93271dd28d7c51ba1a00e4eb41119 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 0749/3458] 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 23e825e13ad679003825818c985eeb956e8b2300 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Tue, 17 Sep 2019 22:44:17 +0200
Subject: [PATCH 0750/3458] 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 6e2eac6fb8531b10f88333142b9ab97fa8862b51 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH 0751/3458] 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 b5697cd572414592b1d0b19d5888b221c02216cf Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 15:59:57 +0100
Subject: [PATCH 0752/3458] 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 98c3cbd1e32f87fa4d491a9d3490922263ea240e 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 0753/3458] 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 ef7f94f13f65bb3ddc0d37cdfdf60dfc26832b66 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 15:54:48 -0700
Subject: [PATCH 0754/3458] 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 b031e807f940803713f5cdfa1b824e7261f53c6f 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 0755/3458] 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 f06f96c5db82f759d9641d68a9b58771cf60b9dd Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 15:41:59 -0700
Subject: [PATCH 0756/3458] 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 58f76e66e11eb62b7aa00d57e49c7243c458b15c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 17:37:39 +0100
Subject: [PATCH 0757/3458] 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 82cfaad932e62e66b3ee91c87b61539dd0dc81a2 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 30 Jan 2021 17:38:01 +0100
Subject: [PATCH 0758/3458] 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 988136f6c1e7ae86d932f2ed90e9885aca572c46 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 18:14:13 +0100
Subject: [PATCH 0759/3458] 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 9c2308e816617be94b492bafcec526cc980caba1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Jan 2021 23:54:41 +0200
Subject: [PATCH 0760/3458] 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 c4b31d8536aa9d8e961fe893a0d5bf6a9a245d01 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sat, 30 Jan 2021 23:59:42 +0300
Subject: [PATCH 0761/3458] 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 005e132ca89b1b7700ca0d76027635616ef44cfa 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 0762/3458] 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 b3426f6a5ee6082e27129d7e0c95b0a8f5eba9dd Mon Sep 17 00:00:00 2001
From: Renato Aguiar <renato@renatoaguiar.net>
Date: Sat, 30 Jan 2021 06:02:56 +0000
Subject: [PATCH 0763/3458] 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 da60fd552b09102d80f7a83a326c9f89552ba7f1 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 17:49:03 +0100
Subject: [PATCH 0764/3458] 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 474dce868a814fb0395869c056ca2f431c5cb5c8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 09:02:46 +0100
Subject: [PATCH 0765/3458] 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 ee54ede2e06dc21d4c08909a76ffdc15544a6c5a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 09:05:25 +0100
Subject: [PATCH 0766/3458] 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 9d0aebded46d144ca33308f4b376de22d83c5c8e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 09:27:42 +0100
Subject: [PATCH 0767/3458] 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 030bbfc7d63916630eada2d0d5549560b5508232 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 31 Jan 2021 12:20:52 +0100
Subject: [PATCH 0768/3458] 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 c0bbca2c6fb7945bb22acb8d539c6430cb586a2b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Jan 2021 15:52:16 +0100
Subject: [PATCH 0769/3458] 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 55fc7aef1d0cd7d7e97055546c9ac43e105dac38 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Jan 2021 15:54:42 +0100
Subject: [PATCH 0770/3458] 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 29db8fce877a1cc36dc87665af5f728644f35fb0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 31 Jan 2021 16:28:39 +0100
Subject: [PATCH 0771/3458] 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 9350e36aa3917c572f2a96aa212fd962d1df6b1a 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 0772/3458] 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 d889f5fbcc7d0bdd2ef65879f9e81badfd91e129 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:04:58 +0100
Subject: [PATCH 0773/3458] 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 cc99d298e90386fd7c688a66af4a2aedfb03daa3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:06:37 +0100
Subject: [PATCH 0774/3458] 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 7cf0a33c3594a67e6a6f379b2727d3786364fd0b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:10:06 +0100
Subject: [PATCH 0775/3458] 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 c905c74c8b3c9bc830d5d5254bf51a1237f7b093 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:11:39 +0100
Subject: [PATCH 0776/3458] 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 33231bfa3f70be450b0de11a5f38196191ffd174 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:13:01 +0100
Subject: [PATCH 0777/3458] 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 e86e6c6d5aef9e2d02973dda3512ac64fa493a69 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:13:53 +0100
Subject: [PATCH 0778/3458] 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 9a3e5c5ab5b900bedce8efa6350c7537012d7ec5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:38:16 +0100
Subject: [PATCH 0779/3458] 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 16d24e5185d17dcf47f67621f22b49098b8e00e9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 17:39:32 +0100
Subject: [PATCH 0780/3458] 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 9fd9099a69ce3e5808f3a7f112cc3a021d744eb2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:01:58 +0100
Subject: [PATCH 0781/3458] 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 8fe246651243bd710e3b064619d05c7416db74fc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:02:45 +0100
Subject: [PATCH 0782/3458] 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 151e520891dad8c9878d88af37d3f3dde2533628 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:03:10 +0100
Subject: [PATCH 0783/3458] 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 5fd1bde13c284df1724de76793b8b4169ec47250 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:04:16 +0100
Subject: [PATCH 0784/3458] 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 e2e99d5217327caa9c8e321dbee5c7bebf73d4f9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:04:46 +0100
Subject: [PATCH 0785/3458] 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 1ee925357898cb16f00e3f71ad2cf685fad126d0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:09:25 +0100
Subject: [PATCH 0786/3458] 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 e5cd599d739941c2545f2973a0ddb8bf4abf2052 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:11:12 +0100
Subject: [PATCH 0787/3458] 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 0535ecd30a68322f0be4bde09d5077635c3fe2ca Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:13:58 +0100
Subject: [PATCH 0788/3458] 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 af78771c5cead590f4f4a6903de4421994beb9c1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:25:59 +0100
Subject: [PATCH 0789/3458] 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 815365762ab5c8e3e54180228fc0b52aaace16c3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 31 Jan 2021 18:27:25 +0100
Subject: [PATCH 0790/3458] 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 e191557d02c901ec81852df52675a06dd8064836 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Sun, 31 Jan 2021 04:53:23 -0800
Subject: [PATCH 0791/3458] 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 c0b2a6118263ae12886fb2f26b5288e79936b68c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 30 Jan 2021 18:46:07 +0100
Subject: [PATCH 0792/3458] 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 0a4060615588c5ec92c54898874ce1afe36379b6 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 0793/3458] 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 c1bb511d0b48c463f981403e461ee137eced3055 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 0794/3458] 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 f3174babd86df1eed63559d22faf7cf11bc700e6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Jan 2021 23:36:05 +0200
Subject: [PATCH 0795/3458] 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 66674f0d7462dcfb168ca3c026ce7e7d8db181c1 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 0796/3458] 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 b4216c066bcf765a66f6b02e7644d126ab4f3901 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 0797/3458] 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 51867d6e4356687b494c06bfd4eaf73bbf8b2008 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 0798/3458] 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 0f84adda7517c68790c9dd1de9c0c0c293ecc4d7 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 0799/3458] 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 a974e48ec43709bda3ce017402fb0e0251846b29 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 01:33:16 +0200
Subject: [PATCH 0800/3458] 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 35c7d79621f6f9f7acff5f71e905faa591d98ac2 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 0801/3458] 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 d9fbd355cb41a0d77d497b63d09f2b85e422be5f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 01:59:01 +0200
Subject: [PATCH 0802/3458] 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 0ed5ea3fd532061dba3e37df708230d1afe0053d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 01:52:37 +0200
Subject: [PATCH 0803/3458] 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 db9e4531517571d9e6d7ee944b9b05669c97437e 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 0804/3458] 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 90102442910f0a10ea786d1e43ba9d3946da67d0 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 0805/3458] 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 aa1da7659c7c8860ced1a9f9719493ee323eb89c 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 0806/3458] 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 fcc2be9fcd052643f7adf1e7d9142b5e92e837ec 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 0807/3458] 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 f0808d990d6953e30ca1ba36d8152c26dc34a445 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 0808/3458] 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 c205682e67784ecc676c5f999e51b634499a56f7 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 0809/3458] 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 9ad065521545844ff72f49c3c749cb63fb75207d 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 0810/3458] 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 07dce09de32fa180b956a3ce9523198e06a48c3b Mon Sep 17 00:00:00 2001
From: Byl3x <mbilek06@gmail.com>
Date: Thu, 28 Jan 2021 15:58:46 +0100
Subject: [PATCH 0811/3458] 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 b00381f8ce5c4bdaaa6f4fdc3b5bee0cc4662d94 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 0812/3458] 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 f50716cd9aa96049bd53455d967ff8d1d2fd5ac9 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 0813/3458] 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 9416b63745f6825f466ac10e60518ed4da2f88c9 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Sun, 31 Jan 2021 17:51:32 -0800
Subject: [PATCH 0814/3458] 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 f7509fa569af839d57f033221b1147ea011804b9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:41:41 +0200
Subject: [PATCH 0815/3458] 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 38855169019d3d6113604e77f7dc6bc557966e63 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:10 +0200
Subject: [PATCH 0816/3458] 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 8515c779b567376947830f9d52c981ef078cd757 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:20 +0200
Subject: [PATCH 0817/3458] 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 06e4fd6d54a21821ffb7fe911fafa29601c27f20 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:45 +0200
Subject: [PATCH 0818/3458] 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 db20cf7ecf21f682a95145d97c92e33b981702f7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:50 +0200
Subject: [PATCH 0819/3458] 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 1d9d71e6071c66120c5e917d12374e8ca3a2f7a0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:44:57 +0200
Subject: [PATCH 0820/3458] 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 93cb1fef60927fc89c1d27eec63988a58a314f81 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:05 +0200
Subject: [PATCH 0821/3458] 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 03f57c6c04290eede8f2800bd3490df96aac4f9f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:10 +0200
Subject: [PATCH 0822/3458] 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 9cf4384115381b468c55e920ac654f3cc0134f37 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:16 +0200
Subject: [PATCH 0823/3458] 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 c62773a180e24a039e9f061487d0857883cd915b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:21 +0200
Subject: [PATCH 0824/3458] 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 99d5afd86246e6ec11e035be047c82a7846aab53 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:28 +0200
Subject: [PATCH 0825/3458] 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 07dc993bf26e3caf8e4ce70f3a431eb65d740d49 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:39 +0200
Subject: [PATCH 0826/3458] 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 b84504d44845a8c271b508cf4f81f621d37971a5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:45 +0200
Subject: [PATCH 0827/3458] 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 9ec6405583efbc8d12356a1dd5443675ba424b06 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Feb 2021 00:45:49 +0200
Subject: [PATCH 0828/3458] 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 7c273d1656f084c2bf9d735249ae7bdb49dc108a 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 0829/3458] 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 75059ba3d1386b29e9c1ed90afccd60812976b05 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 0830/3458] 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 1996efcc13bd481a22fb23709e22b479d0d4e33c 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 0831/3458] 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 0ff698c8021fdf8f9f1f5309ad246393da59d912 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 1 Feb 2021 09:32:41 +0100
Subject: [PATCH 0832/3458] 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 a6209606a12ee494e2c3ad21c27a9f97f394cec7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 30 Jan 2021 08:47:52 +0100
Subject: [PATCH 0833/3458] 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 ae12b1f88a4388e594499f86fb7ad2ebe89d44aa Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 31 Jan 2021 13:38:57 +0300
Subject: [PATCH 0834/3458] 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 4b22c94b72378f8ab70de80078cf9d1506fbf8ed Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Sun, 31 Jan 2021 17:54:16 +0100
Subject: [PATCH 0835/3458] 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 0a98c831d6e3f1dd80fb5e80cae311b246b17ff3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 31 Jan 2021 23:45:53 +0100
Subject: [PATCH 0836/3458] 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 1c8a31ba736e454f64c7de0ef8f8eae9d6c80e1e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 1 Feb 2021 14:13:52 +0100
Subject: [PATCH 0837/3458] 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 8a91df2ac07b994489e44604586b8204a714ad06 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 1 Feb 2021 14:13:55 +0100
Subject: [PATCH 0838/3458] 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 48d3f77c5ccb33567a8a349a10fb79fe38d0f6a8 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 0839/3458] 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 dd74367ed642fb7107435b07c3530f2ea704d05c 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 0840/3458] 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 609c8e93a6e2bb5e82292a73b03b600727e33bdc Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 31 Jan 2021 14:50:33 +0100
Subject: [PATCH 0841/3458] 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 8dbcdf7bb0949ca2c10cf3c0ba6168ca3b385ff4 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 31 Jan 2021 16:19:24 +0100
Subject: [PATCH 0842/3458] 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 198a6166d0ed42b6db6d26a56c3998c6707fdbd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 15:08:55 +0100
Subject: [PATCH 0843/3458] 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 89d4b005b6c5485ad7e6f00d8a7c3c72469604d4 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 0844/3458] 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 5ad69efa2f7133057a6e415029e020b1ccca2c1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 15:41:58 +0100
Subject: [PATCH 0845/3458] 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 5ce4459e784a4eed16af7f92bc1dc4d0baf3ce43 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 0846/3458] 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 c3aad142476b04c6914ef01b0620be086943400b 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 0847/3458] 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 f8634e35ccaa0ce84b0ae4082bd871713f44ba0d 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 0848/3458] 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 d67b0122d6003eca6653842d3b2fd1af81ada438 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 0849/3458] 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 2321f82b74bb99194948d96bdea7fdc30da1f042 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 28 Jan 2021 19:44:02 +0200
Subject: [PATCH 0850/3458] 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 f36a9c1940d657f062df760eb87967e55e4bc4d5 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 0851/3458] 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 3001644918fcffb9382ba02900cae0b79d58ac01 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 0852/3458] 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 d2e79ee62a7c728d45b12536a7daa6e9c6d2cdbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 22:07:28 +0100
Subject: [PATCH 0853/3458] 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 045aeaf906a6a54ec36516c56c58de751677e217 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 23:18:54 +0100
Subject: [PATCH 0854/3458] 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 fd19d38292aadc7791b6268fae147a3d6dd4e3d8 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 0855/3458] 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 8db1379e937adc24f8e1ae901d57afe89e63fc02 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 0856/3458] 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 b1b19ed50723614a7571a0f5a43e53ee3e9de04e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 1 Feb 2021 14:50:29 +0100
Subject: [PATCH 0857/3458] 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 f0638ddd3d4e46a44b794b24217a5a513ca4313b 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 0858/3458] 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 65de3140cf0ba196c9789693523affc48387873f 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 0859/3458] 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 af4f91c83e92527ae31a2778d6eb6f6b6d186135 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Tue, 2 Feb 2021 11:21:06 +0100
Subject: [PATCH 0860/3458] 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 7d2fcbc04381fb1adf8c91b082c83363f6a31e06 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 0861/3458] 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 d44398df0784f64fe1469cb37dcca19fc2be571b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 2 Feb 2021 14:23:43 +0200
Subject: [PATCH 0862/3458] 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 b19badfdbe50d482bacbd89c42e991e44c3be924 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 0863/3458] 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 bf9ceacf91ecc8b4a2b5827aa8816f8212236fcd Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 31 Jan 2021 16:55:35 +0100
Subject: [PATCH 0864/3458] 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 d04821e0ec38366883a37f972868cb1d8093eabf 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 0865/3458] 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 e2ff8891795f172dd26184eaea7ee66f4973e2fa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 2 Feb 2021 16:26:03 +0200
Subject: [PATCH 0866/3458] 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 f8c1d2446635a716b533b72206b4dae33ad5b7df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 2 Feb 2021 17:02:28 +0100
Subject: [PATCH 0867/3458] 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 3db757cd24ba57fb836de9ab463b08ddaf214340 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 0868/3458] 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 c9f80c6e9d0f1e9b9f27a8971b78f8c869b4a267 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 0869/3458] 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 02386366ee219e78a57ae020134716a63cd52a6d Mon Sep 17 00:00:00 2001
From: Artem Zhurikhin <ashpool@xecut.net>
Date: Tue, 2 Feb 2021 20:42:11 +0300
Subject: [PATCH 0870/3458] 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 d25fcc8b2e5244182a1cb6a22dd4a081c1e29701 Mon Sep 17 00:00:00 2001
From: Artem Zhurikhin <ashpool@xecut.net>
Date: Tue, 2 Feb 2021 20:42:18 +0300
Subject: [PATCH 0871/3458] 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 e4d69b48356bc602facd362cc2d4410a0586daf5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 2 Feb 2021 20:02:24 +0100
Subject: [PATCH 0872/3458] 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 084d75f5951ec79e750e2d0bfd4028219c9d25f8 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Mon, 11 Jan 2021 16:26:38 -0700
Subject: [PATCH 0873/3458] 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 f67b1dbda5916bf665c8544d1c8dc0cf9ca5b56b Mon Sep 17 00:00:00 2001
From: John Sullivan <jsullivan@csumb.edu>
Date: Mon, 1 Feb 2021 15:00:56 -0800
Subject: [PATCH 0874/3458] 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 48b2997bdbb979850308b87d9285609bc27ddfc2 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 1 Feb 2021 15:03:30 +0100
Subject: [PATCH 0875/3458] 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 f623bd3a353acdb03156f65e09c98f6cdda1e75e 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 0876/3458] 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 ed609db499d082594efc298f26c50aff277e5b5b 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 0877/3458] 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 0c9483495cd358fb1dc77dddf3aac4cf18b03522 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 0878/3458] 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 7e7cf178ca5c1fdf575a23fd490d2b08e83a5ab6 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 0879/3458] 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 1fec4c6115e91bc1a0ada1f7a2089cab26b50d96 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 0880/3458] 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 a7505bea4a18e05806999b0a974cc37914ea5016 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 0881/3458] 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 4e51b76009b5c95c55e4af17c106ca80cfb2c868 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 0882/3458] 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 663c2f5f867ca5750d70236a01c3604856eeacce 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 0883/3458] 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 7e2a8d3209b661f758f09fae99c28b6d19f143b9 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 2 Feb 2021 22:02:03 +0100
Subject: [PATCH 0884/3458] 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 2e81f6f7b204714823ac1dd85238956a5911721f 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 0885/3458] 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 7610cdb1920500528a25834e7f284f2fce83cf67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 01:10:35 +0100
Subject: [PATCH 0886/3458] 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 1e3a4512b8f5a211e021f94cef8e3d71bfbd7895 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:56:23 -0600
Subject: [PATCH 0887/3458] 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 a9b648f93b374d1292541452184f8b8fa2679b6a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 13:59:27 -0600
Subject: [PATCH 0888/3458] 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 d7f6860981ea4e3e785f0f58d58b505c9ee2234f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:01:55 -0600
Subject: [PATCH 0889/3458] 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 4e3b71a442f2e97dee14db33851dc7ce90709073 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:09:41 -0600
Subject: [PATCH 0890/3458] 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 a77ef546e57e98018fb67e48978a54ef0509a317 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 14:26:13 -0600
Subject: [PATCH 0891/3458] 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 eaba589458ca8422f781adac66143a26f0638115 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:46:22 -0600
Subject: [PATCH 0892/3458] 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 ba52a98dae95723734dc893aa3d85b348c55622e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:52:30 -0600
Subject: [PATCH 0893/3458] 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 70620aa6f68f456b62a4920dd7766d6bf09f1d4d Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:54:53 -0600
Subject: [PATCH 0894/3458] 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 991ea703c506af84265015eea1f7a2cb283d9794 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:31:16 -0600
Subject: [PATCH 0895/3458] 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 25a9a62d7ea7ec0706bccd20ce46e830edac1c87 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:21:10 -0600
Subject: [PATCH 0896/3458] 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 f2d73f26f67bd88cec812307d0995470228a7c5a 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 0897/3458] 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 e4835922096f510b17ca58813df406a542aa8fce 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 0898/3458] 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 5f376f42030e1ce8d1de9bcefb28187395b950cb Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 1 Feb 2021 15:31:23 +0000
Subject: [PATCH 0899/3458] 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 a7d722940174646b9585c89b9a6b8a55c63d6efd 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 0900/3458] 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 85dcffe7118691e1d01e07cca7db8d1f1f89b9d4 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 0901/3458] 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 c8f96ab766236159d5bb65adf69d7c5673ebc815 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 0902/3458] 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 b45b6a26921f13ef6b2db525d42c44b67723761c 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 0903/3458] 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 fe55ca0b2dca2bd5bec7867562c468432a424181 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 0904/3458] 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 28cc12399c52db599f289bb13f52541267b79d86 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 0905/3458] 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 0e3a7c5a6a4a7a3cf1d8a31e0b7b3293471f9efc 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 0906/3458] 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 a9259b65e0a301ee97fddcfe358739cf2292fe8a 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 0907/3458] 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 f718973c398297b861f7089bdb75d358de1a9ca3 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 0908/3458] 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 bb3df6f44978f97b9ad091bc8430c452d99b74af 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 0909/3458] 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 e7c466027486ccdbfb86a7f04985a76eaf6e0390 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 0910/3458] 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 7342b5ca847c328b6aa92067a9e9afe8ca3a674a Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 3 Feb 2021 00:54:14 -0500
Subject: [PATCH 0911/3458] 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 f89433803ccbdcbaa2b9ee760d7eb867c86dfefc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Feb 2021 10:33:21 +0100
Subject: [PATCH 0912/3458] 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 ef1d7160a2d248cb6d402f6c675cdc29869c8193 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 11:36:43 +0100
Subject: [PATCH 0913/3458] 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 d8fc6575b4ba948b7c6e7dd0c855f78467438da2 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 3 Feb 2021 10:18:23 -0300
Subject: [PATCH 0914/3458] 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 08e5b4a6ceec3b77d2855e68eb6a6322c2b8df1c 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 0915/3458] 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 a0b87ebebb2811598d6ecf479bd32a675beb279a Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 3 Feb 2021 13:22:22 +0300
Subject: [PATCH 0916/3458] 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 3e7b45afb5e71be8b7bdd98740f0b3b5bd6785fa 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 0917/3458] 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 e56c47fd4aa879ac8a995e1782963770e6193997 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 0918/3458] 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 73db5976455c670edeeaee7c1664ca041cd977b5 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 0919/3458] 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 29f2ea9c03f10070cd1cba4a596ba64c65e87c5e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 3 Feb 2021 16:27:00 +0300
Subject: [PATCH 0920/3458] 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 3772eab8c4dfb5f5141d033f0c698f89ec364964 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 0921/3458] 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 4df176e69109de6cdf0dcae1ef6ef89b969c3aef 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 0922/3458] 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 dc1fd1de3fb3c5ea059ba47ef6d178a6b6c5c5e5 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 0923/3458] 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 cdf4fddc2c0fee28617d182acd26c24eddf870dd 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 0924/3458] 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 f5c40a3d7df0e9f23d329e7e47606ecb733b32d5 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 0925/3458] 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 a6a4d5d0a517f3e3c2c189f630eda292ee2f83e3 Mon Sep 17 00:00:00 2001
From: Tristan Ross <rosscomputerguy@protonmail.com>
Date: Tue, 2 Feb 2021 22:14:46 -0800
Subject: [PATCH 0926/3458] 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 deeeeb01774ccc052a9e61a2b8d849bb09db5970 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 31 Jan 2021 17:08:23 +0100
Subject: [PATCH 0927/3458] 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 3e8735e4cfbab97ad505c9864a93f4a971f06720 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 3 Feb 2021 11:24:24 -0300
Subject: [PATCH 0928/3458] 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 f7bd2a12ef4ebb2499de927621a94e7296bee211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 16:22:30 +0100
Subject: [PATCH 0929/3458] 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 f6b212393c29698458407a9b1e82e6d503955abc 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 0930/3458] 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 e25121da02506da7ad8b8208039a5493029a214d 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 0931/3458] 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 5f7cdb74709ce9dda93c50f9d3bc77537edcd19a 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 0932/3458] 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 e3f5ce1bb944e744a77b071b1c6befb6dd685c5d 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 0933/3458] 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 8d36f7325364d2b412c3393a56584d9bb55faf8d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Feb 2021 16:45:00 +0100
Subject: [PATCH 0934/3458] 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 9c2a78cd282ef79bb72169148c04841054159185 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 17:14:25 +0100
Subject: [PATCH 0935/3458] 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 a45256460e3506898f7f0f11686f90efde775548 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 17:25:34 +0100
Subject: [PATCH 0936/3458] 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 f1a2e6815eb448a1196dfaaa62c4585079ef321e 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 0937/3458] 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 e35b33b800edf0ead9b633245ad0d4b02c9b8bcf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 3 Feb 2021 19:09:38 +0100
Subject: [PATCH 0938/3458] 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 fee33f5442a96e7d9e4a57a5853193a72338be8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 18:51:10 +0100
Subject: [PATCH 0939/3458] 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 8e24dc522ac2c83b51773e4f77403ce2e70a7384 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 19:35:28 +0100
Subject: [PATCH 0940/3458] 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 9ab173a0085733528ac0f6dfa594f593566db56a 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 0941/3458] 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 16a35d0a9fa47c458c3dcac7441810c16be0ccc6 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 0942/3458] 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 2bd662e86240d7ea51e34439e440c1d5561eef3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 20:34:12 +0100
Subject: [PATCH 0943/3458] 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 e92fbd40e9653ff395c1a52b43f63e4dc926cd70 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 15:33:38 +0100
Subject: [PATCH 0944/3458] 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 4f121e2cfaa33796f509fb15e327c9ea9dcd6a16 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 14:25:20 +0100
Subject: [PATCH 0945/3458] 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 2dec3f40444b0ea2ae542555b0ef7d7a02d8fa26 Mon Sep 17 00:00:00 2001
From: xolophreny <xolophreny@protonmail.ch>
Date: Thu, 4 Feb 2021 01:00:14 +0500
Subject: [PATCH 0946/3458] 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 8018cc29a9805bf24e6adaf1bb6592ebc2fa4f3c 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 0947/3458] 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 0820f1b91fe99e42f936842ba528242d7a3951c4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 3 Feb 2021 18:48:43 +0200
Subject: [PATCH 0948/3458] 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 ab289af906f6b6e8e489177d1b48d07db2ca050e Mon Sep 17 00:00:00 2001
From: Felix Kleinschmidt <fk@bsrd.io>
Date: Wed, 3 Feb 2021 09:54:08 -0300
Subject: [PATCH 0949/3458] 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 f7a0e1ee9fb43fb69c11a416f7f2af0cc8b3d96c 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 0950/3458] 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 a366f826b75f0a5805fd27a6bf3a2ca1c054e32b Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 4 Nov 2020 15:11:11 +0100
Subject: [PATCH 0951/3458] 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 687bdfcbbfc5878276afa7dd84859e917205bbc8 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 0952/3458] 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 61f7814f9e3e4ff1380253ac304e5444ea7bdf48 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Feb 2021 23:05:28 +0100
Subject: [PATCH 0953/3458] 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 34b4985bcb72fdcf004ccec137b7edf9a1dcb38c Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 Feb 2021 22:14:24 +0000
Subject: [PATCH 0954/3458] 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 5ec7ffb7322ffe596e081c663618ec6da523fe6a Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 3 Feb 2021 22:30:13 +0000
Subject: [PATCH 0955/3458] 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 ef34521fbb305efbba7bb8923307d9aeb0a0f5d4 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 0956/3458] 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 daed41370620de75ef22f662626f1f82295508f4 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 0957/3458] 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 bc7b2ccd44c52722fc03955acd964af292ef10e5 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 0958/3458] 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 61163e093118312dc4f29825428d40bca015edb4 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 0959/3458] 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 528c1fa319b2f696f0b54b95396e6769a5045794 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 0960/3458] 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 ea5764e1405ba35d8e136c2446d96e27a5f78e4e 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 0961/3458] 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 01f764ff3af7b50f1e345352f172a74a4ab7fcaa 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 0962/3458] 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 4bf52ee5d5be41708e0d8149debdb3320653b8ad 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 0963/3458] 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 99035fa663be11797e17c38e41b8f5c375a67691 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 0964/3458] 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 bf51cc8bf0e2bd8273f4a72fdb435d98dc6f68e0 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 0965/3458] 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 5d814b7dee57ab6764be3bb6f508fe4db8f96b68 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 0966/3458] 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 f6f3a8c6c31a9a5284a37c8005e5e245869c442a 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 0967/3458] 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 09cc66615366d668e8e619e3060a65e40fda8cd3 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 30 Jan 2021 03:14:46 +0300
Subject: [PATCH 0968/3458] 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 457f540a3540a7dcade2c7b3fb9629f8f9d2acd6 Mon Sep 17 00:00:00 2001
From: Ameise <ameise@bitparlament.de>
Date: Tue, 29 Dec 2020 22:04:53 +0100
Subject: [PATCH 0969/3458] 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 6e465f412652471311e7c269ec4304eb5c91a3fb Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Feb 2021 14:58:18 +0100
Subject: [PATCH 0970/3458] 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 a407ce08dcca4aad9f195586707158c4b7986ee5 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sat, 30 Jan 2021 22:27:18 +0300
Subject: [PATCH 0971/3458] 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 b3506975cdf671454efb70bcbfc95c124da163d9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:29:19 +0100
Subject: [PATCH 0972/3458] 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 622a20515505cf8f35ad02b936bf8d896e166b67 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 28 Jan 2021 20:43:25 +0100
Subject: [PATCH 0973/3458] 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 5cd447691b0c55c46f1d96e8d27a1e7e4ab8c2c6 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 26 Jan 2021 16:53:04 +0100
Subject: [PATCH 0974/3458] 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 cff8f1a675b1468aa75cfd21ef82ac9ee2c480f1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 4 Feb 2021 12:34:03 +0200
Subject: [PATCH 0975/3458] 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 997e2f12df48e80c19d90d96580efe5dee9c56de Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 4 Feb 2021 13:12:00 +0100
Subject: [PATCH 0976/3458] 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 10c9c3f31f5b773f3e574bc61ea10ab57817f2d1 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 0977/3458] 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 6b88ddc519c216769e5ab875ab42a5d1b8b576db 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 0978/3458] 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 69f8036f0095b34269906c52e5d38c457f8f611a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 3 Feb 2021 20:13:56 +0100
Subject: [PATCH 0979/3458] 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 17ac926668379118f8f3e57df3744f4d0cb5d226 Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Wed, 3 Feb 2021 21:58:23 -0700
Subject: [PATCH 0980/3458] 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 43053b3e7528f0bb85f8aa09ae79a98500da026c Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Thu, 4 Feb 2021 08:44:06 +0100
Subject: [PATCH 0981/3458] 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 031a6c77ee2cc66a7415daa625a8e553890a6958 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 09:47:05 +0000
Subject: [PATCH 0982/3458] 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 7cb7e9adf17c61a6039db305e8a38d4591923c1a 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 0983/3458] 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 95b0c850e29a04ed9ebf9543b92d3749abe2aca6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 4 Feb 2021 15:14:55 +0100
Subject: [PATCH 0984/3458] 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 7887ea4cf54deaf34cd616c8821cdf98436d77bc 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 0985/3458] 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 a89fc90b7379942ba7b754422cd895809cd49d5e Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Thu, 4 Feb 2021 10:03:08 -0700
Subject: [PATCH 0986/3458] 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 a8c8b3004e1c4efb6e27b7789689a1e9dd25cee6 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 4 Feb 2021 14:13:24 +0100
Subject: [PATCH 0987/3458] 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 51512379548afce3bf11e04d40c747d0414afc90 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 14:06:34 +0000
Subject: [PATCH 0988/3458] 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 19ce2ed41cf2126588e8ebf634a1a1ffd26049ce Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Thu, 4 Feb 2021 19:30:53 +0100
Subject: [PATCH 0989/3458] 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 b446682b75532d8278a4853f2b278247a3120549 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 0990/3458] 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 cc28a155b1e1177aea0eb1d6153881292fd97306 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:10:06 +0100
Subject: [PATCH 0991/3458] 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 57c9ffbb46d06bdf4eeba7af36423ee889e5d966 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:11:19 +0100
Subject: [PATCH 0992/3458] 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 3ba930464ccf291d817a2fae7f0bcf9ca1c27abc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:11:28 +0100
Subject: [PATCH 0993/3458] 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 381991ec0759a3af4927f8b75004ebb6cdef9f86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:11 +0100
Subject: [PATCH 0994/3458] 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 4c9e35f4e2477598c457b689d6582b1a989b014a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:16 +0100
Subject: [PATCH 0995/3458] 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 bfd9ce29390ddc4cbb4b0f8844bab914cef9d27e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:18 +0100
Subject: [PATCH 0996/3458] 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 b69d1e84bdc8b3f97124d70a0590b0342ce9d01b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:23 +0100
Subject: [PATCH 0997/3458] 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 f1bf6c6e77a5f3794e8440250aa9281025e0a5df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:29 +0100
Subject: [PATCH 0998/3458] 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 645813e42c499589ed6c3233e690b709eeab54f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:31 +0100
Subject: [PATCH 0999/3458] 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 24a03ddaf1f570ed3879c1da35f272a8616ffcfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:34 +0100
Subject: [PATCH 1000/3458] 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 012f5cea1926e28442d43db638cc5cefe4be1514 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:47 +0100
Subject: [PATCH 1001/3458] 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 708635d56041d5e402b9fe9728c83c015bad4604 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:49 +0100
Subject: [PATCH 1002/3458] 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 179b45aacddb0e061661d720b113850c660f7ccc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:54 +0100
Subject: [PATCH 1003/3458] 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 cefcd17665e3932e8f7b4ae443bb62d6a434edcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:48:56 +0100
Subject: [PATCH 1004/3458] 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 389305192c0b63b67f25c7a39b6c1be0befaeeb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:49:03 +0100
Subject: [PATCH 1005/3458] 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 85d8472c9fb0684fa761c3a0313797280c507697 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:52:45 +0100
Subject: [PATCH 1006/3458] 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 b750834dad8333dc12bf917e728113e8fd1f8cb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:55:18 +0100
Subject: [PATCH 1007/3458] 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 e81d972dfd9b1a8be2b3854a56126b9f3fff687b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 4 Feb 2021 23:55:27 +0100
Subject: [PATCH 1008/3458] 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 2d92f8d79c9da10f08069383c1fde1bfe81269bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 00:04:30 +0100
Subject: [PATCH 1009/3458] 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 1a94237883c59230839e96e08c0dc77d5a310dcf 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 1010/3458] 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 31dc75b4cd8cf77e899b1882137e0d5a7d757b8f 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 1011/3458] 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 8ee62a66a40de505afa643d6dc5c2c7b765e344d 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 1012/3458] 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 a0546ad57c3e6665aca4779be69634dd93fe7e8c 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 1013/3458] 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 e05b9e8fa961ddd0ec13a175abbce55ca6f5b60c 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 1014/3458] 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 7218e5db8255ebcdd765baef53ad4199a9848575 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 4 Feb 2021 14:05:10 +0100
Subject: [PATCH 1015/3458] 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 eb073fc3cb66c116b058d61f8b444a21dd198e95 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 4 Feb 2021 18:30:24 +0100
Subject: [PATCH 1016/3458] 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 7327c4039fca12025b0744adaecc9ef448be8349 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 1017/3458] 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 6713b015a5b021d616187f96754c253974080175 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 1018/3458] 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 20d5e4b755940c049a3408219d19718e103108d1 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 1019/3458] 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 bac81b763b31173da9adbfc9d25e6a4c5f739918 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 1020/3458] 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 8b684022b92f1982ebd7842ec0939221b1852e29 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 1021/3458] 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 17c20b8650e3b162e4701d03522e4e35288d9c3d 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 1022/3458] 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 567769b0ebbee2153b576755dc85673f97db7b84 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 10:02:40 +0000
Subject: [PATCH 1023/3458] 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 c7112a09a17f1d59e04562ab5fc9a89911806b67 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 1024/3458] 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 43bf7621a9b53781650d1d0d1d0ff9bbf3f4b732 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 10:28:53 +0000
Subject: [PATCH 1025/3458] 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 cc5594a1bd248adbda58aa2f078c4dd1da83c11d Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 10:43:39 +0000
Subject: [PATCH 1026/3458] 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 13b744d9f60a0876b18b0a48a36cc88e9db75941 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 11:54:06 +0000
Subject: [PATCH 1027/3458] 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 bc5b4e17f33473ad2147a043f0d81803b533b082 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 11:13:49 +0000
Subject: [PATCH 1028/3458] 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 d0c00612fb844bbb6a9831dd1a6981fdb65f8cd8 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 10:52:02 +0000
Subject: [PATCH 1029/3458] 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 b8f359ba091282b941c110ec6c7f9bdfaffff766 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 11:02:13 +0000
Subject: [PATCH 1030/3458] 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 7d1f663b5cd01c03814f8989837995cca0c61f6a 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 1031/3458] 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 282772af4ccaac0e0bf7530562c533114723e88c Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 12:43:15 +0000
Subject: [PATCH 1032/3458] 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 487d9359e5401f84a52bee024d9ee4589a213c33 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 12:34:47 +0000
Subject: [PATCH 1033/3458] 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 bd72be21b43f012d2ee40047303e0d38ebd38de7 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 1034/3458] 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 5b978df6407f9ddebba443af41b66b4ff9ca1d2e 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 1035/3458] 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 6a9c719362b8d66270ae19cf3dc0baa94bebc338 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 1036/3458] 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 fe4c7f5627285bca786213927c9b9b1268451158 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 1037/3458] 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 98417d1e85e2139a9c90f57734de73f450ef26e8 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 1038/3458] 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 49518d3fe726894784a0575b7c14b981204f1029 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 1039/3458] 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 9ef1774cc6407dd518647cb0e95c4bddda42d508 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 1040/3458] 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 bdbfe09b36f2a138692bbabebd78fc1e1d6e83f7 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 1041/3458] 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 78d5942aede4f1e04ebeeaacb543e00ece461664 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 10:21:03 +0100
Subject: [PATCH 1042/3458] 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 aff9ae01130c7cf75957a30f26dce5ea89603972 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 10:21:57 +0100
Subject: [PATCH 1043/3458] 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 5f76b28a3237e833e7dad4567cb3a781b9d5f2a5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 10:24:17 +0100
Subject: [PATCH 1044/3458] 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 86696e6554b107036740e5c12b010d13a04d3067 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 10:27:46 +0100
Subject: [PATCH 1045/3458] 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 d1478acc5ee82c800c064a0a4e095ebb3bd5aeea 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 1046/3458] 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 241e47497e24092fda47abb090c1a456e7f3c32f 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 1047/3458] 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 b2b43ba78f7d7beb05b3a494ccecdfd70d0ff435 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 1048/3458] 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 de9e9cf310fc023e3f74fb2fa195eafdb99031cc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Feb 2021 14:31:36 +0100
Subject: [PATCH 1049/3458] 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 ac7e9d28857a38dcf7c82bd2492e207ccf6a30e4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 2 Feb 2021 10:30:50 +0100
Subject: [PATCH 1050/3458] 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 1271d6ea6c39d7142cee70c141998c4a20106b2c 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 1051/3458] 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 fdfbccfebc179baa2f799ae426a9236789acee40 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 1052/3458] 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 9c72fc61cbf734acd9d191a72d34c12416ff8793 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 1053/3458] 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 af5c95c6769088d7ffc503173ce4b9b6f0d627e7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 18:56:36 +0100
Subject: [PATCH 1054/3458] 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 9fca27a99d5705e1468ef8001d50828788f84d5c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Feb 2021 19:05:46 +0100
Subject: [PATCH 1055/3458] 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 43f147d0e0b1c6b13ada31c7e2f5663970b2fd94 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Feb 2021 19:07:55 +0100
Subject: [PATCH 1056/3458] 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 29c08e632af8c355ea96751f80a986af62ead4e1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 5 Feb 2021 08:56:24 -0800
Subject: [PATCH 1057/3458] 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 421131ab4222c39792a721077034b94eef28c4e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:35 +0100
Subject: [PATCH 1058/3458] 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 29d549cfb07b7c5e98c3db3e9c45fe8bb0f1de6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:37 +0100
Subject: [PATCH 1059/3458] 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 a2a0c2b29d5d85cfa77faf97ead5159ca049a09c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:39 +0100
Subject: [PATCH 1060/3458] 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 e6ac361ba7d2bc85ea882a2521c4cf823147d70a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:41 +0100
Subject: [PATCH 1061/3458] 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 880a515ebb230f0fb2642c322ec797e1a153a4bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:43 +0100
Subject: [PATCH 1062/3458] 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 9a9c1fd56d90c2e0b4fec2ed3507ef09b00186c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:45 +0100
Subject: [PATCH 1063/3458] 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 856813c98411fd40455cdc2c54321733d149b9fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:48 +0100
Subject: [PATCH 1064/3458] 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 29ba433f6a4af542827df67b436aa5b7de3a3247 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:50 +0100
Subject: [PATCH 1065/3458] 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 0182f782667e7b0fa6dd6f2aa34b0e3337daeda6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:52 +0100
Subject: [PATCH 1066/3458] 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 cb74ba3cd9f4c2277e56fd0aac9f71e106c3a077 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:54 +0100
Subject: [PATCH 1067/3458] 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 ea3c3ba2428d3165382dcdd3e56c3853cf6a569d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:57 +0100
Subject: [PATCH 1068/3458] 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 0e51d3ffafbb804f3be8ca514b18d7552f911b32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:50:59 +0100
Subject: [PATCH 1069/3458] 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 7d4d738bbfeb875758794792b5e34665aa4f3de0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:01 +0100
Subject: [PATCH 1070/3458] 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 b27c52fd208acacdaabed1e24208fd401de1afc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:03 +0100
Subject: [PATCH 1071/3458] 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 746593e3b13b5d23c8f5bf71aeb086f585097a29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:05 +0100
Subject: [PATCH 1072/3458] 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 6d67fdbc0560864e80139fcc042b5a3c93d2a94c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:07 +0100
Subject: [PATCH 1073/3458] 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 d7b30fb66871183ef71454e37bdb92398243c60b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:09 +0100
Subject: [PATCH 1074/3458] 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 859644c43dce0d05ce67256ac8f9d97c4c8b2e7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:12 +0100
Subject: [PATCH 1075/3458] 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 e57992f8a33b0eeb78d7d514a08330743251d289 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:14 +0100
Subject: [PATCH 1076/3458] 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 39056b9753c7d266d3e2362750ec250ec0f5ea57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:16 +0100
Subject: [PATCH 1077/3458] 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 e9d075b2ef62db30ab3e7f3b9a5af06365e1a3d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:18 +0100
Subject: [PATCH 1078/3458] 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 b1bb80c56c0292d96960c7f84cb6d71d9bb8a0e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:20 +0100
Subject: [PATCH 1079/3458] 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 4c1688a518a76a2247f5cc84b830522604cbb6e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:22 +0100
Subject: [PATCH 1080/3458] 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 8e04a4c7013e88f4c0ab895a747defea05bf545a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:25 +0100
Subject: [PATCH 1081/3458] 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 04c54d0021df7636935f3bc80750c2349a872abb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:27 +0100
Subject: [PATCH 1082/3458] 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 9a7db9f93337d83dd8b2dc2f90a944514abf8563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:29 +0100
Subject: [PATCH 1083/3458] 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 790132d89b9d72d2e66527c7b66a844ca5739d23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:31 +0100
Subject: [PATCH 1084/3458] 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 45a59feec00a81fb9aab2e032f2a2d6d8b91add5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:33 +0100
Subject: [PATCH 1085/3458] 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 6904d4e963e69181a812927bb30bfc8f2cb86628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:35 +0100
Subject: [PATCH 1086/3458] 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 e6ed58a85cf7f80ecc8064f6f8e6900c8e177f1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:38 +0100
Subject: [PATCH 1087/3458] 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 28438bef5ce0c0c3a701bfe750c7fc31cef11fc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:40 +0100
Subject: [PATCH 1088/3458] 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 398da80b3ae65831edea02cb32695e287f217ba8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:42 +0100
Subject: [PATCH 1089/3458] 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 e38aef2a2b815b633bbb908c1b61e83fb9a9d0c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:47 +0100
Subject: [PATCH 1090/3458] 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 7f167af9017811aed030a27f4efde2dffc0bb416 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:49 +0100
Subject: [PATCH 1091/3458] 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 f6d3be1350c1e018a5028017e29e265cbd433964 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 09:51:51 +0100
Subject: [PATCH 1092/3458] 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 f7e6cea7cb4e6fffc7fe96bcce8a69ff6bf4a4e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 19:24:02 +0100
Subject: [PATCH 1093/3458] 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 0eee799bf52cabf08149b08e17f473804e2234db 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 1094/3458] 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 a337c148e3b450f52c9abf52129652547e6960e1 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 1095/3458] 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 d0435493249aba1591a3885f441c75dfb8e9355b 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 1096/3458] 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 0f302436ade909afcdd85c8df7aef86740f565f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 1 Feb 2021 16:50:47 +0100
Subject: [PATCH 1097/3458] 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 20f6f14b523632c9bde9c51ab69f4aacac9debb0 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 1098/3458] 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 badb9ba40576ffc71294f233efd4d18ad12b7dd9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 20:37:37 +0100
Subject: [PATCH 1099/3458] 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 07e9353ad819cdfd2b5ec944d3230840f57dfb01 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 21:51:05 +0100
Subject: [PATCH 1100/3458] 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 19ea769dd0dac81e0d40575ad2a2a61615d8fcda Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 22:43:10 +0100
Subject: [PATCH 1101/3458] 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 1cba769855eb4c59ccab544609a11d641be209c8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Feb 2021 22:44:07 +0100
Subject: [PATCH 1102/3458] 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 387060e042c321c9f278ea986cb7ead6f04c66a1 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 1103/3458] 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 359688f907f8b71d3ba8b24e599671c679f67273 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 1104/3458] 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 4f6d47cf542d88954b0692ee46ed97e64cde1689 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 6 Feb 2021 00:09:04 +0100
Subject: [PATCH 1105/3458] 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 b802b592ab5ea70cb4c19700fdae8710da0e8102 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 5 Feb 2021 23:04:48 +0000
Subject: [PATCH 1106/3458] 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 e0479bd8d169757ae52d699aabee17948a1762e5 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 5 Feb 2021 23:16:47 +0000
Subject: [PATCH 1107/3458] 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 8f0d40166d1725ec39a39cf7eb4da3c49ebe7355 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 5 Feb 2021 23:20:42 +0000
Subject: [PATCH 1108/3458] 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 648f7eeaec80f3fc853a8d1206f765f46a2ac8b5 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 5 Feb 2021 09:21:40 +0300
Subject: [PATCH 1109/3458] 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 a03804d92a15038c2b5c77b1de5780bedd98eb71 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 1110/3458] 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 ba68b99dc575e1ed3463997deb0aa9b4bca99100 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 6 Feb 2021 00:24:27 +0200
Subject: [PATCH 1111/3458] 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 7a092907a8bb677865c56838ef0ac5cfaefdaa54 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 6 Feb 2021 00:45:55 +0200
Subject: [PATCH 1112/3458] 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 19d396d89abc2e50489b18878ec75245122cb4e9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 6 Feb 2021 01:01:37 +0200
Subject: [PATCH 1113/3458] 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 cca2b068d8a7c4ca165f77eadc87be69db081130 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 5 Feb 2021 21:45:25 +0200
Subject: [PATCH 1114/3458] 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 6486be63e201db5df21be93093d1ad6767c3ffe3 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 5 Feb 2021 19:17:54 +0100
Subject: [PATCH 1115/3458] 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 6e856911c8b4c57125021620a2b481b3603d5784 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 5 Feb 2021 12:19:09 +0100
Subject: [PATCH 1116/3458] 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 86c95359bdfbd1f87bd2b7897495ab9baca82091 Mon Sep 17 00:00:00 2001
From: Evan Deaubl <evan@deaubl.name>
Date: Wed, 13 Jan 2021 05:14:49 -0700
Subject: [PATCH 1117/3458] 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 4e891c5212ae2a822726e4b1d2e7f71304cad477 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 1118/3458] 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 7658930cc89cf850c6a9fba388e61dbffa36a3ed 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 1119/3458] 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 d164b879ec053940c6b28837fd38bbb2494d1487 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 5 Feb 2021 11:14:48 +0100
Subject: [PATCH 1120/3458] 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 07573e2e5f2fda9d67a5f4b7ac172be57a62d94e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 16:06:01 +0100
Subject: [PATCH 1121/3458] 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 ac3d54b0ac5e8d9ec6f7f2c23b123d11e9b6cfaf Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 13:35:04 +0100
Subject: [PATCH 1122/3458] 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 943b636f5605965067eb49d6491945d124172cf9 Mon Sep 17 00:00:00 2001
From: John Sullivan <jsullivan@csumb.edu>
Date: Fri, 5 Feb 2021 00:08:22 -0800
Subject: [PATCH 1123/3458] 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 b98ebc5aba53d2f2b8c58599e082bb9a5f837163 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 13:54:55 +0100
Subject: [PATCH 1124/3458] 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 3f8d569d602f2c528db5849109f4fd791adee40d Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 4 Feb 2021 18:33:54 +0100
Subject: [PATCH 1125/3458] 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 aca549a62eef905080d3804d776a5ca77c3d0ac8 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 1126/3458] 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 a756241159e0082b0fe6804beed65d058cfb0d4f 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 1127/3458] 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 9c8faa75bdb0523d10b2a1933be6e338cadd4760 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 12:26:38 +0000
Subject: [PATCH 1128/3458] 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 f8dcf963074f92721fab1e9ff472f5d4bafe3599 Mon Sep 17 00:00:00 2001
From: Ulf <ulf@voidlinux.home>
Date: Sun, 31 Jan 2021 13:34:53 +0000
Subject: [PATCH 1129/3458] 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 78006352c8e15d1b1d96da828abf499173fee351 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 4 Feb 2021 11:45:00 +0000
Subject: [PATCH 1130/3458] 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 0b9f90e688d65da7ae45e07a3a00bad3c2a13ae1 Mon Sep 17 00:00:00 2001
From: KeepBotting <branon.mcclellan@gmail.com>
Date: Mon, 1 Feb 2021 07:59:51 -0500
Subject: [PATCH 1131/3458] 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 2b413dbcadbeb8859b88acaf8b852efb2206dbaa 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 1132/3458] 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 30d814e75d310a79fb4c543bc72462636e3b1496 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 6 Feb 2021 07:00:17 +0100
Subject: [PATCH 1133/3458] 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 c79b1a30f7d25c095dc2b45b15b76ead267aa29c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 6 Feb 2021 07:29:24 +0100
Subject: [PATCH 1134/3458] 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 b6f63401f1fe9ec73c67d595cf360adc3d437b1b 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 1135/3458] 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 883d7eb98f9a82216fd022f358ca4a961519001f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Fri, 5 Feb 2021 00:56:53 -0800
Subject: [PATCH 1136/3458] 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 5260dc2f81585972ccb369aa6094b076aa911e0e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 6 Feb 2021 14:15:20 +0100
Subject: [PATCH 1137/3458] 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 a26317d84827a63021cff833a9dd993c12933308 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 14:15:37 +0100
Subject: [PATCH 1138/3458] 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 6a93dfef964e8309b8407b3024bfad7b54ec6716 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 31 Jan 2021 22:09:31 +0100
Subject: [PATCH 1139/3458] 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 566c0bdbb28caa96d8a96861cb045d0cb26832e2 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 31 Jan 2021 22:10:42 +0100
Subject: [PATCH 1140/3458] 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 4a41cf11d9508bab451af72e0639fa130f5d169c 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 1141/3458] 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 25f6950c633adf6cd560ebdd84c8043edc01fcd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:31:24 +0100
Subject: [PATCH 1142/3458] 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 e8fb5a9f1d3bcc4335825692585a6922f0011c28 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 6 Feb 2021 17:20:40 +0100
Subject: [PATCH 1143/3458] 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 b0ba9feb15042c620c87888f91342752bbd4db33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 16:04:52 +0100
Subject: [PATCH 1144/3458] 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 3ea73eb9294112a591e8d1e643015c1f7658141d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:53:50 +0100
Subject: [PATCH 1145/3458] 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 f17722db59d4de8cf2ea3acf8b73f8596ca26b15 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 1146/3458] 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 b1524822c2f3094b4652c1a246f567236acc7e49 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 17:25:35 +0100
Subject: [PATCH 1147/3458] 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 046197ea08291c24d2da767d82909cffc92b4adf Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Sat, 6 Feb 2021 20:03:01 +0100
Subject: [PATCH 1148/3458] 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 c88a0c25cf2d9a75ed8b50eb160973e83dccef79 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Feb 2021 14:11:15 +0100
Subject: [PATCH 1149/3458] 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 8238a78102fffd5157c285952d2156078c69e97d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Feb 2021 14:13:20 +0100
Subject: [PATCH 1150/3458] 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 3d2fb8260c033db28754f1e1253c67c482b93cae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Feb 2021 14:27:21 +0100
Subject: [PATCH 1151/3458] 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 b7901f90266082ecc4d486492cd94acb7da8eff6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Feb 2021 14:27:29 +0100
Subject: [PATCH 1152/3458] 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 7cb8ebfa661087be23955f31a72d8b8355f77685 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:55:10 +0100
Subject: [PATCH 1153/3458] 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 8b6c241d1d1e22c1e7678f2be0c270a339d5e50b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Feb 2021 16:23:51 +0100
Subject: [PATCH 1154/3458] 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 023a109b39b652dc906683856c17ea71f3c743b2 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 1155/3458] 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 fec2bc0ab905411a4a5da7c6a8e004824ef9c5ce Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Feb 2021 18:54:11 +0100
Subject: [PATCH 1156/3458] 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 8da0a0ebdcddc82cf63fb64afa401ca976ae173e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Feb 2021 18:56:27 +0100
Subject: [PATCH 1157/3458] 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 6c49dbeb539debf2f8140243430a783252efdf6e 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 1158/3458] 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 42d498b12143c728dfddb55a8943b70df4db6e50 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 1159/3458] 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 c4c1388a35e19673d6fe34f45b6620bd9483e182 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 7 Feb 2021 23:16:00 +0200
Subject: [PATCH 1160/3458] 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 bb533b209764d5bfc401571c607b75111ff9e8ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 23:09:43 +0100
Subject: [PATCH 1161/3458] 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 0eb34e81f79673a9af4c032568dd028a0a309626 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 22:43:49 +0100
Subject: [PATCH 1162/3458] 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 024ee4e4df9d5a296e91a57edcd3098cb0050ad4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 22:15:15 +0100
Subject: [PATCH 1163/3458] 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 01a68bb6734de9f8ec4444b25791a070a7e9c8b8 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 1164/3458] 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 a5cc4801b4a7cb4046fae56f8154c29f69f8db0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 23:30:16 +0100
Subject: [PATCH 1165/3458] 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 c1ed5e0398c9ba0c49ac1a7867b01cb023745d78 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 1166/3458] 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 5dc016dec9261343db3cc130da00efab6f66d38b 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 1167/3458] 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 ee5d80393ba063a31149acd0a41cb1b2596a3d11 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 16:19:19 +0100
Subject: [PATCH 1168/3458] 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 e5fcfd5ec8762ea225e1f5a44be40a69bd170fa2 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 17:26:25 +0100
Subject: [PATCH 1169/3458] 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 04140a2beca11c242ea7ccad32fea46627588c98 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 1170/3458] 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 40c2c9a691e77b65053c779412944a34e58df24f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 00:53:28 +0100
Subject: [PATCH 1171/3458] 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 437c26adcbb3abc98f1c64d5d778c86d410ba2cd 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 1172/3458] 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 15ce2dd6c97f5a899e6965b8feef53875ded1a3d 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 1173/3458] 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 d922253d3d51d42b8268b4bde0a5cc4be8305149 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 1174/3458] 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 bdc40010e8a47935734abb056ff3d39cc2227ebf 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 1175/3458] 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 afbeac4f4627ffc2143e83503c16ffa62f0d37e4 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 1176/3458] 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 28fd122f1b2cea3791b88ad9775f90bfd31842f6 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 1177/3458] 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 737b85fd01789382e0610da23a9043af63863438 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 10:52:10 +0100
Subject: [PATCH 1178/3458] 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 9b26882156dd5e012de7cd34838c303bb7a8284c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 11:53:15 +0100
Subject: [PATCH 1179/3458] 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 0fd1678ce29af77dc73e3995fbc82518b41f3538 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 11:55:05 +0100
Subject: [PATCH 1180/3458] 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 491a2c132f72956efb8258c8dc66b6419ab00325 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 11:55:44 +0100
Subject: [PATCH 1181/3458] 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 75c97ae942804e7d3e4d785f898cbd0ba5eecee6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Feb 2021 11:56:31 +0100
Subject: [PATCH 1182/3458] 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 a75b27d8acdd37426a523717a0b5086959345a75 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 1183/3458] 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 651c230f7e1a211691118c7e98c1779df9f69389 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 1184/3458] 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 68df28be6b00a5cd6aca9a2a7a08b9846edb4f5b 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 1185/3458] 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 d50aeab7c8f0b525e215da2f02500283fe0a4ae4 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 1186/3458] 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 520632a32412737f4f53c7e2695e7ac40ca33916 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 1187/3458] 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 03cf6466d474b0d0f7899d6e50df8492cef67dac 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 1188/3458] 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 96125eb685787a7fd1231298f50d346b02dfafaa 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 1189/3458] 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 cefaed09b1fce8fd8af5771ac728f0646a22fba5 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 1190/3458] 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 3acecb4711a7e7db7351f30c332411e9932d8db0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Feb 2021 13:28:10 +0200
Subject: [PATCH 1191/3458] 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 20d7412580d7e88bc8f30adff8efa3f169196fd7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Feb 2021 13:28:16 +0200
Subject: [PATCH 1192/3458] 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 74448be80634a8f19431eb626805c967b938ba62 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Feb 2021 13:18:30 +0200
Subject: [PATCH 1193/3458] 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 6de337f7c2760f30993239bcd43f6f788a0fa0cd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Feb 2021 13:19:20 +0200
Subject: [PATCH 1194/3458] 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 c6b6f847637d443e7790c43ec1534cd673fc0774 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 8 Feb 2021 13:10:39 +0100
Subject: [PATCH 1195/3458] 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 0e7950e29385357f6c8c9c9f6bd8d2e0ae92bb9a 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 1196/3458] 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 32a0e050d6d17d30109f822f8c050044dc9692bf 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 1197/3458] 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 ae7d0502e159960b92950c2bedf6e06e0d4ca3b7 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 1198/3458] 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 500c335700dd96fc1b1afb191ea848d8dfd1c661 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 1199/3458] 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 8835e616b37480936b5a4cbe354558d68865e2cf 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 1200/3458] 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 3c5de0aea133e6951110859e450c4416e82d21d2 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 1201/3458] 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 eb1697c473173f721bd92e6d62833ae5017d9abc 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 1202/3458] 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 0cc9b3b6560d2a4450d612f078821d738b3a6e94 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 1203/3458] 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 d0b6d2a732de49d60c0d068f6b4300bec07b6cfc 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 1204/3458] 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 516bde19ca2d8d31079d5d6287e7e85e0ac0ae89 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 1205/3458] 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 b2d1e71c4051df1542ca906f950ddd67f2ec6623 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 1206/3458] 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 804567d71acca69f1bcdd03f584a174436a064f9 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 8 Feb 2021 13:06:55 +0100
Subject: [PATCH 1207/3458] 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 70a2981b37dd9bfba5091d1120005442e8f4e45d 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 1208/3458] 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 57592e4d64baa059c3be16a02392c91694444cdf 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 1209/3458] 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 3aa79254a35af3b800b3feef984eb59ff379fbd2 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 1210/3458] 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 fb1ca9ef22e58d67a05c01cc824aad65aa38d2c2 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 1211/3458] 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 8a5e9240ebaccf97f902eb68f0881df3f8c8299d 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 1212/3458] 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 ead5c50a882b8c4efacae814b8c838dcd3b9a028 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 1213/3458] 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 f3ca926dc1ae89c7589d0cfab0113b151dada2ef 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 1214/3458] 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 4139f4a17c4428d02f693bb25a1acd09c151d41f 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 1215/3458] 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 af6d154fac6f3224fa643ad5f2761da0b4e83165 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 1216/3458] 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 99815023611bec47e10135629da2b333952c2d60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:24:17 +0100
Subject: [PATCH 1217/3458] 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 550c44e6e96f17b7075dd7bca94ae630bfc35cec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:30:11 +0100
Subject: [PATCH 1218/3458] 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 4f990bc093295c5c3c96bd3a78ac8f3b984bae0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:47:02 +0100
Subject: [PATCH 1219/3458] 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 3aa852dc0a56ca05c62632c9b532fd750db10392 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 1220/3458] 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 9b6395c9e066f2c9af415d5e51fe68d2b7d9f150 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 1221/3458] 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 8fcf0bf9ef2b10efde5197e9dd217f825395ddb9 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 1222/3458] 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 4ba1b0f997f07dcc69b2fd00dffab8b734b97bf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:09:02 +0100
Subject: [PATCH 1223/3458] 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 f348aea1a5bc2165270eb52577a5287191e0511c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:33:25 +0100
Subject: [PATCH 1224/3458] 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 2295c987d8dbe81f386c9a9e3e8b1a4492844820 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:38:12 +0100
Subject: [PATCH 1225/3458] 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 8268477b756c708a5e1cc5f9b66ed67bb5768b18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:57:15 +0100
Subject: [PATCH 1226/3458] 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 94c705dffd32e9245b7863c45b7e84f6ad87ee1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 16:58:06 +0100
Subject: [PATCH 1227/3458] 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 e4a625ee9381283e488d28e22ee86e74a97add2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:05:00 +0100
Subject: [PATCH 1228/3458] 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 008309ca31495f1cc02c17f50ab8dd67125598e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:11:57 +0100
Subject: [PATCH 1229/3458] 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 53cdb945aa6090cb718df248aa320d894da1bbac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:16:18 +0100
Subject: [PATCH 1230/3458] 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 eec8db0ef1212060fce0d9a4a3cfcae39f85d0bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:18:38 +0100
Subject: [PATCH 1231/3458] 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 55cc5b99f947d93b15a9dfda6c1669c5e9c8b3ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:19:41 +0100
Subject: [PATCH 1232/3458] 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 7bc516d6bc28329047cacb22fb3591784561939d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:20:40 +0100
Subject: [PATCH 1233/3458] 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 f1c76be041b779c13f2744739b89464adc2b66e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:21:45 +0100
Subject: [PATCH 1234/3458] 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 c7770d737eb764d02bd5a7c2805e0b338741ada7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:32:10 +0100
Subject: [PATCH 1235/3458] 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 5a656bb8f751dc6a27171d182e6ccf932cb707ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:33:48 +0100
Subject: [PATCH 1236/3458] 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 3d3c0c2eb1847298261d03bad1e9dcdb73944aaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:34:58 +0100
Subject: [PATCH 1237/3458] 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 1b79f5cad6db4725bf0d30ca75110641ac4082a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:36:11 +0100
Subject: [PATCH 1238/3458] 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 a63a32283635b2c3d5fea40e82fa091512dc9c54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:38:14 +0100
Subject: [PATCH 1239/3458] 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 d86560a21a9f080c0aa207b5470400711d65e639 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 17:39:11 +0100
Subject: [PATCH 1240/3458] 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 6b28ae01b57f8f311a7a61ac762b7406f9217279 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 18:13:19 +0100
Subject: [PATCH 1241/3458] 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 50d10ffe181a87d86a0d240bd05f066f655dcd20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 18:32:17 +0100
Subject: [PATCH 1242/3458] 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 5a0695635c84684c89da8ccfb907678005b99eb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 18:34:05 +0100
Subject: [PATCH 1243/3458] 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 680f1db4fee093149da581b35a142ef8e80d7113 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 19:41:06 +0100
Subject: [PATCH 1244/3458] 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 166bd623a3e02ab603287fe54415ae5f39e6c807 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 22:39:33 +0100
Subject: [PATCH 1245/3458] 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 53e6f3af652ffaf8a2493d3d2ca41ab2dba3e133 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 22:45:57 +0100
Subject: [PATCH 1246/3458] 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 3d6c64a29113a63c2bcc3e17f9c449bf0ae95f9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 22:59:33 +0100
Subject: [PATCH 1247/3458] 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 5e0d81d01664b5c6294e0386bf2f2d104bf30580 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 23:00:28 +0100
Subject: [PATCH 1248/3458] 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 fe1041636f6dd8574c2ac9fa3d6392dacc313ddd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 23:28:13 +0100
Subject: [PATCH 1249/3458] 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 e58cb4f67b599b8a10485f4298ea35f487865166 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 23:59:57 +0100
Subject: [PATCH 1250/3458] 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 99ffbd595de3f0e97d80e260e179acd36114321a Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Mon, 8 Feb 2021 11:50:11 +0100
Subject: [PATCH 1251/3458] 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 788d3f80a39d23bd043ca018b0be586b672c2a4a 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 1252/3458] 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 da6444665553c8d02b7cbbb202a25424c090ff3e 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 1253/3458] 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 4a987e8302eb38ea1e15d3a1255195aa3cb988d7 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 1254/3458] 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 25fb5d0fb7b25ef01031ef4c8c7759088638d4f0 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 1255/3458] 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 af88e1e802eb0b7b922c08a09b99af2135b09070 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 1256/3458] 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 04ca5e1238b00e430f35c8fa6a66b6a662b28909 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 1257/3458] 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 6d13fd61baea3ff81e606c106820bd2e24c22d3f 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 1258/3458] 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 a445d0f28b6ddcbd59a8595c5f95a5d3ead3420d 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 1259/3458] 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 160ed4c0a83dbb1722a56fdd3f2f94626d06449f 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 1260/3458] 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 2884781379246700f0a4a835a4dfd7014c7d0ec2 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 1261/3458] 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 8ea8150473de6b764450b4436f36f381ca0f66c5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 11:07:20 +0100
Subject: [PATCH 1262/3458] 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 bd3640d15b5b73393e707322d20d6338c99ceafb 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 1263/3458] 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 45cd668b737c5f3b91517d67fa1306baa5795357 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 1264/3458] 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 1e6a5e212224905eb80852a7f99d7f65fea5f734 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 1265/3458] 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 446099d433b48369c09db015a4a541cec6ab8ad1 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 1266/3458] 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 923661d6df9638f79d8f1d05c62a43cd1301027b Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 8 Feb 2021 21:43:06 +0000
Subject: [PATCH 1267/3458] 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 af458bd2e97a62ca7a5a779ff216bed64b322f1d 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 1268/3458] 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 95090d94e678160ae43b8eb00dfe197a8fdfeb53 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 1269/3458] 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 2793c2e932c1f40db4d945dd00b973f7e94b75dc 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 1270/3458] 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 c764b610964cbfd64b2346e223dc86d34b81f035 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 1271/3458] 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 d177457c5bbc54cf4a294cefcc046a7bc0343584 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 1272/3458] 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 34ad3715d0857b8f0c190f4a39c6672b167bc323 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 1273/3458] 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 3cb50f4185e54fa19008e88c85882cd8a740d97d 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 1274/3458] 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 1b25e2c3735de763023ddd7a1052c8bc5f68c69c 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 1275/3458] 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 fc5d970e3a49324dde210b788c338eeb49779f11 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 1276/3458] 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 1ce63d1e8f27c7a6cc50c6556e41fae603fb50a5 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 8 Feb 2021 13:49:48 +0100
Subject: [PATCH 1277/3458] 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 3821f3762901bfe4c2c8b82cf74d8c4c2fd01798 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 8 Feb 2021 13:52:51 +0100
Subject: [PATCH 1278/3458] 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 0dc8b9caffb4a0d9b4ef76385267c59d33144e64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 Feb 2021 17:01:41 +0100
Subject: [PATCH 1279/3458] 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 8a9ea81928a4848f8b37fc71800958aa664a07e7 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 13:25:24 +0100
Subject: [PATCH 1280/3458] 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 05d9991a2be24a3108f49f66129f9003a863db4d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 24 Jan 2021 12:18:09 +0100
Subject: [PATCH 1281/3458] 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 d6b4a1f4b47b8767d3b10df15ac84c0eeda15179 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 9 Feb 2021 19:27:44 +0100
Subject: [PATCH 1282/3458] 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 2cfe818a287d9063cbe46a6408ddc5702c77089d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 9 Feb 2021 19:30:02 +0100
Subject: [PATCH 1283/3458] 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 6b5076712c5db4045546ad842dbdf1fcef80663a 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 1284/3458] 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 3541e2105cb324c3b471ff4714d415beb09b7261 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Feb 2021 20:52:13 +0200
Subject: [PATCH 1285/3458] 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 f03d9d3cc5d82ff26de00db42f990a57b9c3242e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Feb 2021 20:52:19 +0200
Subject: [PATCH 1286/3458] 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 aa4120c369a0e3497658dd813e844460359c66e5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Feb 2021 20:51:03 +0200
Subject: [PATCH 1287/3458] 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 fe832c5a2cba4bc19672f7641ab823d0f4643e32 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 8 Feb 2021 21:56:27 +0000
Subject: [PATCH 1288/3458] 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 9663d3dab036b969060687e8d89fb8f9d4005109 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 23 Jan 2021 19:38:52 +0000
Subject: [PATCH 1289/3458] 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 6f34e157a03d1a881331791073e5b643553b2c69 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 1290/3458] 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 fb4929a3bba0b8f7a9e6506eacb3cb932054a092 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Tue, 9 Feb 2021 18:35:52 +0100
Subject: [PATCH 1291/3458] 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 bcb7088c35b912d52139ce06af5aa7464f7c1852 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 9 Feb 2021 10:20:49 +0000
Subject: [PATCH 1292/3458] 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 309721ac9c5c04c145186da7104626e5f3fb4927 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 9 Feb 2021 09:26:38 +0000
Subject: [PATCH 1293/3458] 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 6ac098d28c62725c75b03d13dcd24fbfca50f8f8 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 1294/3458] 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 ce6d00d9cf2ce8f0c85dcd0125e002a223e8f927 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 1295/3458] 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 c71e328a6534027fe0c6d7484d8b8f41806e46e8 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 10:39:21 +0100
Subject: [PATCH 1296/3458] 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 b7cfbef690c61a083f5acc50c561384d65f68dcb Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 11:29:10 +0100
Subject: [PATCH 1297/3458] 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 4fba3f2437381479ee51acf63209a895c85c2bd3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 14:53:25 +0100
Subject: [PATCH 1298/3458] 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 34324ede7b39a3e8f4a19f757969c55a8d652d4e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 17:22:17 +0100
Subject: [PATCH 1299/3458] 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 0cc38d71b43f25f05c9d23f7a7a23e44cd5afd39 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 17:50:47 +0100
Subject: [PATCH 1300/3458] 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 30457b2b5ea618f93ec2fbdc9abc0d56fb39390e Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 17:52:43 +0100
Subject: [PATCH 1301/3458] 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 54f37963f83ccc88bea80749e64f2d593d6a3218 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 17:33:37 +0100
Subject: [PATCH 1302/3458] 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 cf179d19d11386505dca8f910246f934e7179f91 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 1303/3458] 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 f4101f86b6ef7585c4a256dee6b417fc8ed76a13 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 1304/3458] 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 18d988f9baaf7c9b39650ce3e015438ec813e5dd Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 5 Feb 2021 10:41:54 +0000
Subject: [PATCH 1305/3458] 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 e4195fec69f0d9e2b74e32158543639e353204f6 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 13:45:04 +0100
Subject: [PATCH 1306/3458] 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 653f75a96964727cb41656b317ea01c7098d2ec0 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 1307/3458] 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 9507e9345a830680edbd34e43fb8c76a7466d251 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 1308/3458] 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 16a0d875d1a1f8996913e64ad9214dba7514cce4 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 14:02:27 +0100
Subject: [PATCH 1309/3458] 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 6617d64565180b0c6bc8726190dfbbc312861720 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 1310/3458] 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 849077c47ed307481c912b591132be2a653f173b 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 1311/3458] 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 3e56a71bf7568f2e9530996405c30075b3b6d2ca 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 1312/3458] 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 42bedf9e1a4548c61bc78acd84a04092f4d50d69 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 1313/3458] 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 dbef863b16f5fc36c256cabe201e073651efd39f 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 1314/3458] 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 df5a696a0570acaeb4c4064ac9fe26fae72d4cc5 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 5 Feb 2021 09:01:03 +0100
Subject: [PATCH 1315/3458] 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 220b25502b89468428c9b91da26cffad22e8fa49 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 1316/3458] 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 e0c130657e3fa5f62d419e89243ed7379a76c00b 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 1317/3458] 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 53de9d1ab5ebdf4fff4eeeb073b25bb2621f9a05 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 10 Feb 2021 15:50:08 +0100
Subject: [PATCH 1318/3458] 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 a0adbb8228feddc5fb5aab1359bd74cad36fbd87 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Feb 2021 14:08:58 +0100
Subject: [PATCH 1319/3458] 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 de815d48b8651abf7f6611802a05ce97895ccaee Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Tue, 9 Feb 2021 21:38:02 -0500
Subject: [PATCH 1320/3458] 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 b410c0178a3bfd8a1d7abc3619a7518efd73fcef Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 10 Feb 2021 10:39:57 +0100
Subject: [PATCH 1321/3458] 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 50a32403b690f8d04c301c210204bea34f2286ba Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 10 Feb 2021 10:50:39 +0100
Subject: [PATCH 1322/3458] 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 fa3ee3410bef7f6237903fbdb77911979255a892 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 10 Feb 2021 12:33:06 +0100
Subject: [PATCH 1323/3458] 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 284bc83d911dc32c46cfa4c19ea3a59bc2f9d5b5 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 8 Feb 2021 21:01:44 +0000
Subject: [PATCH 1324/3458] 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 9184accb7a9a82b370724305e899a84e565c63fd Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Wed, 10 Feb 2021 12:26:01 +0000
Subject: [PATCH 1325/3458] 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 389f8577fa95d3aa13bbda8bf48b73a2cebce532 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 10 Feb 2021 09:02:54 +0100
Subject: [PATCH 1326/3458] 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 bc52d6bc3c054e710830a3ec628772325621f39b Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 16:57:00 +0100
Subject: [PATCH 1327/3458] 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 ba41766d99f998ca180a175e97f196d88127de9e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:31:02 +0100
Subject: [PATCH 1328/3458] 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 2dd041b35c6e4da63d0b771eaee2607823b60759 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 10 Feb 2021 13:02:02 -0300
Subject: [PATCH 1329/3458] 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 ed3c9b499fa7d1b49b04745d3ba4f97693276876 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 9 Feb 2021 23:42:48 -0800
Subject: [PATCH 1330/3458] 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 a86e9de7604740d3673eb44ff5db3eb6c24699e1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Feb 2021 10:34:35 +0100
Subject: [PATCH 1331/3458] 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 f6e4978a566ac73a80297e7931622cc7440f50d6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Feb 2021 18:00:01 +0100
Subject: [PATCH 1332/3458] 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 50c325112999511ed82b6fb9d347ab4a8d6806d3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 10 Feb 2021 19:47:11 +0200
Subject: [PATCH 1333/3458] 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 0ef8972108ecd53cab04a5558a6dc5bda6921321 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 9 Feb 2021 21:59:03 +0100
Subject: [PATCH 1334/3458] 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 a4396588c5c5fbd1da2cfc82497b60835f47b3e5 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 1335/3458] 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 6a0e6ff255e50775fbacc9f076dc81cc39ea79ae 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 1336/3458] 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 2d1826890d6b4393e3356fbac3ef01a569fd315c 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 1337/3458] 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 68e0049afbb65e5e126d359ec65bb185bd9b40c9 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 1338/3458] 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 1132e9de8eca3f1f40c947c5fb1ff2b1ee8f05bc 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 1339/3458] 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 cac6c335cd231a09428d45398af034c0d643a9a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:36:09 +0100
Subject: [PATCH 1340/3458] 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 4c995944f758fe531b064ac086f0b5547dd93223 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:37:41 +0100
Subject: [PATCH 1341/3458] 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 0cca81a530ed83061f19e219b75cf76e4b465479 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:39:12 +0100
Subject: [PATCH 1342/3458] 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 6279d6638ac03ceb19f20f41e946e96b0dc9748c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:40:01 +0100
Subject: [PATCH 1343/3458] 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 3b4af5a9d44a3f91867171e964df4b72a5c6fdcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:42:14 +0100
Subject: [PATCH 1344/3458] 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 da887cda4dc591aecdd8067eb21bb93b74a366f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:43:03 +0100
Subject: [PATCH 1345/3458] 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 3ace89b8bcc3da654bc79d9b9607d877a5a758f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:43:46 +0100
Subject: [PATCH 1346/3458] 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 66b155249f6a7e64f06bbecaccc30059a20bf331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:44:41 +0100
Subject: [PATCH 1347/3458] 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 ba7433a51be34d446ab379801bb4744ba499b38c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:45:21 +0100
Subject: [PATCH 1348/3458] 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 e977669166730d118e15b6a5cf909f555934e813 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:46:04 +0100
Subject: [PATCH 1349/3458] 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 8f71049fe9a77a9d6b9a9f535ae963faaa4b0c6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:47:15 +0100
Subject: [PATCH 1350/3458] 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 eea5bcb8a26422a86b04ad9ca26f87974be27321 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:48:51 +0100
Subject: [PATCH 1351/3458] 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 d2f91459791bae0f1aa81fe19a51ab207b0106ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:50:22 +0100
Subject: [PATCH 1352/3458] 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 aa19235c9a0ffba9719281b7ae734f8453677335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:51:42 +0100
Subject: [PATCH 1353/3458] 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 2cf2316433f3260d07d7f6087d04a99582c442f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:52:57 +0100
Subject: [PATCH 1354/3458] 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 2b8cf78328e08b764053a13e57e37edad3036df6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:53:42 +0100
Subject: [PATCH 1355/3458] 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 f662634455a6a69af4c1217d0ab7e5f542108a50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:54:06 +0100
Subject: [PATCH 1356/3458] 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 3f94160c27afdf1756959fe660ad5abbe2b78909 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:54:29 +0100
Subject: [PATCH 1357/3458] 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 9d9a13e0066ec9f0b341e14497a302b8c37c2f13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:55:11 +0100
Subject: [PATCH 1358/3458] 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 928848ab7a23a7b67389cdf35fc7c98239f55ecc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:56:01 +0100
Subject: [PATCH 1359/3458] 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 541a33662207cfca1dc3161d16fb8fbc2f2b9cff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:56:39 +0100
Subject: [PATCH 1360/3458] 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 606cc75b5e6063d30bb6652cee2b46ba7ea5d287 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:57:06 +0100
Subject: [PATCH 1361/3458] 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 47b0e677b5e60757bb1991944e6cc8ea7f8a6df7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:57:48 +0100
Subject: [PATCH 1362/3458] 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 ea650ece3c8779a7b19f29fcac41b692b39cba30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:59:05 +0100
Subject: [PATCH 1363/3458] 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 3d722278d774a78e3ddde5071bcb9f42159e7c52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 21:59:41 +0100
Subject: [PATCH 1364/3458] 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 58011cb0ff45cb6e084ec9734e2866c1656f165b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 22:00:07 +0100
Subject: [PATCH 1365/3458] 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 59a9471f0a667b8114a461179395ab468b179fa3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 22:00:33 +0100
Subject: [PATCH 1366/3458] 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 6fd825bddebd7c289cccaeb14e04ecf5012d079f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 22:26:24 +0100
Subject: [PATCH 1367/3458] 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 d1528229c086bb0d5fad68669bbe4753318b0445 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 30 Dec 2020 22:45:21 +0100
Subject: [PATCH 1368/3458] 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 33241dea72ae2e29c1d55e79e96929ea7faf8f9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 21:33:22 +0100
Subject: [PATCH 1369/3458] 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 1a5de225dcaa45f9a6680a9743df3f70606daa81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 19:52:11 +0100
Subject: [PATCH 1370/3458] 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 cd382f4958b71c6eebec6559b26976acfdfd52a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 10 Feb 2021 23:51:02 +0100
Subject: [PATCH 1371/3458] 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 c4ba79f317b649088b28e55ec72b76f4fb243e89 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 1372/3458] 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 689814ca49ad64bb21a16e79f9b1f801d37fa675 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 1373/3458] 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 348cd2677e63799744eb0f2c200bebfb2b861f2f 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 1374/3458] 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 1608b4be7edeecfa2a11c3f80a01ff7fa1500f05 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Wed, 10 Feb 2021 15:43:19 -0700
Subject: [PATCH 1375/3458] 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 993aef0bb4841a76923586ea2243322497a8e68a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Feb 2021 02:24:37 +0100
Subject: [PATCH 1376/3458] 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 54ae7072c7735f11a91751ed3d15f02d8fed6484 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 1377/3458] 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 946bd48536d9a1f5cb25756fb857df6aa651e22b 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 1378/3458] 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 a7565ff345bab172e3945846b2b41097f1b0bcbc 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 1379/3458] 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 af5b0fdd7eefb3a6cbd7ec0abb3bed5a7468dcf9 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 1380/3458] 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 296f4f684a78537518c41c10bd9d2343752a7ce2 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 1381/3458] 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 6dd55483c41a81d58f7e7786a252741d985bf068 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 1382/3458] 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 7501cc944913b347b5acf3ee3ba596322cadf523 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 1383/3458] 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 d5a01d198c4c1a87793ed8109c13f65d36ec8d89 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 1384/3458] 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 6600ece20cca0db1b64d902a11aa696062111bc8 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 23:05:13 +0100
Subject: [PATCH 1385/3458] 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 ce97fa64561b94aac3a875ac26e3aa6d82d1e2c1 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Feb 2021 16:35:28 +0100
Subject: [PATCH 1386/3458] 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 158d308e299a82c0f64ee9ddf8dcb58d4b41f608 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 1387/3458] 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 863137f5132a27a4a56633f2c5ba1f3a830c0ae3 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 1388/3458] 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 9eeaa98df1b4e0a8b28ddc687401687c904efd63 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 1389/3458] 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 94d08fd52353355f28d1c70036ef3bd347b7feae Mon Sep 17 00:00:00 2001
From: Adrian Herath <adrianisuru@gmail.com>
Date: Mon, 8 Feb 2021 22:44:05 -0600
Subject: [PATCH 1390/3458] 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 21447c495244f9b60e36629eff87842a8ffafe73 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 1391/3458] 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 0e4625befca5928042c10c81fd7a3b1b1136c71f Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 19:52:59 +0100
Subject: [PATCH 1392/3458] 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 f1a2bc5c26f3c563ecb3ff7ac7732214e783fc1e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 19:53:08 +0100
Subject: [PATCH 1393/3458] 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 f67733aad32ba4e827c7c7fd97ab9370b67e43e7 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Mon, 8 Feb 2021 14:17:24 +0100
Subject: [PATCH 1394/3458] 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 71facae904833348208f06c214f285c4db836395 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 7 Feb 2021 12:51:52 +0100
Subject: [PATCH 1395/3458] 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 79bd44a79bb3e763f0b194d93a6a900a5bc99fe2 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 1 Feb 2021 10:37:49 +0000
Subject: [PATCH 1396/3458] 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 5e5574b9c0a38b6c399b5a721761fbdbebd8ab60 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 1397/3458] 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 203447e0562a8770ae762174a9a6ef37b7da73c2 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 1398/3458] 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 03740170d8656f07d883c595ed9eb570519c059f 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 1399/3458] 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 ebc0b0773b11504f9c1e5813a57a01c0c3f43aec 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 1400/3458] 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 e2038dcf198f8fe6310792ff9dfbcf45f559d0e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 11:19:42 +0100
Subject: [PATCH 1401/3458] 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 e3f972634295b6a73e73655b7c8c389ae5b078b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Feb 2021 11:31:57 +0100
Subject: [PATCH 1402/3458] 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 616cb112438b3307c457aae4f75e7ea50955c01b 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 1403/3458] 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 cb0ef6f4238406688e40fac7ebc2b506e6685e99 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 1404/3458] 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 cbf789bb91297a8f51b30297e6b26f0119a23cc2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Feb 2021 13:56:33 +0100
Subject: [PATCH 1405/3458] 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 c1759ef420c5831772c545bd57845484eefe2c6b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Feb 2021 14:31:46 +0100
Subject: [PATCH 1406/3458] 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 c9066d7efd40e38b021e2f5d8b90821a2e466e14 Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Thu, 11 Feb 2021 10:57:51 +0100
Subject: [PATCH 1407/3458] 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 b14eabf646e0a753e431905feef1d059ed698c50 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 1408/3458] 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 0663a53b5ed8ba474c8f2bf20c64a67848987f62 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 1409/3458] 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 c737b7b75164ec5b2ea28235655e32d4bfe8b5ec 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 1410/3458] 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 9cf960194012107c6485b35d5de987a62fbe2543 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 1411/3458] 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 581abf7efa3808d3009bccbf2f02b30d3a490353 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 1412/3458] 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 01d1f636446076c5ad1ae511de79fd9db8bb5377 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 1413/3458] 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 1c03585e46336eec7f03cb1c28de67f57cbd7db0 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 1414/3458] 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 18bd9f6dab2efb6f6050227406c35c1a02bed1c4 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 1415/3458] 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 33eae70858a329bc40927b22040811b1df96d6df 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 1416/3458] 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 9d8ecaa831495746048ac120c369cf782790dd88 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 1417/3458] 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 ca3731dfbdd0e0aa3a117f5de1d27b9ed7a4cc32 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 1418/3458] 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 f8ca1963c7d74ca29d956519a63bddee91458400 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 1419/3458] 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 a9fdfe667b9ee89ca4ce6e66658ba75b5f52419f Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:00 -0700
Subject: [PATCH 1420/3458] 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 fbd44fb2f5440099a0018ebc0855191454afcba1 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:05 -0700
Subject: [PATCH 1421/3458] 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 5a040b49cd43fd7e950a925d8d81c1ab9c807fa2 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:11 -0700
Subject: [PATCH 1422/3458] 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 565dc07a7ea35043584a630854deca907bb52922 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:19 -0700
Subject: [PATCH 1423/3458] 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 3d318479422e11ddec5d39bc4dd4701bb7baf868 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 30 Jan 2021 20:59:28 -0700
Subject: [PATCH 1424/3458] 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 bf531c61c32049145f511f723dddb90d9f5cd94f 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 1425/3458] 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 e38a056008af0061b6f404b8cb7f3fb053874f56 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 1426/3458] 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 26630a1283011703e97fa632aa98ec8ca53b19d3 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 21:20:30 +0100
Subject: [PATCH 1427/3458] 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 d3a5adf0141c25a6952bd926ef830892b5c354a0 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 21:52:28 +0100
Subject: [PATCH 1428/3458] 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 3708538af27f377a91d7f0f386467509c17e3266 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 10 Feb 2021 13:13:05 +0100
Subject: [PATCH 1429/3458] 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 f60055b67248525d582d48c90075ff7de3fce76c 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 1430/3458] 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 f5815cb5a45d054c9194d1aa05e28b6dedfc0864 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 1431/3458] 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 b22e2dd2c6bfc93e17a387ee539fee0ab3446c97 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 1432/3458] 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 88fc1f71fdd35601ab03540ac3f731a3c66809c3 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 1433/3458] 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 6263d593a8612c4a42e4c6ec5bbd2a2c2a0b157d 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 1434/3458] 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 c500ddb289148f1b8bf8e9dc76787600ed1e9769 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 1435/3458] 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 62d38a85b3099a3c6dbf6035148058ddc29167d1 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 1436/3458] 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 854d33a79c6730f0785e00748716cfd0d513936b 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 1437/3458] 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 2ec1a6f4895798530c75e97ad533486b00741ff4 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 1438/3458] 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 e7778d9f645f23b0c6b613eb6050f37af653b815 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 1439/3458] 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 389b0a26160ad6245afa3f911041852306cd08e9 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 1440/3458] 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 badb04066aeffa85b5645c1f3ab3aeddb1c073f8 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 1441/3458] 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 433e20a0e6bcf371c4f574a58c612d4d474efd64 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 1442/3458] 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 99e272337fab92f50e8b399c412fe4a182f0849b 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 1443/3458] 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 f410dc80106080b1cd99a8be1152b64b42d8819e 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 1444/3458] 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 7aa56e09b3b16cb11f9a8ba4b6259dd12e0ffee6 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 1445/3458] 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 cac716ff6ed9d219aa0504843393dded9348832e 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 1446/3458] 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 83d11620434431c13dec7d915b067210f7cd53bc 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 1447/3458] 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 908dd7f5c1fc4fa5bd31328965edcd518ea205e7 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 1448/3458] 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 afb4d326e6fca0e15537f2c7291f7bbab15d177f 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 1449/3458] 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 998efa3e117a44ab88d4c1ccdf0a97c1d0010d49 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 1450/3458] 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 38a808da86c3f0c11f21858db2e8ac3f22db489a 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 1451/3458] 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 c5e5b7be5dfbc2e28b0b441d070838387320e88b 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 1452/3458] 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 de460d8c64a959b3849d7e7691e21d070265efc1 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 1453/3458] 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 11f22f44fc9ef463c8b135e19bda0ad98a1a0389 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Feb 2021 20:58:33 +0100
Subject: [PATCH 1454/3458] 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 faa8571a09c8c62d8359d24a4ff72275d5ff28e0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Feb 2021 20:59:40 +0100
Subject: [PATCH 1455/3458] 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 a059add4e43c996a14b1d0b57615678e39921332 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Feb 2021 21:00:23 +0100
Subject: [PATCH 1456/3458] 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 a73b34822d2c048f054da5d590a62a434f812526 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Feb 2021 21:01:23 +0100
Subject: [PATCH 1457/3458] 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 d982fd8fc62793389511f714f1b7c9226a1965e6 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 22:04:48 +0100
Subject: [PATCH 1458/3458] 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 c372e1ededa3d33ee958498be90b96ff06b6e7b0 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 1459/3458] 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 914d9d27c6a707fb2290abd0e0ea0fd4398127a8 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 11 Feb 2021 17:39:56 +0000
Subject: [PATCH 1460/3458] 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 c1b3b11513276ef16c24a4bd867eaf99fccb6afb Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 21:54:06 +0100
Subject: [PATCH 1461/3458] 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 9a0020bff4e87d5f99624c5674c3979396005560 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 11 Feb 2021 11:16:35 +0100
Subject: [PATCH 1462/3458] 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 3af18c8a743871e4077757a811e2c2826ad26d93 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 1463/3458] 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 7727a456e8fae75e28b8f0b37cd6bf58ad79e010 Mon Sep 17 00:00:00 2001
From: TC <git@titouan.co>
Date: Thu, 11 Feb 2021 10:41:52 +0100
Subject: [PATCH 1464/3458] 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 319757d7da54d76fe8575f0ffaa2f1c5b4ad2480 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Thu, 11 Feb 2021 17:20:36 +0000
Subject: [PATCH 1465/3458] 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 dd19364252a957a5f54e9c2d4a94ce6286da2667 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 22:14:45 +0100
Subject: [PATCH 1466/3458] 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 12870db1d1cc7e67954fe82e9f93bd46ec2ee682 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Thu, 11 Feb 2021 21:57:31 +0100
Subject: [PATCH 1467/3458] 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 7dfda6eb9d04f702253b78b537234890c114d172 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 1468/3458] 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 7d99b7c85d4cbb94b0ef3a4744484c513f9bcb22 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 11 Feb 2021 11:57:46 +0100
Subject: [PATCH 1469/3458] 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 63a9e776a1de755bb7e94ee27e301982f5f2ccc8 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 22:47:38 +0100
Subject: [PATCH 1470/3458] 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 c3b1e2b35ac9767df96bfab22d645a60f5ef27a7 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 1471/3458] 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 e5e82d7cde961774f49968ec112dd42bf9c5a66e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 31 Jan 2021 00:10:41 +0200
Subject: [PATCH 1472/3458] 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 8ed650c4858cef61f54e691cb52396341dc82774 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:04:20 +0100
Subject: [PATCH 1473/3458] 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 466b572c8d561914ba09f7cbc38cf858fedbce6b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 12 Feb 2021 00:55:34 +0100
Subject: [PATCH 1474/3458] 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 dadb731b3e5e003821a90cf2f8364c6b6f4530f3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 12 Feb 2021 02:30:27 +0100
Subject: [PATCH 1475/3458] 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 435fea85c633f0a975414b8fd30f6e764792ffa7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 12 Feb 2021 02:41:35 +0100
Subject: [PATCH 1476/3458] 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 6ddd389eab6e27ac43d4ff1bee2a050471e98b9e Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Thu, 29 Oct 2020 11:47:37 +0200
Subject: [PATCH 1477/3458] 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 e4b43110078ff57d23d1837f23c70264bb52167d Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 25 Oct 2020 17:13:56 +0200
Subject: [PATCH 1478/3458] 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 667f1d9ef34fb8d30037be483148f0de0d27bcbf Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 25 Oct 2020 17:14:54 +0200
Subject: [PATCH 1479/3458] 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 5c23b628adcccdbbce81a4b5a6e19dfa7e5c3a55 Mon Sep 17 00:00:00 2001
From: Auri <me@aurieh.me>
Date: Sun, 25 Oct 2020 17:25:55 +0200
Subject: [PATCH 1480/3458] 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 1175a4c2e3824417acfe36095353867a02906061 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 26 Dec 2020 03:43:48 -0600
Subject: [PATCH 1481/3458] 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 b421b135a3609ea84321cebb386116bd014c115d 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 1482/3458] 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 b83ec20eb96e741c828abba65ef0c8cbcad29c8c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Feb 2021 11:37:35 +0100
Subject: [PATCH 1483/3458] 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 2678866bfc478b21ab6179b07367eec24e68ddfa 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 1484/3458] 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 509efeaeacfa76abd5061286cd0702fbd29c43f7 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 1485/3458] 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 e5a39543f33f146b5fb1fc9ca3e3ac9e532cd002 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 1486/3458] 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 61173fb287e7b72ea5b68cfc5ee26106ff500d64 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 1487/3458] 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 55909be8613feb393436a71c8e3a20565f10b295 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 1488/3458] 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 cbfd28498b644f5d962bc5e05e441fa956cf2c42 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 1489/3458] 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 8f912183f66a326136dca82c5f384c9c6571180c 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 1490/3458] 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 d02850326724aea2a5297779f183ab479cb1dbdd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 12 Feb 2021 15:11:07 +0200
Subject: [PATCH 1491/3458] 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 ce5713a226c7a8cfc4fce90b575e2be0ebeb08f7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 12 Feb 2021 15:05:50 +0200
Subject: [PATCH 1492/3458] 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 36395394fc7554f900be04e17b24c5057ec72b40 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 10:22:33 +0000
Subject: [PATCH 1493/3458] 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 640aa8bd90dcf7114aaba95d3fbcb64619f826f6 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 09:32:07 +0000
Subject: [PATCH 1494/3458] 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 d98e0d38042a17448fb55cc87bba55fd6a122666 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 09:18:07 +0000
Subject: [PATCH 1495/3458] 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 419cfaddf6f13c20c1b56661d70e6fbf6db23da5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 12 Feb 2021 09:59:31 +0100
Subject: [PATCH 1496/3458] 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 7547e159ee7fce5234be1fa97bd7fd3325bbee28 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 08:54:49 +0000
Subject: [PATCH 1497/3458] 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 769ba63bf2a1b5c927cbdfc9b39322f258d40347 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 12 Feb 2021 17:05:51 +0100
Subject: [PATCH 1498/3458] 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 169e6e76ec27a6a05dca6448b461bfa99bf1466b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 12 Feb 2021 17:07:35 +0100
Subject: [PATCH 1499/3458] 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 46e208ba1f66bde4c7c2bdd2ac2a9401187f099d 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 1500/3458] 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 5e93562d42090a4fba26a98ef51113fb995148a8 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 1501/3458] 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 a4820381e39c628285309d13cdcd7839d911a7f5 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 1502/3458] 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 cca40e06719fab245307972576603ad48a8eb467 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 1503/3458] 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 0031c99a494ded237463d26a7f5b156a5f3c79d8 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 1504/3458] 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 e4bae17e9128c9f1baa029a718d06991fc0b90c9 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 1505/3458] 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 a422505859cdecbbe921a76ede6c980e1eaa9711 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 1506/3458] 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
-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 is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-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_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_NX=y
-CONFIG_CRYPTO_DEV_NX_ENCRYPT=y
-CONFIG_CRYPTO_DEV_NX_COMPRESS=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
-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=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_CORDIC=m
-CONFIG_PRIME_NUMBERS=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=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_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_DMA_OPS_BYPASS=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_FORCE_DMA_UNENCRYPTED=y
-CONFIG_DMA_VIRT_OPS=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_IOMMU_HELPER=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_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_HAS_PMEM_API=y
-CONFIG_MEMREGION=y
-CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
-CONFIG_ARCH_HAS_COPY_MC=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_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 is not set
-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 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=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_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_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_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_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
-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 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 is not set
-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_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_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 is not set
-# 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 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=m
-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 is not set
-CONFIG_PPC_WERROR=y
-CONFIG_PRINT_STACK_DEPTH=64
-# CONFIG_HCALL_STATS is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_CODE_PATCHING_SELFTEST is not set
-# CONFIG_JUMP_LABEL_FEATURE_CHECKS 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_BOOTX_TEXT=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_PPC_PTDUMP is not set
-# CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
-# end of powerpc 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=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 is not set
-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_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/ppc64le-dotconfig b/srcpkgs/linux5.9/files/ppc64le-dotconfig
deleted file mode 100644
index 95ae09738204..000000000000
--- a/srcpkgs/linux5.9/files/ppc64le-dotconfig
+++ /dev/null
@@ -1,9682 +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_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 is not set
-# 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_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 is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_PPC64_BOOT_WRAPPER=y
-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_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_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_PAPR_SCM=m
-CONFIG_PPC_SVM=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 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_RTAS_FLASH=m
-CONFIG_EEH=y
-CONFIG_PPC_P7_NAP=y
-CONFIG_PPC_BOOK3S_IDLE=y
-CONFIG_PPC_INDIRECT_PIO=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_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_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_MPROFILE_KERNEL=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_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_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
-# 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
-CONFIG_HAVE_LIVEPATCH=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_KPROBES_ON_FTRACE=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_RELIABLE_STACKTRACE=y
-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
-
-#
-# 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_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 is not set
-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=m
-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 is not set
-# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
-CONFIG_MTD_PCI=m
-# 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_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_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_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_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_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=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_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_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 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=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_MAC_EMUMOUSEBTN=m
-CONFIG_WINDFARM=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=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_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_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_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_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_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_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 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=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 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_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_NE2K_PCI=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=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_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_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_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 is not set
-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=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_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_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
-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_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 is not set
-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_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=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_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_EARLYCON=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
-# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
-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_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_FSL=y
-CONFIG_SERIAL_8250_DW=m
-CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_OF_PLATFORM=y
-
-#
-# 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_ICOM=m
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SIFIVE=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=m
-CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
-# CONFIG_SERIAL_MEN_Z135 is not set
-CONFIG_SERIAL_SPRD=m
-# 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_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_BA431=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_PSERIES=m
-CONFIG_HW_RANDOM_POWERNV=m
-CONFIG_HW_RANDOM_CCTRNG=m
-CONFIG_APPLICOM=m
-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 is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_NFORCE2 is not set
-CONFIG_I2C_NVIDIA_GPU=m
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# 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_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 is not set
-CONFIG_SPI_SC18IS602=m
-CONFIG_SPI_SIFIVE=m
-CONFIG_SPI_MXIC=m
-CONFIG_SPI_XCOMM=m
-# CONFIG_SPI_XILINX is not set
-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
-
-#
-# 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
-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_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 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 is not set
-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 is not set
-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_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_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_MXSFB 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_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_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_MACMODES=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_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 is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# 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_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_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_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 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=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_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 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=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 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_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_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 is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-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_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_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
-# 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_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 is not set
-
-#
-# 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_EFA=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_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_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 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=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_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 is not set
-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=m
-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 is not set
-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_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_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=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=m
-CONFIG_CRYPTO_NULL=m
-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=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=m
-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=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
-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_NX=y
-CONFIG_CRYPTO_DEV_NX_COMPRESS=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
-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=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_CORDIC=m
-CONFIG_PRIME_NUMBERS=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=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_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_DMA_OPS_BYPASS=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_FORCE_DMA_UNENCRYPTED=y
-CONFIG_DMA_VIRT_OPS=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_IOMMU_HELPER=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_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_HAS_PMEM_API=y
-CONFIG_MEMREGION=y
-CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
-CONFIG_ARCH_HAS_COPY_MC=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_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 is not set
-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 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=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_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_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_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_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
-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 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 is not set
-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_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_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_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=y
-# CONFIG_TRACER_SNAPSHOT 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 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=m
-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 is not set
-CONFIG_PPC_WERROR=y
-CONFIG_PRINT_STACK_DEPTH=64
-# CONFIG_HCALL_STATS is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-# CONFIG_CODE_PATCHING_SELFTEST is not set
-# CONFIG_JUMP_LABEL_FEATURE_CHECKS 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_BOOTX_TEXT=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_PPC_PTDUMP is not set
-# CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
-# end of powerpc 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=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 is not set
-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_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/x86_64-dotconfig b/srcpkgs/linux5.9/files/x86_64-dotconfig
deleted file mode 100644
index 8ee13b29aa27..000000000000
--- a/srcpkgs/linux5.9/files/x86_64-dotconfig
+++ /dev/null
@@ -1,10047 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 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_IRQ_MSI_IOMMU=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_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_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_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_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=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 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_HAVE_ARCH_USERFAULTFD_WP=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_ABSOLUTE_PERCPU=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_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=28
-CONFIG_ARCH_MMAP_RND_BITS_MAX=32
-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_GENERIC_BUG_RELATIVE_POINTERS=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_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_64_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-CONFIG_X86_CPU_RESCTRL=y
-# 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_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_XXL=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_X86_HV_CALLBACK_VECTOR=y
-CONFIG_XEN=y
-CONFIG_XEN_PV=y
-CONFIG_XEN_PV_SMP=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_PVHVM_SMP=y
-CONFIG_XEN_512GB=y
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_XEN_PVH=y
-CONFIG_KVM_GUEST=y
-CONFIG_ARCH_CPUIDLE_HALTPOLL=y
-CONFIG_PVH=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_JAILHOUSE_GUEST is not set
-# CONFIG_ACRN_GUEST is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-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_AMD=y
-CONFIG_CPU_SUP_HYGON=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_ZHAOXIN=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS_RANGE_BEGIN=2
-CONFIG_NR_CPUS_RANGE_END=512
-CONFIG_NR_CPUS_DEFAULT=64
-CONFIG_NR_CPUS=256
-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_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_16BIT is not set
-CONFIG_X86_VSYSCALL_EMULATION=y
-CONFIG_X86_IOPL_IOPERM=y
-CONFIG_I8K=m
-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_X86_5LEVEL is not set
-CONFIG_X86_DIRECT_GBPAGES=y
-# CONFIG_X86_CPA_STATISTICS is not set
-# CONFIG_AMD_MEM_ENCRYPT is not set
-CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
-CONFIG_X86_64_ACPI_NUMA=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_PMEM_LEGACY=y
-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_MEMORY_PROTECTION_KEYS=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_EFI_MIXED=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_KEXEC_FILE is not set
-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_DYNAMIC_MEMORY_LAYOUT=y
-CONFIG_RANDOMIZE_MEMORY=y
-CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
-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_LEGACY_VSYSCALL_EMULATE is not set
-# CONFIG_LEGACY_VSYSCALL_XONLY is not set
-CONFIG_LEGACY_VSYSCALL_NONE=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_HAVE_LIVEPATCH=y
-# end of Processor type and features
-
-CONFIG_ARCH_HAS_ADD_PAGES=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
-CONFIG_ARCH_ENABLE_THP_MIGRATION=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_LPIT=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=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_CSTATE=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_CPPC_LIB=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_MEMORY=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_ACPI_NFIT=m
-# CONFIG_NFIT_SECURITY_DEBUG is not set
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_HMAT=y
-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_MEMORY_FAILURE=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_ACPI_ADXL=y
-# CONFIG_PMIC_OPREGION is not set
-CONFIG_ACPI_CONFIGFS=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_SFI=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_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_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# 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_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_MMCONF_FAM10H=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-# CONFIG_ISA_BUS is not set
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-# CONFIG_X86_SYSFB is not set
-# end of Bus options (PCI etc.)
-
-#
-# Binary Emulations
-#
-CONFIG_IA32_EMULATION=y
-# CONFIG_X86_X32 is not set
-CONFIG_COMPAT_32=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-# end of Binary Emulations
-
-#
-# 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 is not set
-# 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_SOFT_RESERVE=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
-CONFIG_EFI_BOOTLOADER_CONTROL=m
-CONFIG_EFI_CAPSULE_LOADER=m
-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_KVM_COMPAT=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_AMD_SEV=y
-# 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_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_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=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_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_TRANSPARENT_HUGEPAGE_PUD=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=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_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=28
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
-CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
-CONFIG_HAVE_STACK_VALIDATION=y
-CONFIG_HAVE_RELIABLE_STACKTRACE=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_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_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_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_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_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_CONTIG_ALLOC=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_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-# CONFIG_HWPOISON_INJECT is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-CONFIG_ARCH_WANTS_THP_SWAP=y
-CONFIG_THP_SWAP=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-# CONFIG_CMA is not set
-# 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 is not set
-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_MAPPING_DIRTY_HELPERS=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=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=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 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=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 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_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_XEN is not set
-# 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_XEN_PCIDEV_FRONTEND=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_LOCKLESS_CONFIG=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-# CONFIG_PCI_P2PDMA is not set
-CONFIG_PCI_LABEL=y
-CONFIG_PCI_HYPERV=m
-CONFIG_HOTPLUG_PCI=y
-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
-#
-CONFIG_VMD=m
-CONFIG_PCI_HYPERV_INTERFACE=m
-
-#
-# 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_HMEM_REPORTING=y
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
-CONFIG_SYS_HYPERVISOR=y
-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_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_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_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_BLKDEV_BACKEND=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_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_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_INTEL_MIC_BUS is not set
-CONFIG_SCIF_BUS=m
-CONFIG_VOP_BUS=m
-CONFIG_SCIF=m
-CONFIG_MIC_COSM=m
-CONFIG_VOP=m
-# 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
-
-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=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_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_SCSI_MYRB=m
-CONFIG_SCSI_MYRS=m
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_XEN_SCSI_FRONTEND=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_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_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_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 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=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 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=y
-CONFIG_AMD_XGBE_HAVE_ECC=y
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_AQTION=m
-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=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 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_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=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=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 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=m
-CONFIG_NET_VENDOR_MICROSEMI=y
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-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_NE2K_PCI=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 is not set
-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_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_CAVIUM=m
-CONFIG_MDIO_GPIO=m
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_MVUSB is not set
-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 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=m
-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=m
-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 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_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_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=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_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_XEN_KBDDEV_FRONTEND=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_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_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_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=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_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_APPLICOM=m
-CONFIG_MWAVE=m
-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_XEN=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_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 is not set
-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_MLXCPLD=m
-CONFIG_I2C_CROS_EC_TUNNEL=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_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_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_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_I2C=m
-CONFIG_PINCTRL_MCP23S08_SPI=m
-CONFIG_PINCTRL_MCP23S08=m
-CONFIG_PINCTRL_SX150X=y
-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_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_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_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 is not set
-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
-CONFIG_SENSORS_XGENE=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=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_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
-CONFIG_PROC_THERMAL_MMIO_RAPL=y
-# 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_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_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
-CONFIG_XEN_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_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_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=m
-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=m
-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=m
-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_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 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 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=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 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_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-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_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_I915=m
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_USERPTR=y
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-
-#
-# 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_XEN 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_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_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_XEN_FBDEV_FRONTEND=m
-# 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_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_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_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=0
-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=m
-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 is not set
-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_PCI=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=m
-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_SSP_CLK=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=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
-CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
-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=m
-CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
-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=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 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=m
-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=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_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=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_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_RT5514=m
-CONFIG_SND_SOC_RT5514_SPI=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_RT5663=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=m
-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_SND_XEN_FRONTEND is not set
-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=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 is not set
-CONFIG_HID_GOOGLE_HAMMER=m
-# 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
-
-#
-# Intel ISH HID support
-#
-CONFIG_INTEL_ISH_HID=m
-CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
-# end of Intel ISH 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 is not set
-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=m
-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_MENF21BMC=m
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_MLXCPLD=m
-CONFIG_LEDS_MLXREG=m
-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_VIRT_DMA=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_QIB_DCA=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=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_BNXT_RE=m
-CONFIG_INFINIBAND_HFI1=m
-# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
-# CONFIG_SDMA_VERBOSITY is not set
-CONFIG_INFINIBAND_QEDR=m
-CONFIG_INFINIBAND_RDMAVT=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_INFINIBAND_OPA_VNIC is not set
-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=y
-CONFIG_EDAC_E752X=m
-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_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_EDAC_I7300=m
-CONFIG_EDAC_SBRIDGE=m
-CONFIG_EDAC_SKX=m
-CONFIG_EDAC_I10NM=m
-CONFIG_EDAC_PND2=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_INTEL_IDXD=m
-CONFIG_INTEL_IOATDMA=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_HSU_DMA=m
-# CONFIG_SF_PDMA is not set
-
-#
-# 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 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_DCA=m
-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_PMEM is not set
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_MEM=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
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
-CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GNTDEV_DMABUF=y
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_GRANT_DMA_ALLOC=y
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_XEN_PVCALLS_FRONTEND=m
-# CONFIG_XEN_PVCALLS_BACKEND is not set
-CONFIG_XEN_SCSI_BACKEND=m
-CONFIG_XEN_PRIVCMD=m
-CONFIG_XEN_ACPI_PROCESSOR=m
-# CONFIG_XEN_MCE_LOG is not set
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_XEN_EFI=y
-CONFIG_XEN_AUTO_XLATE=y
-CONFIG_XEN_ACPI=y
-CONFIG_XEN_SYMS=y
-CONFIG_XEN_HAVE_VPMU=y
-CONFIG_XEN_UNPOPULATED_ALLOC=y
-# end of Xen driver 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_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
-#
-CONFIG_STAGING_GASKET_FRAMEWORK=m
-CONFIG_STAGING_APEX_DRIVER=m
-# 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_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=m
-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=m
-CONFIG_TOUCHSCREEN_DMI=y
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-
-#
-# Intel Speed Select Technology interface support
-#
-# CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
-# end of Intel Speed Select Technology interface support
-
-# CONFIG_INTEL_TURBO_MAX_3 is not set
-CONFIG_INTEL_UNCORE_FREQ_CONTROL=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_INTEL_TELEMETRY=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_ISHTP is not set
-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=m
-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_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-CONFIG_PCC=y
-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_IOMMU_DMA=y
-CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_V2=m
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
-CONFIG_INTEL_IOMMU_DEFAULT_ON=y
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
-CONFIG_IRQ_REMAP=y
-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 is not set
-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 is not set
-# 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 is not set
-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 is not set
-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 is not set
-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=m
-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=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_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 is not set
-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_AMD=m
-# CONFIG_NTB_IDT is not set
-CONFIG_NTB_INTEL=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_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_RAS_CEC is not set
-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_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_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=m
-CONFIG_INTEL_TH=m
-CONFIG_INTEL_TH_PCI=m
-CONFIG_INTEL_TH_ACPI=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 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
-#
-CONFIG_AMDTEE=m
-# 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_UNISYS_VISORBUS is not set
-# 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_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_QUOTACTL_COMPAT=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_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_TMPFS_INODE64=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=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=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_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=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_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_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 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_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
-# CONFIG_EVM 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=m
-CONFIG_CRYPTO_NULL=m
-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_GLUE_HELPER_X86=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
-CONFIG_CRYPTO_CURVE25519_X86=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_AEGIS128_AESNI_SSE2 is not set
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-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=m
-CONFIG_CRYPTO_NHPOLY1305=m
-CONFIG_CRYPTO_NHPOLY1305_SSE2=m
-CONFIG_CRYPTO_NHPOLY1305_AVX2=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_BLAKE2S_X86=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_POLY1305_X86_64=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_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512_SSSE3=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
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=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_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-# CONFIG_CRYPTO_SM4 is not set
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-
-#
-# 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_ARCH_HAVE_LIB_BLAKE2S=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_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-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_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=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_SP_PSP=y
-# 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_NITROX_CNN55XX is not set
-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_USE_CMPXCHG_LOCKREF=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_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_DMA_VIRT_OPS=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_IOMMU_HELPER=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_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_HAS_PMEM_API=y
-CONFIG_MEMREGION=y
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
-CONFIG_ARCH_HAS_COPY_MC=y
-CONFIG_ARCH_STACKWALK=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 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_STACK_VALIDATION=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
-CONFIG_HAVE_ARCH_KCSAN=y
-# 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_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_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_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_CHECK_TIMESTAMP=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
-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 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 is not set
-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 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_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_IOMMU_DEBUG 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 is not set
-CONFIG_UNWINDER_ORC=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
-# 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_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-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 is not set
-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/patches/navi_arm64.patch b/srcpkgs/linux5.9/patches/navi_arm64.patch
deleted file mode 100644
index 7ac03b67465c..000000000000
--- a/srcpkgs/linux5.9/patches/navi_arm64.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-From eb493330aaa22cf7935c338f7d028bfeb1316b3b Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sat, 8 Aug 2020 21:21:11 +0200
-Subject: [PATCH] drm/amd/display: add DCN support for Aarch64
-
-This adds ARM64 support into the DCN. This mainly enables support
-for Navi graphics cards. The dcn10 changes haven't been tested,
-since I don't have the relevant hardware available, but there
-is no way to conditionally disable them, so I've done them anyway.
-
-Signed-off-by: Daniel Kolesa <daniel@octaforge.org>
-
-diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
-index 34ae4f3a3..f6f5ac865 100644
---- a/drivers/gpu/drm/amd/display/Kconfig
-+++ b/drivers/gpu/drm/amd/display/Kconfig
-@@ -6,7 +6,7 @@ config DRM_AMD_DC
- 	bool "AMD DC - Enable new display engine"
- 	default y
- 	select SND_HDA_COMPONENT if SND_HDA_CORE
--	select DRM_AMD_DC_DCN if (X86 || PPC64) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
-+	select DRM_AMD_DC_DCN if (X86 || PPC64 || (ARM64 && KERNEL_MODE_NEON)) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
- 	help
- 	  Choose this option if you want to use the new display engine
- 	  support for AMDGPU. This adds required support for Vega and
-diff --git a/drivers/gpu/drm/amd/display/dc/calcs/Makefile b/drivers/gpu/drm/amd/display/dc/calcs/Makefile
-index 4674aca8f..64f515d74 100644
---- a/drivers/gpu/drm/amd/display/dc/calcs/Makefile
-+++ b/drivers/gpu/drm/amd/display/dc/calcs/Makefile
-@@ -33,6 +33,10 @@ ifdef CONFIG_PPC64
- calcs_ccflags := -mhard-float -maltivec
- endif
- 
-+ifdef CONFIG_ARM64
-+calcs_rcflags := -mgeneral-regs-only
-+endif
-+
- ifdef CONFIG_CC_IS_GCC
- ifeq ($(call cc-ifversion, -lt, 0701, y), y)
- IS_OLD_GCC = 1
-@@ -53,6 +57,9 @@ endif
- CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calcs.o := $(calcs_ccflags)
- CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calc_auto.o := $(calcs_ccflags)
- CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calc_math.o := $(calcs_ccflags) -Wno-tautological-compare
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/calcs/dcn_calcs.o := $(calcs_rcflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/calcs/dcn_calc_auto.o := $(calcs_rcflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/calcs/dcn_calc_math.o := $(calcs_rcflags)
- 
- BW_CALCS = dce_calcs.o bw_fixed.o custom_float.o
- 
-diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
-index 6874276bb..f7a8c5e9c 100644
---- a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
-+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile
-@@ -93,6 +93,13 @@ ifdef CONFIG_PPC64
- CFLAGS_$(AMDDALPATH)/dc/clk_mgr/dcn21/rn_clk_mgr.o := $(call cc-option,-mno-gnu-attribute)
- endif
- 
-+# prevent build errors:
-+# ...: '-mgeneral-regs-only' is incompatible with the use of floating-point types
-+# this file is unused on arm64, just like on ppc64
-+ifdef CONFIG_ARM64
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/clk_mgr/dcn21/rn_clk_mgr.o := -mgeneral-regs-only
-+endif
-+
- AMD_DAL_CLK_MGR_DCN21 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn21/,$(CLK_MGR_DCN21))
- 
- AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN21)
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/Makefile b/drivers/gpu/drm/amd/display/dc/dcn10/Makefile
-index 62ad1a11b..733e6e6e4 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn10/Makefile
-+++ b/drivers/gpu/drm/amd/display/dc/dcn10/Makefile
-@@ -31,4 +31,11 @@ DCN10 = dcn10_init.o dcn10_resource.o dcn10_ipp.o dcn10_hw_sequencer.o \
- 
- AMD_DAL_DCN10 = $(addprefix $(AMDDALPATH)/dc/dcn10/,$(DCN10))
- 
-+# fix:
-+# ...: '-mgeneral-regs-only' is incompatible with the use of floating-point types
-+# aarch64 does not support soft-float, so use hard-float and handle this in code
-+ifdef CONFIG_ARM64
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dcn10/dcn10_resource.o := -mgeneral-regs-only
-+endif
-+
- AMD_DISPLAY_FILES += $(AMD_DAL_DCN10)
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
-index 8939541ad..1abd81e17 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
-+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
-@@ -1339,6 +1339,47 @@ static uint32_t read_pipe_fuses(struct dc_context *ctx)
- 	return value;
- }
- 
-+/*
-+ * Some architectures don't support soft-float (e.g. aarch64), on those
-+ * this function has to be called with hardfloat enabled, make sure not
-+ * to inline it so whatever fp stuff is done stays inside
-+ */
-+static noinline void dcn10_resource_construct_fp(
-+	struct dc *dc)
-+{
-+	if (dc->ctx->dce_version == DCN_VERSION_1_01) {
-+		struct dcn_soc_bounding_box *dcn_soc = dc->dcn_soc;
-+		struct dcn_ip_params *dcn_ip = dc->dcn_ip;
-+		struct display_mode_lib *dml = &dc->dml;
-+
-+		dml->ip.max_num_dpp = 3;
-+		/* TODO how to handle 23.84? */
-+		dcn_soc->dram_clock_change_latency = 23;
-+		dcn_ip->max_num_dpp = 3;
-+	}
-+	if (ASICREV_IS_RV1_F0(dc->ctx->asic_id.hw_internal_rev)) {
-+		dc->dcn_soc->urgent_latency = 3;
-+		dc->debug.disable_dmcu = true;
-+		dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = 41.60f;
-+	}
-+
-+
-+	dc->dcn_soc->number_of_channels = dc->ctx->asic_id.vram_width / ddr4_dram_width;
-+	ASSERT(dc->dcn_soc->number_of_channels < 3);
-+	if (dc->dcn_soc->number_of_channels == 0)/*old sbios bug*/
-+		dc->dcn_soc->number_of_channels = 2;
-+
-+	if (dc->dcn_soc->number_of_channels == 1) {
-+		dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = 19.2f;
-+		dc->dcn_soc->fabric_and_dram_bandwidth_vnom0p8 = 17.066f;
-+		dc->dcn_soc->fabric_and_dram_bandwidth_vmid0p72 = 14.933f;
-+		dc->dcn_soc->fabric_and_dram_bandwidth_vmin0p65 = 12.8f;
-+		if (ASICREV_IS_RV1_F0(dc->ctx->asic_id.hw_internal_rev)) {
-+			dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = 20.80f;
-+		}
-+	}
-+}
-+
- static bool dcn10_resource_construct(
- 	uint8_t num_virtual_links,
- 	struct dc *dc,
-@@ -1490,37 +1531,15 @@ static bool dcn10_resource_construct(
- 	memcpy(dc->dcn_ip, &dcn10_ip_defaults, sizeof(dcn10_ip_defaults));
- 	memcpy(dc->dcn_soc, &dcn10_soc_defaults, sizeof(dcn10_soc_defaults));
- 
--	if (dc->ctx->dce_version == DCN_VERSION_1_01) {
--		struct dcn_soc_bounding_box *dcn_soc = dc->dcn_soc;
--		struct dcn_ip_params *dcn_ip = dc->dcn_ip;
--		struct display_mode_lib *dml = &dc->dml;
--
--		dml->ip.max_num_dpp = 3;
--		/* TODO how to handle 23.84? */
--		dcn_soc->dram_clock_change_latency = 23;
--		dcn_ip->max_num_dpp = 3;
--	}
--	if (ASICREV_IS_RV1_F0(dc->ctx->asic_id.hw_internal_rev)) {
--		dc->dcn_soc->urgent_latency = 3;
--		dc->debug.disable_dmcu = true;
--		dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = 41.60f;
--	}
--
--
--	dc->dcn_soc->number_of_channels = dc->ctx->asic_id.vram_width / ddr4_dram_width;
--	ASSERT(dc->dcn_soc->number_of_channels < 3);
--	if (dc->dcn_soc->number_of_channels == 0)/*old sbios bug*/
--		dc->dcn_soc->number_of_channels = 2;
--
--	if (dc->dcn_soc->number_of_channels == 1) {
--		dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = 19.2f;
--		dc->dcn_soc->fabric_and_dram_bandwidth_vnom0p8 = 17.066f;
--		dc->dcn_soc->fabric_and_dram_bandwidth_vmid0p72 = 14.933f;
--		dc->dcn_soc->fabric_and_dram_bandwidth_vmin0p65 = 12.8f;
--		if (ASICREV_IS_RV1_F0(dc->ctx->asic_id.hw_internal_rev)) {
--			dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = 20.80f;
--		}
--	}
-+#if defined(CONFIG_ARM64)
-+	/* Aarch64 does not support -msoft-float/-mfloat-abi=soft */
-+	DC_FP_START();
-+	dcn10_resource_construct_fp(dc);
-+	DC_FP_END();
-+#else
-+	/* Other architectures we build for build this with soft-float */
-+	dcn10_resource_construct_fp(dc);
-+#endif
- 
- 	pool->base.pp_smu = dcn10_pp_smu_create(ctx);
- 
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
-index 5fcaf7833..624cb1341 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
-+++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
-@@ -17,6 +17,10 @@ ifdef CONFIG_PPC64
- CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -maltivec
- endif
- 
-+ifdef CONFIG_ARM64
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mgeneral-regs-only
-+endif
-+
- ifdef CONFIG_CC_IS_GCC
- ifeq ($(call cc-ifversion, -lt, 0701, y), y)
- IS_OLD_GCC = 1
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
-index 07684d3e3..51a2f3d4c 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
-+++ b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile
-@@ -13,6 +13,10 @@ ifdef CONFIG_PPC64
- CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -maltivec
- endif
- 
-+ifdef CONFIG_ARM64
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mgeneral-regs-only
-+endif
-+
- ifdef CONFIG_CC_IS_GCC
- ifeq ($(call cc-ifversion, -lt, 0701, y), y)
- IS_OLD_GCC = 1
-diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile
-index 417331438..dbc7e2abe 100644
---- a/drivers/gpu/drm/amd/display/dc/dml/Makefile
-+++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile
-@@ -33,6 +33,10 @@ ifdef CONFIG_PPC64
- dml_ccflags := -mhard-float -maltivec
- endif
- 
-+ifdef CONFIG_ARM64
-+dml_rcflags := -mgeneral-regs-only
-+endif
-+
- ifdef CONFIG_CC_IS_GCC
- ifeq ($(call cc-ifversion, -lt, 0701, y), y)
- IS_OLD_GCC = 1
-@@ -60,6 +64,13 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_ccflags)
- CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_ccflags)
- CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags)
- CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_ccflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_rcflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_rcflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_rcflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_rcflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_rcflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_rcflags)
- endif
- ifdef CONFIG_DRM_AMD_DC_DCN3_0
- CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) -Wframe-larger-than=2048
-@@ -67,6 +78,8 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags)
- endif
- CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags)
- CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_rcflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_rcflags)
- 
- DML = display_mode_lib.o display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \
- 
-diff --git a/drivers/gpu/drm/amd/display/dc/dsc/Makefile b/drivers/gpu/drm/amd/display/dc/dsc/Makefile
-index ea29cf95d..f2624a115 100644
---- a/drivers/gpu/drm/amd/display/dc/dsc/Makefile
-+++ b/drivers/gpu/drm/amd/display/dc/dsc/Makefile
-@@ -10,6 +10,10 @@ ifdef CONFIG_PPC64
- dsc_ccflags := -mhard-float -maltivec
- endif
- 
-+ifdef CONFIG_ARM64
-+dsc_rcflags := -mgeneral-regs-only
-+endif
-+
- ifdef CONFIG_CC_IS_GCC
- ifeq ($(call cc-ifversion, -lt, 0701, y), y)
- IS_OLD_GCC = 1
-@@ -28,6 +32,7 @@ endif
- endif
- 
- CFLAGS_$(AMDDALPATH)/dc/dsc/rc_calc.o := $(dsc_ccflags)
-+CFLAGS_REMOVE_$(AMDDALPATH)/dc/dsc/rc_calc.o := $(dsc_rcflags)
- 
- DSC = dc_dsc.o rc_calc.o rc_calc_dpi.o
- 
-diff --git a/drivers/gpu/drm/amd/display/dc/os_types.h b/drivers/gpu/drm/amd/display/dc/os_types.h
-index c3bbfe397..330acaaed 100644
---- a/drivers/gpu/drm/amd/display/dc/os_types.h
-+++ b/drivers/gpu/drm/amd/display/dc/os_types.h
-@@ -55,6 +55,10 @@
- #include <asm/fpu/api.h>
- #define DC_FP_START() kernel_fpu_begin()
- #define DC_FP_END() kernel_fpu_end()
-+#elif defined(CONFIG_ARM64)
-+#include <asm/neon.h>
-+#define DC_FP_START() kernel_neon_begin()
-+#define DC_FP_END() kernel_neon_end()
- #elif defined(CONFIG_PPC64)
- #include <asm/switch_to.h>
- #include <asm/cputable.h>
diff --git a/srcpkgs/linux5.9/patches/ppc-vas-on-4k.patch b/srcpkgs/linux5.9/patches/ppc-vas-on-4k.patch
deleted file mode 100644
index 1483f2c3917d..000000000000
--- a/srcpkgs/linux5.9/patches/ppc-vas-on-4k.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig
-index 938803eab0ad..40c81b358004 100644
---- a/arch/powerpc/platforms/powernv/Kconfig
-+++ b/arch/powerpc/platforms/powernv/Kconfig
-@@ -35,7 +35,7 @@ config PPC_MEMTRACE
- 
- config PPC_VAS
- 	bool "IBM Virtual Accelerator Switchboard (VAS)"
--	depends on PPC_POWERNV && PPC_64K_PAGES
-+	depends on PPC_POWERNV
- 	default y
- 	help
- 	  This enables support for IBM Virtual Accelerator Switchboard (VAS).
-diff --git a/arch/powerpc/platforms/powernv/vas.c b/arch/powerpc/platforms/powernv/vas.c
-index 598e4cd563fb..d81e55de6db4 100644
---- a/arch/powerpc/platforms/powernv/vas.c
-+++ b/arch/powerpc/platforms/powernv/vas.c
-@@ -70,7 +70,7 @@ static int init_vas_instance(struct platform_device *pdev)
- 		return -ENODEV;
- 	}
- 
--	if (pdev->num_resources != 4) {
-+	if (pdev->num_resources < 4) {
- 		pr_err("Unexpected DT configuration for [%s, %d]\n",
- 				pdev->name, vasid);
- 		return -ENODEV;
diff --git a/srcpkgs/linux5.9/patches/ppc64-be-elfv2.patch b/srcpkgs/linux5.9/patches/ppc64-be-elfv2.patch
deleted file mode 100644
index dde27580dc9b..000000000000
--- a/srcpkgs/linux5.9/patches/ppc64-be-elfv2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-This makes the Linux kernel build as ELFv2 on big endian ppc64. The upstream
-doesn't seem to be interested in this but it's a small patch that is unlikely
-to break/easy to remake and in worst case can always be ditched.
-
-Using ELFv2 has some potential performance benefits and is already always used
-on little endian. It requires a relatively modern toolchain, which we already
-have.
-
-Ping q66 if it does not apply.
-
---- a/arch/powerpc/Makefile	2020-01-05 14:40:50.395763093 +0100
-+++ b/arch/powerpc/Makefile	2020-01-05 14:48:39.025251092 +0100
-@@ -92,10 +92,8 @@
- 
- ifdef CONFIG_PPC64
- ifndef CONFIG_CC_IS_CLANG
--cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mabi=elfv1)
--cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mcall-aixdesc)
--aflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mabi=elfv1)
--aflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -mabi=elfv2
-+cflags-y    += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc))
-+aflags-y    += $(call cc-option,-mabi=elfv2,$(call cc-option,-mabi=elfv1))
- endif
- endif
- 
-@@ -144,14 +142,8 @@
- 
- CFLAGS-$(CONFIG_PPC64)	:= $(call cc-option,-mtraceback=no)
- ifndef CONFIG_CC_IS_CLANG
--ifdef CONFIG_CPU_LITTLE_ENDIAN
- CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc))
--AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2)
--else
--CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv1)
--CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcall-aixdesc)
--AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv1)
--endif
-+AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2,$(call cc-option,-mabi=elfv1))
- endif
- CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,$(call cc-option,-mminimal-toc))
- CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mno-pointers-to-nested-functions)
-
---- a/arch/powerpc/boot/Makefile
-+++ b/arch/powerpc/boot/Makefile
-@@ -48,8 +48,8 @@ ifdef CONFIG_CPU_BIG_ENDIAN
- BOOTCFLAGS	+= -mbig-endian
- else
- BOOTCFLAGS	+= -mlittle-endian
--BOOTCFLAGS	+= $(call cc-option,-mabi=elfv2)
- endif
-+BOOTCFLAGS	+= $(call cc-option,-mabi=elfv2)
- 
- BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
- 
---- a/drivers/crypto/vmx/Makefile	2020-01-01 10:56:10.560965046 +0100
-+++ b/drivers/crypto/vmx/Makefile	2020-01-01 10:57:05.189968856 +0100
-@@ -5,7 +5,7 @@
- ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
- override flavour := linux-ppc64le
- else
--override flavour := linux-ppc64
-+override flavour := linux-ppc64v2
- endif
- 
- quiet_cmd_perl = PERL $@
-
---- a/drivers/crypto/vmx/ppc-xlate.pl
-+++ b/drivers/crypto/vmx/ppc-xlate.pl
-@@ -40,7 +40,7 @@ my $globl = sub {
- };
- my $text = sub {
-     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
--    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
-+    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
-     $ret;
- };
- my $machine = sub {
-@@ -142,7 +142,7 @@ my $vmr = sub {
- 
- # Some ABIs specify vrsave, special-purpose register #256, as reserved
- # for system use.
--my $no_vrsave = ($flavour =~ /linux-ppc64le/);
-+my $no_vrsave = ($flavour =~ /linux-ppc64(le|v2)/);
- my $mtspr = sub {
-     my ($f,$idx,$ra) = @_;
-     if ($idx == 256 && $no_vrsave) {
diff --git a/srcpkgs/linux5.9/patches/ppcle-broken-vdso.patch b/srcpkgs/linux5.9/patches/ppcle-broken-vdso.patch
deleted file mode 100644
index 38563abaf167..000000000000
--- a/srcpkgs/linux5.9/patches/ppcle-broken-vdso.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Disable vDSOs which are broken on 32 bit LE.
-
-Source: @eerykitty
-
-diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso32/vdso32.lds.S
-index ce3e7f3e5..7600f9c11 100644
---- a/arch/powerpc/kernel/vdso32/vdso32.lds.S
-+++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S
-@@ -144,7 +144,7 @@ VERSION
-     __kernel_datapage_offset;
-
-     __kernel_get_syscall_map;
--#ifndef CONFIG_PPC_BOOK3S_601
-+#if !defined(__LITTLE_ENDIAN__) && !defined(CONFIG_PPC_BOOK3S_601)
-     __kernel_gettimeofday;
-     __kernel_clock_gettime;
-     __kernel_clock_getres;
diff --git a/srcpkgs/linux5.9/patches/ppcle-enable.patch b/srcpkgs/linux5.9/patches/ppcle-enable.patch
deleted file mode 100644
index c9f0567d5c6b..000000000000
--- a/srcpkgs/linux5.9/patches/ppcle-enable.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-These are experimental fixes for running 32-bit little endian binaries on
-Linux/ppc64le. While this may seem pointless, it does work, does not break
-anything, and may allow enablement of things we couldn't do before (e.g.
-support for box86 and thus reasonably fast emulation of 32-bit x86 games).
-
-The first part is a signal handler fix, the second part enables the 32-bit
-VDSO by removing the ppc32/big endian restriction.
-
-Source: @eerykitty
-
---- a/arch/powerpc/kernel/signal_32.c
-+++ b/arch/powerpc/kernel/signal_32.c
-@@ -1427,8 +1427,9 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset,
- 	regs->gpr[3] = ksig->sig;
- 	regs->gpr[4] = (unsigned long) sc;
- 	regs->nip = (unsigned long) (unsigned long)ksig->ka.sa.sa_handler;
--	/* enter the signal handler in big-endian mode */
-+	/* enter the signal handler in native-endian mode */
- 	regs->msr &= ~MSR_LE;
-+	regs->msr |= (MSR_KERNEL & MSR_LE);
- 	return 0;
- 
- badframe:
---- a/arch/powerpc/platforms/Kconfig.cputype
-+++ b/arch/powerpc/platforms/Kconfig.cputype
-@@ -484,7 +484,6 @@ endmenu
- 
- config VDSO32
- 	def_bool y
--	depends on PPC32 || CPU_BIG_ENDIAN
- 	help
- 	  This symbol controls whether we build the 32-bit VDSO. We obviously
- 	  want to do that if we're building a 32-bit kernel. If we're building
diff --git a/srcpkgs/linux5.9/patches/ppcle-ll-compat-sys.patch b/srcpkgs/linux5.9/patches/ppcle-ll-compat-sys.patch
deleted file mode 100644
index 19b9530a51d7..000000000000
--- a/srcpkgs/linux5.9/patches/ppcle-ll-compat-sys.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 98014e4b27063ed74313878233e91b7b52b2a031 Mon Sep 17 00:00:00 2001
-From: Will Springer <skirmisher@protonmail.com>
-Date: Tue, 9 Jun 2020 02:11:36 -0700
-Subject: [PATCH] powerpc/compat32: swap hi/lo parts of 64-bit syscall args on
- 32LE
-
-This allows compat_sys calls with 64-bit args to function correctly
-when called by ppcle userlands on ppc64le.
-
-Tested with `file /bin/bash` (pread64) and `truncate -s 5G test` (ftruncate64).
----
- arch/powerpc/kernel/sys_ppc32.c | 49 +++++++++++++++++++--------------
- 1 file changed, 28 insertions(+), 21 deletions(-)
-
-diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
-index d36c6391eaf5..16ff0399a257 100644
---- a/arch/powerpc/kernel/sys_ppc32.c
-+++ b/arch/powerpc/kernel/sys_ppc32.c
-@@ -59,57 +59,64 @@ unsigned long compat_sys_mmap2(unsigned long addr, size_t len,
- /* 
-  * long long munging:
-  * The 32 bit ABI passes long longs in an odd even register pair.
-+ * High and low parts are swapped depending on endian mode,
-+ * so define a macro (similar to mips linux32) to handle that.
-  */
-+#ifdef __LITTLE_ENDIAN__
-+#define merge_64(low, high) ((u64)high << 32) | low
-+#else
-+#define merge_64(high, low) ((u64)high << 32) | low
-+#endif
- 
- compat_ssize_t compat_sys_pread64(unsigned int fd, char __user *ubuf, compat_size_t count,
--			     u32 reg6, u32 poshi, u32 poslo)
-+			     u32 reg6, u32 pos1, u32 pos2)
- {
--	return ksys_pread64(fd, ubuf, count, ((loff_t)poshi << 32) | poslo);
-+	return ksys_pread64(fd, ubuf, count, merge_64(pos1, pos2));
- }
- 
- compat_ssize_t compat_sys_pwrite64(unsigned int fd, const char __user *ubuf, compat_size_t count,
--			      u32 reg6, u32 poshi, u32 poslo)
-+			      u32 reg6, u32 pos1, u32 pos2)
- {
--	return ksys_pwrite64(fd, ubuf, count, ((loff_t)poshi << 32) | poslo);
-+	return ksys_pwrite64(fd, ubuf, count, merge_64(pos1, pos2));
- }
- 
--compat_ssize_t compat_sys_readahead(int fd, u32 r4, u32 offhi, u32 offlo, u32 count)
-+compat_ssize_t compat_sys_readahead(int fd, u32 r4, u32 offset1, u32 offset2, u32 count)
- {
--	return ksys_readahead(fd, ((loff_t)offhi << 32) | offlo, count);
-+	return ksys_readahead(fd, merge_64(offset1, offset2), count);
- }
- 
- asmlinkage int compat_sys_truncate64(const char __user * path, u32 reg4,
--				unsigned long high, unsigned long low)
-+				unsigned long len1, unsigned long len2)
- {
--	return ksys_truncate(path, (high << 32) | low);
-+	return ksys_truncate(path, merge_64(len1, len2));
- }
- 
--asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo,
--				     u32 lenhi, u32 lenlo)
-+asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offset1, u32 offset2,
-+				     u32 len1, u32 len2)
- {
--	return ksys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo,
--			     ((loff_t)lenhi << 32) | lenlo);
-+	return ksys_fallocate(fd, mode, ((loff_t)offset1 << 32) | offset2,
-+			     merge_64(len1, len2));
- }
- 
--asmlinkage int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long high,
--				 unsigned long low)
-+asmlinkage int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long len1,
-+				 unsigned long len2)
- {
--	return ksys_ftruncate(fd, (high << 32) | low);
-+	return ksys_ftruncate(fd, merge_64(len1, len2));
- }
- 
--long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low,
-+long ppc32_fadvise64(int fd, u32 unused, u32 offset1, u32 offset2,
- 		     size_t len, int advice)
- {
--	return ksys_fadvise64_64(fd, (u64)offset_high << 32 | offset_low, len,
-+	return ksys_fadvise64_64(fd, merge_64(offset1, offset2), len,
- 				 advice);
- }
- 
- asmlinkage long compat_sys_sync_file_range2(int fd, unsigned int flags,
--				   unsigned offset_hi, unsigned offset_lo,
--				   unsigned nbytes_hi, unsigned nbytes_lo)
-+				   unsigned offset1, unsigned offset2,
-+				   unsigned nbytes1, unsigned nbytes2)
- {
--	loff_t offset = ((loff_t)offset_hi << 32) | offset_lo;
--	loff_t nbytes = ((loff_t)nbytes_hi << 32) | nbytes_lo;
-+	loff_t offset = merge_64(offset1, offset2);
-+	loff_t nbytes = merge_64(nbytes1, nbytes2);
- 
- 	return ksys_sync_file_range(fd, offset, nbytes, flags);
- }
--- 
-2.26.2
-
diff --git a/srcpkgs/linux5.9/template b/srcpkgs/linux5.9/template
deleted file mode 100644
index b17e8da33f80..000000000000
--- a/srcpkgs/linux5.9/template
+++ /dev/null
@@ -1,339 +0,0 @@
-# Template file for 'linux5.9'
-pkgname=linux5.9
-version=5.9.16
-revision=1
-wrksrc="linux-${version}"
-short_desc="Linux kernel and modules (${version%.*} series)"
-maintainer="Érico Nogueira <ericonr@disroot.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=b0d7abae88e5f91893627c645e680a95c818defd1b4fcaf3e2afb4b2b6b4ab86
-python_version=3
-patch_args="-Np1"
-
-# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
-archs="x86_64* i686* ppc* aarch64*"
-
-nodebug=yes  # -dbg package is generated below manually
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-preserve=yes
-
-hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
-
-_kernver="${version}_${revision}"
-triggers="kernel-hooks"
-kernel_hooks_version="${_kernver}"
-
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /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
-
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (allmodconfig).
-	local arch subarch
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=i386;;
-		x86_64*) arch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc64le*) arch=powerpc; subarch=ppc64le;;
-		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
-		mips*) arch=mips;;
-	esac
-
-	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
-		make ${makejobs} ARCH=$arch ${_cross} oldconfig
-	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_cross} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_cross} oldconfig
-	else
-		msg_normal "Defaulting to 'allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_cross} allmodconfig
-	fi
-	# 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 _args
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _args="bzImage modules"; arch=i386;;
-		x86_64*) _args="bzImage modules"; arch=x86_64;;
-		arm*) _args="zImage modules dtbs"; arch=arm;;
-		aarch64*) _args="Image modules dtbs"; arch=arm64;;
-		ppc*) _args="zImage modules"; arch=powerpc;;
-		mips*) _args="uImage modules dtbs"; arch=mips;;
-	esac
-	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
-}
-
-do_install() {
-	local arch subarch _args hdrdest
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) arch=x86; subarch=i386;;
-		x86_64*) arch=x86; subarch=x86_64;;
-		arm*) arch=arm;;
-		aarch64*) arch=arm64;;
-		ppc*) arch=powerpc;;
-		mips*) arch=mips;;
-	esac
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} ${_cross} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	vinstall .config 644 boot config-${_kernver}
-	vinstall System.map 644 boot System.map-${_kernver}
-
-	case "$arch" in
-		x86)
-			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
-			;;
-		arm)
-			vinstall arch/arm/boot/zImage 644 boot
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
-			;;
-		arm64)
-			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
-			;;
-		powerpc)
-			# zImage on powerpc is useless as it won't load initramfs
-			# raw vmlinux is huge, and this is nostrip, so do it manually
-			vinstall vmlinux 644 boot vmlinux-${_kernver}
-			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
-			;;
-		mips)
-			vinstall arch/mips/boot/uImage.bin 644 boot uImage-${_kernver}
-			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
-			;;
-	esac
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	for file in $(find . -name Kconfig\*); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
-		mkdir -p ${hdrdest}/$(dirname $file)
-		install -Dm644 $file ${hdrdest}/${file}
-	done
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic clocksource config crypto drm generated linux vdso \
-		math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/${arch}
-	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
-
-	# Remove helper binaries built for host,
-	# if generated files from the scripts/ directory need to be included,
-	# they need to be copied to ${hdrdest} before this step
-	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} ${_cross} _mrproper_scripts
-		# remove host specific objects as well
-		find scripts -name '*.o' -delete
-	fi
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-	mkdir -p ${hdrdest}/security/selinux
-	cp -a security/selinux/include ${hdrdest}/security/selinux
-	mkdir -p ${hdrdest}/tools/include
-	cp -a tools/include/tools ${hdrdest}/tools/include
-
-	mkdir -p ${hdrdest}/arch/${arch}/kernel
-	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
-	if [ "$subarch" = "i386" ]; then
-		mkdir -p ${hdrdest}/arch/x86
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	if [ "$arch" = "x86" ]; then
-		mkdir -p ${hdrdest}/arch/x86/kernel
-		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-	elif [ "$arch" = "arm64" ]; then
-		mkdir -p ${hdrdest}/arch/arm64/kernel
-		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
-	fi
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs/libxfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
-
-	# Add objtool binary, needed to build external modules with dkms
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*)
-			mkdir -p ${hdrdest}/tools/objtool
-			cp tools/objtool/objtool ${hdrdest}/tools/objtool
-			;;
-	esac
-
-	# Remove unneeded architectures
-	case "$arch" in
-		i386|x86_64) _args="arm* m* p*";;
-		arm|arm64) _args="x86* m* p*";;
-		powerpc) _args="arm* m* x86* parisc";;
-		mips) _args="arm* x86* p*";;
-	esac
-	for arch in alpha avr32 blackfin cris frv h8300 \
-		ia64 s* um v850 xtensa ${_args}; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
-	mkdir -p ${hdrdest}/arch/x86/ras
-	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
-
-	# Extract debugging symbols and compress modules
-	msg_normal "$pkgver: extracting debug info and compressing modules, please wait...\n"
-	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
-	(
-	cd ${DESTDIR}
-	export DESTDIR
-	find ./ -name '*.ko' -print0 | \
-		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
-	)
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-linux5.9-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noshlibprovides=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}
-linux5.9-dbg_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	noshlibprovides=yes
-	repository=debug
-	short_desc+=" - debugging symbols"
-	pkg_install() {
-		vmove usr/lib/debug
-	}
-}

From 9f326349e9e1c705c0a1dcfd810086e29b28eb27 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sun, 7 Feb 2021 10:07:59 +0000
Subject: [PATCH 1507/3458] ImageMagick: update to 6.9.11-61.

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

diff --git a/common/shlibs b/common/shlibs
index 37511cdc2f1c..70596feb7698 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -338,8 +338,8 @@ libgsf-1.so.114 libgsf-1.14.11_1
 libMagickCore-7.Q16HDRI.so.8 libmagick-7.0.10.37_1
 libMagickWand-7.Q16HDRI.so.8 libmagick-7.0.10.37_1
 libMagick++-7.Q16HDRI.so.4 libmagick-7.0.9.1_1
-libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1
-libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1
+libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
+libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1
 libltdl.so.7 libltdl-2.2.6_1
 libpoppler.so.102 libpoppler102-20.09.0_1
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index d55964fb7bde..578d3843b2f8 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.11
-_patchver=57
+_patchver=61
 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=bfa17b29fad92a859381d5e896ebb95f5212202fa345a534c70ba5150f94f896
+checksum=8621f619c5c9ce1bf7260c8fc8fa01a7414079cf7b0777a9b0a048a22c85647a
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
@@ -40,11 +40,6 @@ pre_configure() {
 	autoreconf -if
 }
 
-post_configure() {
-	sed -i '/VERSION/s/6\.9A/6.99/g' version.sh PerlMagick/Makefile.PL \
-		PerlMagick/*/Makefile.PL PerlMagick/quantum/quantum.pm
-}
-
 do_check() {
 	# Disable failing checks
 	sed -i '/validate-formats/d' Makefile

From 640968a64d400c93e206806df989f5973de6a019 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sun, 7 Feb 2021 10:09:37 +0000
Subject: [PATCH 1508/3458] psiconv: rebuild for ImageMagick-6.9.11-61

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

diff --git a/srcpkgs/psiconv/template b/srcpkgs/psiconv/template
index 6fdeb09ed74b..1e574d489dc3 100644
--- a/srcpkgs/psiconv/template
+++ b/srcpkgs/psiconv/template
@@ -1,7 +1,7 @@
 # Template file for 'psiconv'
 pkgname=psiconv
 version=0.9.9
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-xhtml-docs"
 hostmakedepends="pkg-config libmagick6-devel"

From 296060a99159312e083c0ef068c0c90c50dbcfb3 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Sun, 7 Feb 2021 10:10:05 +0000
Subject: [PATCH 1509/3458] ripright: rebuild for ImageMagick-6.9.11-61

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

diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template
index 09ec16a15d5d..d44f96166e18 100644
--- a/srcpkgs/ripright/template
+++ b/srcpkgs/ripright/template
@@ -1,7 +1,7 @@
 # Template file for 'ripright'
 pkgname=ripright
 version=0.11
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel"

From e798d27ce92081d585216e0e50c51753378e7d94 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 21:38:18 +0100
Subject: [PATCH 1510/3458] mesa: fix race condition with git_sha1.h

---
 srcpkgs/mesa/patches/gen-git_sha1_h.patch | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/mesa/patches/gen-git_sha1_h.patch

diff --git a/srcpkgs/mesa/patches/gen-git_sha1_h.patch b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
new file mode 100644
index 000000000000..8228101b2e10
--- /dev/null
+++ b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
@@ -0,0 +1,33 @@
+See: https://github.com/mesa3d/mesa/commit/434da21a7c81acbe03f0e1621e80904313c0b05c
+
+--- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
++++ src/freedreno/common/meson.build	2021-02-12 21:32:57.108300772 +0100
+@@ -27,6 +27,7 @@
+     'freedreno_uuid.c',
+     'freedreno_uuid.h',
+     'freedreno_guardband.h',
++    sha1_h,
+   ],
+   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+   c_args : [no_override_init_args],
+--- src/gallium/frontends/lavapipe/meson.build	2021-01-29 19:33:19.784871800 +0100
++++ src/gallium/frontends/lavapipe/meson.build	2021-02-12 21:33:41.406352915 +0100
+@@ -57,7 +57,7 @@
+ 
+ liblavapipe_st = static_library(
+   'lavapipe_st',
+-  [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
++  [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h],
+   link_with : [ libvulkan_wsi ],
+   c_args : [ lvp_flags ],
+   gnu_symbol_visibility : 'hidden',
+--- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
++++ src/intel/common/meson.build	2021-02-12 21:35:09.226438768 +0100
+@@ -39,6 +39,7 @@
+   'gen_sample_positions.h',
+   'gen_uuid.c',
+   'gen_uuid.h',
++  sha1_h,
+ )
+ 
+ libintel_common = static_library(

From 1527b7bd178d2ba1a9164482c52cdb1e7196f516 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Feb 2021 22:35:51 +0100
Subject: [PATCH 1511/3458] New package: libiberty-devel-20210106

---
 srcpkgs/libiberty-devel/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/libiberty-devel/template

diff --git a/srcpkgs/libiberty-devel/template b/srcpkgs/libiberty-devel/template
new file mode 100644
index 000000000000..1a4e1ca3d594
--- /dev/null
+++ b/srcpkgs/libiberty-devel/template
@@ -0,0 +1,17 @@
+# Template file for 'libiberty-devel'
+pkgname=libiberty-devel
+version=20210106
+revision=1
+wrksrc=libiberty-${version}
+build_wrksrc=libiberty
+build_style=gnu-configure
+configure_args="--disable-multilib --enable-install-libiberty"
+short_desc="Library of utility functions used by GNU programs"
+maintainer="q66 <daniel@octaforge.org>"
+license="GPL-3.0-or-later"
+homepage="http://gcc.gnu.org/"
+distfiles="http://deb.debian.org/debian/pool/main/libi/libiberty/libiberty_${version}.orig.tar.xz"
+checksum=9df153d69914c0f5a9145e0abbb248e72feebab6777c712a30f1c3b8c19047d4
+conflicts="binutils-devel<=2.35.1_3"
+
+CFLAGS="-fPIC"

From d9297639ba3076d74f904590e9ff4916f5ec0da9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Feb 2021 22:40:42 +0100
Subject: [PATCH 1512/3458] binutils: disable libiberty installation

---
 srcpkgs/binutils/template | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 5b736c2e3a24..8a0b3f1efff1 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.35.1
-revision=3
+revision=4
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -36,7 +36,7 @@ do_configure() {
 	if [ "$CHROOT_READY" ]; then
 		conf+=" --with-debuginfod"
 	else
-		conf+=" --without-debuginfod"
+		conf+=" --without-debuginfod --disable-install-libbfd"
 	fi
 	if [ "$CROSS_BUILD" ]; then
 		# we don't want --with-sysroot=${XBPS_CROSS_BASE} like gnu-configure
@@ -85,7 +85,6 @@ do_configure() {
 		--enable-deterministic-archives \
 		--enable-64-bit-bfd \
 		--enable-ld=default \
-		--enable-install-libiberty \
 		--with-system-zlib \
 		--with-mmap \
 		--with-pic \
@@ -116,13 +115,15 @@ do_install() {
 	rm -f ${DESTDIR}/usr/bin/ld
 	ln -sfr ${DESTDIR}/usr/bin/ld.bfd ${DESTDIR}/usr/bin/ld
 
-	# Remove these symlinks, they are not ABI stable.
-	# Programs should compile static to the .a file.
-	rm -f ${DESTDIR}/usr/lib/lib{bfd,opcodes}.so
-	echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" \
-		>${DESTDIR}/usr/lib/libbfd.so
-	echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" \
-		>${DESTDIR}/usr/lib/libopcodes.so
+	if [ "$CHROOT_READY" ]; then
+		# Remove these symlinks, they are not ABI stable.
+		# Programs should compile static to the .a file.
+		rm -f ${DESTDIR}/usr/lib/lib{bfd,opcodes}.so
+		echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" \
+			>${DESTDIR}/usr/lib/libbfd.so
+		echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" \
+			>${DESTDIR}/usr/lib/libopcodes.so
+	fi
 
 	# Remove useless manpages.
 	for f in dlltool nlmconv windres windmc; do
@@ -136,6 +137,9 @@ do_install() {
 
 binutils-devel_package() {
 	depends="zlib-devel"
+	if [ "$CHROOT_READY" ]; then
+		depends+=" libiberty-devel"
+	fi
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 6a1a90d557fca2ec7d293900a60f8bd4e946c8c5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Feb 2021 22:45:36 +0100
Subject: [PATCH 1513/3458] oprofile: need libiberty-devel in makedepends

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

diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template
index f14cdd3cdd2e..6625c363438a 100644
--- a/srcpkgs/oprofile/template
+++ b/srcpkgs/oprofile/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-makedepends="popt-devel binutils-devel"
+makedepends="popt-devel binutils-devel libiberty-devel"
 system_accounts="_oprofile"
 oprofile_homedir="/var/lib/oprofile"
 make_dirs="/var/lib/oprofile 0750 _oprofile _oprofile"

From 24f1d3340cd5494e73f8e7172df932bdb23febdd Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Feb 2021 23:03:19 +0100
Subject: [PATCH 1514/3458] binutils: just skip -devel for bootstrap

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

diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 8a0b3f1efff1..60174e5b6c3e 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -17,6 +17,7 @@ if [ "$CHROOT_READY" ]; then
 	makedepends+=" elfutils-devel"
 	checkdepends="bc"
 	depends="binutils-doc"
+	subpackages="binutils-devel binutils-doc"
 fi
 
 _get_triplet() {
@@ -136,10 +137,7 @@ do_install() {
 }
 
 binutils-devel_package() {
-	depends="zlib-devel"
-	if [ "$CHROOT_READY" ]; then
-		depends+=" libiberty-devel"
-	fi
+	depends="zlib-devel libiberty-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 65be8c6c77036f15b39df6ce427c2909d98ea010 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Feb 2021 23:09:57 +0100
Subject: [PATCH 1515/3458] binutils: fix subpackages without CHROOT_READY

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

diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 60174e5b6c3e..7a7966f440aa 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -3,6 +3,7 @@ pkgname=binutils
 version=2.35.1
 revision=4
 bootstrap=yes
+makedepends="zlib-devel"
 short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -11,13 +12,13 @@ distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
 patch_args="-Np1"
 
-makedepends="zlib-devel"
+subpackages="binutils-doc"
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="flex perl texinfo"
 	makedepends+=" elfutils-devel"
 	checkdepends="bc"
 	depends="binutils-doc"
-	subpackages="binutils-devel binutils-doc"
+	subpackages+=" binutils-devel"
 fi
 
 _get_triplet() {

From c04e611fc6e226423356ad0552ba3bf14cf41fe2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 12 Feb 2021 22:39:31 +0000
Subject: [PATCH 1516/3458] terragrunt: update to 0.28.4.

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

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index e2cce1be99c4..f907bacb02ec 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.28.2
+version=0.28.4
 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=e85e4c4d6d1641a12093af9d036e38d05f5c0ec6e768b9655d8d2f7a4ccadcfd
+checksum=8ad4fa6e9e9c075a8a04f76117a6ab05a062cd6fe0fd0ed1c23937c7ec272839
 
 post_install() {
 	vlicense LICENSE.txt

From dde7e04aa438e31d5294b22e1223d3757f372dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 00:03:09 +0100
Subject: [PATCH 1517/3458] kaccounts-integration: update to 20.12.2.

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

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index b01b00b41186..7be3543d950b 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=22d5879dff70075092748ae04575de7bd7df025eb9a9298bb39d7027601cbe07
+checksum=d2cd7db9a66fa60530db93be3de744166b13ba83ffc47f18e85b2a6dae3bfe96
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From 66895e488e246e99bfbec483570160fd82330f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 00:03:10 +0100
Subject: [PATCH 1518/3458] kaccounts-providers: update to 20.12.2.

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

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 4309601c6ee0..5909cbee76f3 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=78a32db7363b44dae0670f50c68febea6698f57ef3d676a745eb542e87c96fb8
+checksum=804905e0ccedf53ba9c334a4a488cffeaaa5ea5bf983949565a67f3be6a00508
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From f296277040dfdf5d3b42e8a222580113788861b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 00:03:11 +0100
Subject: [PATCH 1519/3458] kio-gdrive: update to 20.12.2.

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

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 390276a32162..8d345369230f 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=e07ef1431b2d9b7e12d9c09483c31f1f321351fc88177d1450d7b18c4640b02b
+checksum=758a8d2b61537a58a968b67ca5318ea70370bd04c2806c7baf7625abe1549c67

From 17ca1ae767378e8e3c713585a2cad931006c78bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 00:03:12 +0100
Subject: [PATCH 1520/3458] signon-kwallet-extension: update to 20.12.2.

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

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index b6d18130e123..a3f4183b88f0 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=4b762208b8d48c0d56b4605f701ebadc1daa59b16054c238a132f38a6b518854
+checksum=37f52bdd8f6378cd92beecf48bc42993839ac18c1d3f100a6ba1dc856c039979

From 366e50876363a0a3af1700b78df67c74793f8213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 00:03:13 +0100
Subject: [PATCH 1521/3458] marble5: update to 20.12.2.

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

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 1ab217abc561..94ecb8371e6c 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=20.12.1
+version=20.12.2
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=65c936ceefdd368494778e55a921f9d111e6fabab718b948f3f59ede5f446970
+checksum=420ddc73a34bd2ed4ac6c6bde3cd05c7ea2dc05f20b1b2457a167a54bae6f14d
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From 25d89e83962e190221c96da9651b313e4a8cc4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 13 Feb 2021 00:49:24 +0100
Subject: [PATCH 1522/3458] linssid: fix build w/ musl-1.2.2 (time64)

---
 srcpkgs/linssid/patches/time64.patch | 43 ++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 srcpkgs/linssid/patches/time64.patch

diff --git a/srcpkgs/linssid/patches/time64.patch b/srcpkgs/linssid/patches/time64.patch
new file mode 100644
index 000000000000..2fc66069d8f4
--- /dev/null
+++ b/srcpkgs/linssid/patches/time64.patch
@@ -0,0 +1,43 @@
+--- linssid-app/MainForm.cpp	2018-06-23 18:36:57.000000000 +0200
++++ linssid-app/MainForm.cpp	2021-02-13 00:46:29.112580143 +0100
+@@ -81,8 +81,8 @@
+     int cenChan; // center channel in 40/80/160 MHz bandwidths
+     string vendor;
+     bool firstPlot;
+-    long firstSeen;
+-    long lastSeen;
++    time_t firstSeen;
++    time_t lastSeen;
+     string netType;
+     QColor color;
+     QwtPlotCurve* pBandCurve;
+@@ -162,11 +162,11 @@
+ int MainForm::maxTableIndex; // holds the highest index pointer into cellData
+ int MainForm::numVendors;
+ int MainForm::maxVendorRecL;
+-long MainForm::runStartTime;
+-long MainForm::now; // absolute time of the block
++time_t MainForm::runStartTime;
++time_t MainForm::now; // absolute time of the block
+ pageBlockType pageBlock; // which section of page is data coming from
+ int MainForm::logDataState;
+-long MainForm::blockSampleTime; // time of the block relative to runStartTime
++time_t MainForm::blockSampleTime; // time of the block relative to runStartTime
+ bool MainForm::firstScan; // do we need to get sudo privileges?
+ 
+ string MainForm::chan24Freq[15] {
+--- linssid-app/MainForm.h	2018-06-23 18:34:52.000000000 +0200
++++ linssid-app/MainForm.h	2021-02-13 00:48:01.969756452 +0100
+@@ -86,9 +86,9 @@
+     static int maxTableIndex;
+     static int numVendors;
+     static int maxVendorRecL;
+-    static long runStartTime;
+-    static long blockSampleTime;
+-    static long now;
++    static time_t runStartTime;
++    static time_t blockSampleTime;
++    static time_t now;
+     static int logDataState;
+     static bool firstScan;
+     static string wlPrivacies[3];

From 47bb8b5d1262d764c155bad71a5c194af59da7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 13 Feb 2021 09:56:03 +0100
Subject: [PATCH 1523/3458] boinc: update to 7.16.16

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

diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 7ca8e16398f7..2b305f859216 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,6 +1,6 @@
 # Template file for 'boinc'
 pkgname=boinc
-version=7.16.14
+version=7.16.16
 revision=1
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
@@ -16,7 +16,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0-or-later"
 homepage="https://boinc.berkeley.edu/"
 distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
-checksum=c328399cc27109f94ee77aaf80406ed304c6be6c198391ff8e83f8400431fc78
+checksum=0d5656a9f8ed1048936a5764270848b892d63f27bdb863d0ace447f1eaae6002
 system_accounts="boinc"
 boinc_homedir="/var/lib/boinc"
 boinc_shell="/bin/bash"

From 0f8544952a7ff3c7a629511cc2eac93b7181e7f5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 13 Feb 2021 11:26:22 +0100
Subject: [PATCH 1524/3458] wine: update to 6.2.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index fff56aa12028..057c00088aee 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.1
+version=6.2
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 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="a92c24308c48b851b5dc22a1d35696a57311c447b31ec9fa543ec5b0aa73a149
- f4de54fe026b920191db6c5001cfd563503d0fa3e2b191315311285019afddf4"
+checksum="b6609609a3abcc6ad927cdd65c740be01162b801523e0f7ba9fd6691800bbf19
+ 8ae73db67446d00ca7aef8c34c9a7336d6ca36893fa55f943e662cd1035844de"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 52c665bc8aa9ae7033874807cbe739d1765e779e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 13 Feb 2021 13:04:26 +0100
Subject: [PATCH 1525/3458] mdadm: fix printf format for time64

---
 srcpkgs/mdadm/patches/time64.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/mdadm/patches/time64.patch

diff --git a/srcpkgs/mdadm/patches/time64.patch b/srcpkgs/mdadm/patches/time64.patch
new file mode 100644
index 000000000000..c02ca8f7592a
--- /dev/null
+++ b/srcpkgs/mdadm/patches/time64.patch
@@ -0,0 +1,20 @@
+--- monitor.c	2018-10-01 18:26:06.000000000 +0000
++++ monitor.c	2020-01-22 19:51:39.575877908 +0000
+@@ -20,6 +20,7 @@
+ 
+ #include "mdadm.h"
+ #include "mdmon.h"
++#include <inttypes.h>
+ #include <sys/syscall.h>
+ #include <sys/select.h>
+ #include <signal.h>
+@@ -447,7 +448,7 @@
+ 	}
+ 
+ 	gettimeofday(&tv, NULL);
+-	dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
++	dprintf("(%d): %"PRId64".%06"PRId64" state:%s prev:%s action:%s prev: %s start:%llu\n",
+ 		a->info.container_member,
+ 		tv.tv_sec, tv.tv_usec,
+ 		array_states[a->curr_state],
+

From 5ab96b9c8d51edd21725a2cac671ca484ae61d72 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 14:45:56 +0100
Subject: [PATCH 1526/3458] linux5.10: update to 5.10.16.

---
 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 395f2e230649..84871cfb37d6 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.15
+version=5.10.16
 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=d85287bcf1d51c4d0a32380ac0a5b2b487b321058a6923617f1613fbd10e6e01
+checksum=536fe3ea273bfcc72b3571d3b3a7ff0a5bcdc16068efd22e42c4f9d03c200a37
 python_version=3
 patch_args="-Np1"
 

From 9ac94cedb917b1ea417f6300138a57f035f8fd01 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 13 Feb 2021 12:15:13 +0200
Subject: [PATCH 1527/3458] growlight: update to 1.2.28.

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

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index d66c560c1291..3e5826aff171 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.27
+version=1.2.28
 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=3d5ebd86dd4c378192c446cd0f13968f565c2c9848b2ae13cc493b9682703180
+checksum=eb43a380dd2c9c50d175d7268b6825e7967aa8f4678ef323b18532637ae215cf
 
 build_options="man zfs"
 

From de5a5c99e98744ac487bed405740a2a1cb954124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:52 +0100
Subject: [PATCH 1528/3458] dragon-player: update to 20.12.2.

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

diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index 165fc060bb04..ecefa32ee71e 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=20.08.3
+version=20.12.2
 revision=1
 wrksrc="dragon-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
 distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=36a755be402d7b811483a17887ebf0c73fc92f92ecbe00b54c11158ee0591a93
+checksum=4fb14332806ea2d169e3349b28b405a063872d661d78c78aa64ba4fadcc25a7b

From c024b3a563d4e196572817bd3a2c6c81f9683d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:52 +0100
Subject: [PATCH 1529/3458] ffmpegthumbs: update to 20.12.2.

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

diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index d37abf98f0ec..cc78d013b4fd 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,15 +1,14 @@
 # Template file for 'ffmpegthumbs'
 pkgname=ffmpegthumbs
-version=20.08.3
+version=20.12.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel
  pkg-config qt5-host-tools qt5-qmake gettext"
-makedepends="qt5-devel kio-devel ffmpeg-devel"
+makedepends="qt5-devel kio-devel ffmpeg-devel taglib-devel"
 short_desc="FFmpeg-based thumbnail creator for video files"
 maintainer="Michael Straube <straubem@gmx.de>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ffmpegthumbs-${version}.tar.xz"
-checksum=f179cc304eeb513444fe0079bddb34ed18cb2ef1125b6294e87de44412bed0a0
+checksum=6f69dc7bdc45f5ad76c008cc160bd8799c3239f25c6eaea2ad6bca30fa798147

From 7589dfa83bd2529d64381897ca1bf1da113febde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:52 +0100
Subject: [PATCH 1530/3458] juk: update to 20.12.2.

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

diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e9486b1edcfc..42c385567786 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=20.08.3
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=2ecee3680b92c753e0ccf95e50990fbb12021d81f62a329965a5d4fc480672cb
+checksum=1615bf9629e21ffb6d0122741849c383cbc8f097838a18b0d00ab5090fb086b5

From 9bb1bf34d3f49a344c50ad9c36686989bc887ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:52 +0100
Subject: [PATCH 1531/3458] k3b: update to 20.12.2.

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

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 3ec3c3bd56b4..25d781a56bd8 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=20.08.3
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9d81f1b859dca68a781903f35b3186a9864222c8bb2c85cd7e9481d79eb9e261
+checksum=8fa4def0d8c4c62b6860ffe5ca0e67a121d94ef99823465e5b7a5a7345460f3f

From a9485967493aa396f488da10885087695fba6bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:52 +0100
Subject: [PATCH 1532/3458] kcharselect: update to 20.12.2.

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

diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template
index 12f14c894ca6..8f0f8da83b68 100644
--- a/srcpkgs/kcharselect/template
+++ b/srcpkgs/kcharselect/template
@@ -1,9 +1,8 @@
 # Template file for 'kcharselect'
 pkgname=kcharselect
-version=20.08.1
+version=20.12.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons gettext"
 makedepends="qt5-devel kbookmarks-devel"
 short_desc="Character Selector"
@@ -11,7 +10,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kcharselect"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcharselect-${version}.tar.xz"
-checksum=36575e9fd0a93fb3ddaf6a75a213786351bdd3ab8c167dc1a3e2824a23a6655b
+checksum=e3523e8076a06967f95b00330ad4a5ed9bdaa986677642824a895094f8320e3b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools python3 qt5-host-tools qt5-qmake"

From f193a5d64beea825dcaa24ed21fbf2502f68035e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:52 +0100
Subject: [PATCH 1533/3458] kcolorchooser: update to 20.12.2.

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

diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template
index d2868392d69a..8d29e2572ca3 100644
--- a/srcpkgs/kcolorchooser/template
+++ b/srcpkgs/kcolorchooser/template
@@ -1,9 +1,8 @@
 # Template file for 'kcolorchooser'
 pkgname=kcolorchooser
-version=20.08.1
+version=20.12.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons gettext"
 makedepends="qt5-devel kxmlgui-devel"
 short_desc="KDE's Color Chooser"
@@ -11,7 +10,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://kde.org/applications/en/graphics/org.kde.kcolorchooser"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcolorchooser-${version}.tar.xz"
-checksum=20cae01bd5e8c824f8e7900badd0d66464c363a749a1ce9fe6fe3a1e31c99ade
+checksum=330f65652ae2105162069d67e00a48f4e38df891df9310e97f33da41f2c7c423
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"

From a1b0238111eb6de81a6722a5d0dacd20f2fd7a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:52 +0100
Subject: [PATCH 1534/3458] kdegraphics-mobipocket: update to 20.12.2.

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

diff --git a/srcpkgs/kdegraphics-mobipocket/template b/srcpkgs/kdegraphics-mobipocket/template
index 099dbaa54f3e..995f44fef093 100644
--- a/srcpkgs/kdegraphics-mobipocket/template
+++ b/srcpkgs/kdegraphics-mobipocket/template
@@ -1,9 +1,8 @@
 # Template file for 'kdegraphics-mobipocket'
 pkgname=kdegraphics-mobipocket
-version=20.08.1
+version=20.12.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="kio-devel"
 short_desc="Collection of plugins to handle mobipocket files"
@@ -11,7 +10,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics-mobipocket"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-mobipocket-${version}.tar.xz"
-checksum=9974c36d90fc23d9a3a7172cf1526dc3671bf90f01f608effe92f64fce53c372
+checksum=c6844a0b7a84cac2f6d3b1a44645488b3dd5fc8e89214a0c512a7eb7ef8e4409
 
 libqmobipocket_package() {
 	short_desc+=" - runtime library"

From 0fbb8a7f34d269d9c2884f03337bd090f79cfcdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:52 +0100
Subject: [PATCH 1535/3458] kdegraphics-thumbnailers: update to 20.12.2.

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

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 9b11c64eb104..4aad32f6a076 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=20.08.3
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=aed7570a2af795d1f14b54782c578572e639bb850aee88d69dd5b17e0f9f7f55
+checksum=f323aa01dd70cce43f2d30caf6e8353f79ab81e9a942997a1e62b66ad67687dc

From 61608bdfec7786107e370d7b2f029edef7a49f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:53 +0100
Subject: [PATCH 1536/3458] kgpg: update to 20.12.2.

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

diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template
index 0b15d7f5e411..c49ce90a4acb 100644
--- a/srcpkgs/kgpg/template
+++ b/srcpkgs/kgpg/template
@@ -1,9 +1,8 @@
 # Template file for 'kgpg'
 pkgname=kgpg
-version=20.08.1
+version=20.12.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext"
 makedepends="kwindowsystem-devel kcrash-devel kdbusaddons-devel
  kiconthemes-devel kjobwidgets-devel kio-devel
@@ -15,7 +14,7 @@ maintainer="k4leg <d0xi@inbox.ru>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/utilities/org.kde.kgpg"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6b926c2adf896c3f68402ec10faf8db1e5f7c7b9fa8c1c26f9021d1fb0c975b0
+checksum=af83c3124f941d5ebc8eab00e8b38250e1a86925b63f918b2629765bab33efeb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake kcoreaddons-devel kdoctools kconfig"

From 4805d31ecf651820b5b3ae579d722808010d094b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:53 +0100
Subject: [PATCH 1537/3458] kmines: update to 20.12.2.

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

diff --git a/srcpkgs/kmines/template b/srcpkgs/kmines/template
index 933499abe73e..4c77e8a2c684 100644
--- a/srcpkgs/kmines/template
+++ b/srcpkgs/kmines/template
@@ -1,6 +1,6 @@
 # Template file for 'kmines'
 pkgname=kmines
-version=20.08.1
+version=20.12.2
 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.kmines"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmines-${version}.tar.xz"
-checksum=eeb58941c94330f3ffdca60c0ca84d8ebcc9c6c355737217b521c54e50c650cd
+checksum=915f82c380df1c3af9169f37214fdcf6089a4c453e737215d5881bf84363e80c

From 0482c4c587be13346a17c0dfdc7492f1df16ccab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:53 +0100
Subject: [PATCH 1538/3458] konquest: update to 20.12.2.

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

diff --git a/srcpkgs/konquest/template b/srcpkgs/konquest/template
index 571263a67255..3ebf90a72594 100644
--- a/srcpkgs/konquest/template
+++ b/srcpkgs/konquest/template
@@ -1,6 +1,6 @@
 # Template file for 'konquest'
 pkgname=konquest
-version=20.08.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kdoctools
@@ -12,4 +12,4 @@ maintainer="Olga Ustuzhanina <me@laserbat.pw>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.konquest"
 distfiles="${KDE_SITE}/release-service/${version}/src/konquest-${version}.tar.xz"
-checksum=cad87dd698bd1ebc0279216614f7fa7c3d3f36d545683a69f1ceafe9e279bbfe
+checksum=72753f907a385fa0b2d084ea3349d5963f92d8229bb678e9856c0f75863e9e5c

From 9ba7b52024a1b3fb3e5fc6b98e1b1b4a68aee5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:53 +0100
Subject: [PATCH 1539/3458] libkdegames: update to 20.12.2.

---
 srcpkgs/libkdegames/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 596cddd0707e..e9460e8b41fb 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=20.08.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,11 +11,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=6ab0b143dcba2d935dd0182c9154657ebbfb205c28bc86e2e13875b58e23737d
-
-do_check() {
-	: # requires xserver
-}
+checksum=19d93fe25f1ea5173d5130b2d270038b26e6cc6f09238724f330d05fbe019439
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 5db171a97b4be1fac3786eb58f759b52e84914a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:53 +0100
Subject: [PATCH 1540/3458] libksane: update to 20.12.2.

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

diff --git a/srcpkgs/libksane/template b/srcpkgs/libksane/template
index 4c7551a868ea..1dfb6533aa22 100644
--- a/srcpkgs/libksane/template
+++ b/srcpkgs/libksane/template
@@ -1,6 +1,6 @@
 # Template file for 'libksane'
 pkgname=libksane
-version=20.08.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext"
@@ -10,7 +10,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/graphics"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksane-${version}.tar.xz"
-checksum=0d8717ad004a2480aea232d9a2317b4d1cc4678d53f0176bdaeb411eedd19dbe
+checksum=8bf0a7ffb4e7d98b5381e958cf17733163bffa64e3bfe79e82e48be6bc761cae
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 9b9f4bfdb7469aa4678a104f35d889042c319653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:53 +0100
Subject: [PATCH 1541/3458] palapeli: update to 20.12.2.

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

diff --git a/srcpkgs/palapeli/template b/srcpkgs/palapeli/template
index 2268b5e33eab..7da12e29864e 100644
--- a/srcpkgs/palapeli/template
+++ b/srcpkgs/palapeli/template
@@ -1,6 +1,6 @@
 # Template file for 'palapeli'
 pkgname=palapeli
-version=20.08.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,4 +12,4 @@ maintainer="Adam Beckmeyer <adam_gpg@thebeckmeyers.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/palapeli"
 distfiles="${KDE_SITE}/release-service/${version}/src/palapeli-${version}.tar.xz"
-checksum=31b847caa89b998dfa580553d96c656b05f2d85fdd88f0ba71e953762cefac90
+checksum=7c46d34e167d5183aebe99be5e9608640450dc762c2a4377390f9afb444200fd

From fb6a613853055467269dc06fb36344cec62bef59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:53 +0100
Subject: [PATCH 1542/3458] print-manager: update to 20.12.2.

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

diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template
index 6be5b5757832..f540189c9dd6 100644
--- a/srcpkgs/print-manager/template
+++ b/srcpkgs/print-manager/template
@@ -1,9 +1,8 @@
 # Template file for 'print-manager'
 pkgname=print-manager
-version=20.08.3
+version=20.12.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools
  kpackage-devel kcoreaddons-devel kconfig-devel kauth-devel gettext"
 makedepends="plasma-framework-devel kcmutils-devel cups-devel"
@@ -12,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe+void@offlink.xyz>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/print-manager"
 distfiles="${KDE_SITE}/release-service/${version}/src/print-manager-${version}.tar.xz"
-checksum=1f1d0af2083fb38d99c20594e8b75843fc6e5141706dffb14b8ffc5fef4bd4a2
+checksum=2d82bcd565f6fd38b63f0e30d469a7d89eb489b423f8b5decd95366c9f7629e4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 66c499a4993fb29da21e4ba733947fa0cc4be317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 13 Feb 2021 18:25:53 +0100
Subject: [PATCH 1543/3458] krename: update to 5.0.1.

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

diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 8e3d7d0db8d2..5aa230f186d0 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,21 +1,14 @@
 # Template file for 'krename'
 pkgname=krename
-version=5.0.0
-revision=6
-# 5.0.0 FTBFS thus use a git revision which fixes the issue for now
-_gitrev=93726f3d4e177816337beaf5c8872859ef33e9d8
-wrksrc="${pkgname}-${_gitrev}"
+version=5.0.1
+revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config"
+hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
 makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
  taglib-devel"
 short_desc="Powerful batch renamer for KDE"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/KRename"
-distfiles="https://invent.kde.org/utilities/krename/-/archive/${_gitrev}/krename-${_gitrev}.tar.bz2"
-checksum=6bc6ec6917b06948b0eba1636e5191ae2b9cb1de436382662290e925103281d4
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python qt5-host-tools qt5-qmake"
-fi
+distfiles="${KDE_SITE}/krename/${version}/src/krename-${version}.tar.xz"
+checksum=caac78afd3ba06613df47bbd1570bb900acf4185547354d6eb588e70656f6a7d

From 064d1ec81c64e2b14a39dcddbdfc2129337a7cf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:59:35 +0100
Subject: [PATCH 1544/3458] burp-server: remove package

broken with OpenSSL-1.1+
we also have burp2, so need to keep the old package around
---
 srcpkgs/burp-client                           |  1 -
 srcpkgs/burp-server/files/burp-server/run     |  2 -
 srcpkgs/burp-server/patches/00.burp_ca.patch  | 13 ----
 .../patches/fix-gcc6-narrowing.patch          | 49 ---------------
 srcpkgs/burp-server/template                  | 62 -------------------
 srcpkgs/burp-server/update                    |  2 -
 srcpkgs/removed-packages/template             |  2 +
 7 files changed, 2 insertions(+), 129 deletions(-)
 delete mode 120000 srcpkgs/burp-client
 delete mode 100755 srcpkgs/burp-server/files/burp-server/run
 delete mode 100644 srcpkgs/burp-server/patches/00.burp_ca.patch
 delete mode 100644 srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch
 delete mode 100644 srcpkgs/burp-server/template
 delete mode 100644 srcpkgs/burp-server/update

diff --git a/srcpkgs/burp-client b/srcpkgs/burp-client
deleted file mode 120000
index 47843b7b9809..000000000000
--- a/srcpkgs/burp-client
+++ /dev/null
@@ -1 +0,0 @@
-burp-server
\ No newline at end of file
diff --git a/srcpkgs/burp-server/files/burp-server/run b/srcpkgs/burp-server/files/burp-server/run
deleted file mode 100755
index 14e3188c6f08..000000000000
--- a/srcpkgs/burp-server/files/burp-server/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec burp -F -c /etc/burp/burp-server.conf
diff --git a/srcpkgs/burp-server/patches/00.burp_ca.patch b/srcpkgs/burp-server/patches/00.burp_ca.patch
deleted file mode 100644
index a60ddb08218a..000000000000
--- a/srcpkgs/burp-server/patches/00.burp_ca.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# "-f" option unsupported by hostname.
-# from package VoidLinux/coreutils 8.24_3 - 2015-09.
---- configs/certs/CA/burp_ca
-+++ configs/certs/CA/burp_ca
-@@ -11,7 +11,7 @@
- dir=${etc}/CA
- conf=${etc}/CA.cnf
- 
--name=$(hostname -f)
-+name=$(hostname)
- ca_days=7300
- size=2048
- 
diff --git a/srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch b/srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch
deleted file mode 100644
index 14643dd215ef..000000000000
--- a/srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/conf.c.orig
-+++ src/conf.c
-@@ -538,7 +538,7 @@ static void do_build_regex(struct strlis
- struct fstype
- {
- 	const char *str;
--	long flag;
-+	unsigned int flag;
- };
- 
- static struct fstype fstypes[]={
-@@ -590,7 +590,7 @@ int main(int argc, char *argv[])
- 
- #endif
- 
--static int fstype_to_flag(const char *fstype, long *flag)
-+static int fstype_to_flag(const char *fstype, unsigned int *flag)
- {
- #ifdef HAVE_LINUX_OS
- 	int i=0;
---- src/strlist.c.orig
-+++ src/strlist.c
-@@ -21,7 +21,7 @@ void strlists_free(struct strlist **bd,
- 	}
- }
- 
--int strlist_add(struct strlist ***bdlist, int *count, char *path, long flag)
-+int strlist_add(struct strlist ***bdlist, int *count, char *path, unsigned int flag)
- {
- 	//int b=0;
- 	struct strlist *bdnew=NULL;
---- src/strlist.h.orig
-+++ src/strlist.h
-@@ -11,13 +11,13 @@ typedef struct strlist strlist_t;
- 
- struct strlist
- {
--	long flag;
-+	unsigned int flag;
- 	char *path;
- 	regex_t *re;
- };
- 
- extern void strlists_free(struct strlist **bd, int count);
--extern int strlist_add(struct strlist ***bdlist, int *count, char *path, long flag);
-+extern int strlist_add(struct strlist ***bdlist, int *count, char *path, unsigned int flag);
- extern int strlist_sort(struct strlist **a, struct strlist **b);
- 
- #endif
diff --git a/srcpkgs/burp-server/template b/srcpkgs/burp-server/template
deleted file mode 100644
index 85cff6602c69..000000000000
--- a/srcpkgs/burp-server/template
+++ /dev/null
@@ -1,62 +0,0 @@
-# Template file for 'burp-server'
-_desc="A network-based backup and restore program"
-
-pkgname=burp-server
-version=1.4.40
-revision=12
-short_desc="${_desc} - Server"
-maintainer="Pierre Bourgin <pierre.bourgin@free.fr>"
-license="AGPL-3.0-only, BSD-3-Clause, GPL-2.0-or-later"
-homepage="http://burp.grke.org/"
-wrksrc="burp-${version}"
-distfiles="https://github.com/grke/burp/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2e6a9a28453a11f3e36d0beefa185e72e7781a8718b55d3101144c9900752d6f
-
-hostmakedepends="automake libtool perl"
-# note: burp provides its internal copy of "uthash-devel"
-makedepends="
- libressl-devel zlib-devel librsync-devel ncurses-devel
- acl-devel yajl-devel ca-certificates"
-
-# unique binary for both client and server: server depends on client package.
-depends="burp-client-${version}_${revision}"
-
-build_style=gnu-configure
-configure_args="--sysconfdir=/etc/burp --sbindir=/usr/bin"
-conf_files="/etc/burp/burp-server.conf"
-
-make_dirs="/var/spool/burp 0755 root root"
-
-post_install() {
-	vsv ${pkgname}
-
-	vdoc "README"
-	vdoc "UPGRADING"
-	vlicense "LICENSE"
-
-	# /usr/sbin/burp_ca is hardcoded in conf files
-	sed -e "s,/usr/sbin/burp_ca,/usr/bin/burp_ca,g" \
-	    -i ${DESTDIR}/etc/burp/burp-server.conf
-}
-
-burp-client_package() {
-	short_desc="${_desc} - client"
-	# openssl binary needed by burp_ca script
-	depends="ca-certificates"
-	conf_files="/etc/burp/burp.conf"
-	make_dirs="/etc/burp/CA-client 0755 root root"
-	pkg_install() {
-		vmove "usr/bin/burp"
-		vmove "usr/bin/burp_ca"
-		vmove "usr/share/man/man8/burp.8.gz"
-		vmove "usr/share/man/man8/burp_ca.8.gz"
-		vmove "etc/burp/CA-client"
-		vmove "etc/burp/burp.conf"
-		vdoc "README"
-		vlicense "LICENSE"
-
-		# /usr/sbin/burp_ca is hardcoded in conf files
-		sed -e "s,/usr/sbin/burp_ca,/usr/bin/burp_ca,g" \
-		    -i ${PKGDESTDIR}/etc/burp/burp.conf
-	}
-}
diff --git a/srcpkgs/burp-server/update b/srcpkgs/burp-server/update
deleted file mode 100644
index 76424b2f6232..000000000000
--- a/srcpkgs/burp-server/update
+++ /dev/null
@@ -1,2 +0,0 @@
-# ignore v2 version for the moment, not yet stable
-ignore="2.*"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 14bd76761ff3..1c869a6950fc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,6 +18,8 @@ replaces="
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3
+ burp-server<=1.4.40_13
+ burp-client<=1.4.40_13
  bzr<=2.7.0_1
  bzrtools<=2.6.0_4
  caja-gksu<=1.20.2_2

From 3d92fb98cee4aaaf9c0423f540a205a42c48c199 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Wed, 6 May 2020 08:59:24 +0200
Subject: [PATCH 1545/3458] gpsbabel: update to 1.7.0.

---
 srcpkgs/gpsbabel/patches/configure.patch      |  25 +++
 ...y-read-diff-and-terr-from-geo-format.patch |  30 ----
 srcpkgs/gpsbabel/patches/drop-map.patch       | 143 ------------------
 srcpkgs/gpsbabel/patches/enigma.patch         |  17 +++
 srcpkgs/gpsbabel/patches/fix-build.patch      |  59 --------
 srcpkgs/gpsbabel/template                     |  11 +-
 6 files changed, 47 insertions(+), 238 deletions(-)
 create mode 100644 srcpkgs/gpsbabel/patches/configure.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/drop-map.patch
 create mode 100644 srcpkgs/gpsbabel/patches/enigma.patch
 delete mode 100644 srcpkgs/gpsbabel/patches/fix-build.patch

diff --git a/srcpkgs/gpsbabel/patches/configure.patch b/srcpkgs/gpsbabel/patches/configure.patch
new file mode 100644
index 000000000000..ddfa5b73c0dc
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/configure.patch
@@ -0,0 +1,25 @@
+--- configure	
++++ configure	
+@@ -6401,4 +6401,2 @@ $as_echo_n "checking loader paths for Qt
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: cross compiling: assuming rpath not needed" >&5
++$as_echo "cross compiling: assuming rpath not needed" >&6; }
+@@ -6421,6 +6419,6 @@ else
+-		if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
++#		if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
+@@ -6449 +6447 @@ rm -f core *.core core.conftest.* gmon.o
+-fi
++#fi
diff --git a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch b/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
deleted file mode 100644
index cff03b28c2cc..000000000000
--- a/srcpkgs/gpsbabel/patches/correctly-read-diff-and-terr-from-geo-format.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4cecea61aa5a33f4accfa109d0b73d7878462962 Mon Sep 17 00:00:00 2001
-From: Robert Lipe <robertlipe@users.noreply.github.com>
-Date: Sat, 14 Oct 2017 21:59:24 -0500
-Subject: [PATCH 8/8] Correctly read diff and terr from geo format.
-
-Thank you, Rick Richardson.
----
- geo.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geo.cc b/geo.cc
-index 5c785f38..e6f4560a 100644
---- geo.cc
-+++ geo.cc
-@@ -74,9 +74,9 @@ void GeoReadLoc()
-         waypt_add_url(wpt,
-                       reader.readElementText(), a.value("text").toString());
-       } else if (current_tag == "/loc/waypoint/difficulty") {
--        wpt->gc_data->diff = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->diff = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/terrain") {
--        wpt->gc_data->terr = reader.readElementText().toInt() * 10;
-+        wpt->gc_data->terr = reader.readElementText().toDouble() * 10;
-       } else if (current_tag == "/loc/waypoint/container") {
-         wpt->gc_data->container = wpt_container(reader.readElementText());
-       }
--- 
-2.14.3
-
-
diff --git a/srcpkgs/gpsbabel/patches/drop-map.patch b/srcpkgs/gpsbabel/patches/drop-map.patch
deleted file mode 100644
index 936962b9a5b7..000000000000
--- a/srcpkgs/gpsbabel/patches/drop-map.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advdlg.cc gpsbabel-gpsbabel_1_5_4/gui/advdlg.cc
---- gui/advdlg.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advdlg.cc	2018-01-12 12:14:50.428923572 +0100
-@@ -37,7 +37,6 @@
- {
-   ui_.setupUi(this);
-   ui_.synthShortNames->setChecked(synthShortNames);
--  ui_.previewGmap->setChecked(previewGmap);
-   ui_.debugCombo->setCurrentIndex(debugLevel+1);
-   ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok"));
-   ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel"));
-@@ -48,7 +47,6 @@
- void AdvDlg::acceptClicked()
- {
-   synthShortNames_ = ui_.synthShortNames->isChecked();
--  previewGmap_ = ui_.previewGmap->isChecked();
-   debugLevel_ = ui_.debugCombo->currentIndex()-1;
-   accept();
- }
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/advui.ui gpsbabel-gpsbabel_1_5_4/gui/advui.ui
---- gui/advui.ui	2017-01-02 06:05:19.000000000 +0100
-+++ gui/advui.ui	2018-01-12 12:13:29.919780546 +0100
-@@ -38,13 +38,6 @@
-     </widget>
-    </item>
-    <item>
--    <widget class="QCheckBox" name="previewGmap">
--     <property name="text">
--      <string>Preview in Google Maps</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QComboBox" name="debugCombo">
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/app.pro gpsbabel-gpsbabel_1_5_4/gui/app.pro
---- gui/app.pro	2017-01-02 06:05:19.000000000 +0100
-+++ gui/app.pro	2018-01-12 12:05:45.541885058 +0100
-@@ -15,13 +15,7 @@
-       gui \
-       network \
-       xml \
--
--greaterThan(QT_MINOR_VERSION, 5) {
--  QT += webenginewidgets
--  DEFINES += HAVE_WEBENGINE
--} else {
--  QT += webkit webkitwidgets 
--}
-+      widgets \
- 
- unix:DESTDIR = objects
- unix:MOC_DIR = objects
-@@ -72,13 +66,11 @@
- SOURCES += filterwidgets.cc
- SOURCES += format.cc
- SOURCES += formatload.cc
--SOURCES += gmapdlg.cc
- SOURCES += gpx.cc
- SOURCES += help.cc
- SOURCES += latlng.cc
- SOURCES += main.cc
- SOURCES += mainwindow.cc
--SOURCES += map.cc
- SOURCES += optionsdlg.cc
- SOURCES += preferences.cc
- SOURCES += processwait.cc
-@@ -98,11 +90,9 @@
- HEADERS += filterwidgets.h
- HEADERS += format.h
- HEADERS += formatload.h
--HEADERS += gmapdlg.h
- HEADERS += gpx.h
- HEADERS += help.h
- HEADERS += mainwindow.h
--HEADERS += map.h
- HEADERS += optionsdlg.h
- HEADERS += preferences.h
- HEADERS += processwait.h
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/main.cc gpsbabel-gpsbabel_1_5_4/gui/main.cc
---- gui/main.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/main.cc	2018-01-12 12:05:45.541885058 +0100
-@@ -29,7 +29,6 @@
- #include <QTextCodec>
- 
- #include "mainwindow.h"
--#include "gmapdlg.h"
- 
- #ifdef _WIN32
- const char *pathSeparator = ";";
-diff -Naur gpsbabel-gpsbabel_1_5_4.orig/gui/mainwindow.cc gpsbabel-gpsbabel_1_5_4/gui/mainwindow.cc
---- gui/mainwindow.cc	2017-01-02 06:05:19.000000000 +0100
-+++ gui/mainwindow.cc	2018-01-12 12:05:45.601886984 +0100
-@@ -38,7 +38,6 @@
- #include "donate.h"
- #include "filterdlg.h"
- #include "formatload.h"
--#include "gmapdlg.h"
- #include "help.h"
- #include "optionsdlg.h"
- #include "preferences.h"
-@@ -976,24 +975,6 @@
-     formatList_[fidx].bumpWriteUseCount(1);
-   }
- 
--  // Now output for preview in google maps
--  QString tempName;
--  if (babelData_.previewGmap_) {
--    QTemporaryFile ftemp;
--    ftemp.open();
--    tempName = ftemp.fileName();
--    ftemp.close();
--
--    // Ideally, expost this in the UI.  For now, just split the track
--    // if we've no recorded fixes for > 5 mins and we've moved > 300 meters.
--    //args << "-x";
--    //args << "track,pack,sdistance=0.3k,split=5m";
--
--    args << "-o";
--    args << "gpx";
--    args << "-F" << tempName;
--  }
--
-   ui_.outputWindow->clear();
-   ui_.outputWindow->appendPlainText("gpsbabel " + args.join(" "));
- 
-@@ -1005,14 +986,6 @@
-   ui_.outputWindow->appendPlainText(outputString);
-   if (x) {
-     ui_.outputWindow->appendPlainText(tr("Translation successful"));
--    if (babelData_.previewGmap_) {
--      this->hide();
--      GMapDialog dlg(0, tempName, babelData_.debugLevel_ >=1 ? ui_.outputWindow : 0);
--      dlg.show();
--      dlg.exec();
--      QFile(tempName).remove();
--      this->show();
--    }
-   }
-   else
-     ui_.outputWindow->appendPlainText(tr("Error running gpsbabel: %1\n").arg(errorString));
-
diff --git a/srcpkgs/gpsbabel/patches/enigma.patch b/srcpkgs/gpsbabel/patches/enigma.patch
new file mode 100644
index 000000000000..dabb7220af5a
--- /dev/null
+++ b/srcpkgs/gpsbabel/patches/enigma.patch
@@ -0,0 +1,17 @@
+--- enigma.cc	
++++ enigma.cc	
+@@ -23,0 +24,7 @@
++#include <cmath>           // for fabs, lround
++#include <cstdint>         // for int32_t, uint8_t, uint32_t
++#include <cstdlib>         // for abs
++#include <cstring>         // for strlen, memcpy, memset
++
++#include <QtCore/QString>  // for QString
++
+@@ -25,2 +32 @@
+-#include <cmath>
+-#include <cstdlib>
++#include "gbfile.h"        // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile
+@@ -180 +186 @@ enigma_waypt_disp(const Waypoint* wpt)
+-    le_write32(&ewpt.data.wp_altitude, METERS_TO_FEET(wpt->altitude) + 1000);
++    le_write32(&ewpt.data.wp_altitude, lround(METERS_TO_FEET(wpt->altitude)) + 1000);	
diff --git a/srcpkgs/gpsbabel/patches/fix-build.patch b/srcpkgs/gpsbabel/patches/fix-build.patch
deleted file mode 100644
index 53eba349759d..000000000000
--- a/srcpkgs/gpsbabel/patches/fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur gpsbabel-1.5.4/tef_xml.cc gpsbabel-1.5.4.my/tef_xml.cc
---- tef_xml.cc	2017-01-02 08:05:19.000000000 +0300
-+++ tef_xml.cc	2017-02-16 16:20:22.788961096 +0300
-@@ -72,11 +72,11 @@
-   bool valid = false;
- 
-   foreach(QXmlStreamAttribute attr, *attrv) {
--    if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) {
--      if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) {
-+    if (attr.name().compare((QString&)"Comment", Qt::CaseInsensitive) == 0) {
-+      if (attr.value().compare((QString&)"TourExchangeFormat", Qt::CaseInsensitive) == 0) {
-         valid = true;
-       }
--    } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare((QString&)"Version", Qt::CaseInsensitive) == 0) {
-       version = attr.value().toString().toDouble();
-     }
-   }
-@@ -95,9 +95,9 @@
- {
-   route = route_head_alloc();
-   foreach(QXmlStreamAttribute attr, *attrv) {
--    if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
-+    if (attr.name().compare((QString&)"Name", Qt::CaseInsensitive) == 0) {
-       route->rte_name = attr.value().toString().trimmed();
--    } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare((QString&)"Software", Qt::CaseInsensitive) == 0) {
-       route->rte_desc = attr.value().toString().trimmed();
-     }
-   }
-@@ -248,20 +248,20 @@
-     QString attrstr = attr.value().toString();
-     QByteArray attrtext = attrstr.toUtf8();
- 
--    if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) {
-+    if (attr.name().compare((QString&)"SegDescription", Qt::CaseInsensitive) == 0) {
-       wpt_tmp->shortname = attrstr.trimmed();
--    } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare((QString&)"PointDescription", Qt::CaseInsensitive) == 0) {
-       wpt_tmp->description = attrstr.trimmed();
--    } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 &&
--               attr.value().compare("true", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare((QString&)"ViaStation", Qt::CaseInsensitive) == 0 &&
-+               attr.value().compare((QString&)"true", Qt::CaseInsensitive) == 0) {
-       wpt_tmp->wpt_flags.fmt_use = 1;  /* only a flag */
- 
-       /* new in TEF V2 */
--    } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare((QString&)"Instruction", Qt::CaseInsensitive) == 0) {
-       wpt_tmp->description = attrstr.trimmed();
--    } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare((QString&)"Altitude", Qt::CaseInsensitive) == 0) {
-       wpt_tmp->altitude = attrstr.toDouble();
--    } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare((QString&)"TimeStamp", Qt::CaseInsensitive) == 0) {
-       /* nothing for the moment */
-     }
-   }
-
diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template
index 52ca3beb85c3..24c0a420e09d 100644
--- a/srcpkgs/gpsbabel/template
+++ b/srcpkgs/gpsbabel/template
@@ -1,23 +1,23 @@
 # Template file for 'gpsbabel'
 pkgname=gpsbabel
-version=1.5.4
+version=1.7.0
 revision=1
 wrksrc="gpsbabel-gpsbabel_${version//./_}"
 build_style=gnu-configure
 build_helper=qmake
-makedepends="qt5-devel libusb-compat-devel"
+makedepends="qt5-devel qt5-webkit-devel libusb-compat-devel"
 depends="desktop-file-utils"
 short_desc="Converts waypoints, tracks, and routes between popular GPS formats"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.gpsbabel.org/"
 distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz"
-checksum=8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797
 
 replaces="gpsbabel-gui>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
+	hostmakedepends+=" qt5-devel qt5-webkit-devel"
 	configure_args+=" ac_cv_prog_QMAKE=${XBPS_WRAPPERDIR}/qmake"
 fi
 
@@ -37,8 +37,7 @@ do_build() {
 
 do_install() {
 	make install DESTDIR=${DESTDIR}
-	vbin gui/gpsbabelfe
-	vbin gui/objects/gpsbabelfe-bin
+	vbin gui/objects/gpsbabelfe
 	vinstall gui/gpsbabel.desktop 644 usr/share/applications
 	vinstall gui/images/appicon.png 644 usr/share/pixmaps gpsbabel.png
 	vmkdir usr/share/gpsbabel/translations

From 09fe633fab0834401ea939c07d89bd64903569b2 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 13 Feb 2021 21:02:45 +0000
Subject: [PATCH 1546/3458] gnome-maps: update to 3.38.4.

---
 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 a58df5438632..fa518223ce79 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.3
+version=3.38.4
 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=9356d5d307384970af18e620dfc5836d247f7366fb632b152db3019d3cf66c07
+checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3

From ac80a91fe19987e1f1c386fbf72ea6b2bcbc2d02 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 13 Feb 2021 21:33:50 +0000
Subject: [PATCH 1547/3458] gedit-plugins: update to 3.38.1.

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

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index b7833db12de4..2c274c75da8d 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bda2bd5ad7ebdd535d1cc6c8700c295dec64b227c9173c0d2bae0067516259fb
+checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf
 python_version=3

From 1d2efef24601db35e143b14156ec4bed79395b75 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 12 Feb 2021 21:05:48 +0100
Subject: [PATCH 1548/3458] perl-Crypt-CBC: update to 3.01

---
 srcpkgs/perl-Crypt-CBC/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/perl-Crypt-CBC/template b/srcpkgs/perl-Crypt-CBC/template
index 420bb5024d3a..5ddc77f0674e 100644
--- a/srcpkgs/perl-Crypt-CBC/template
+++ b/srcpkgs/perl-Crypt-CBC/template
@@ -1,17 +1,17 @@
 # Template file for 'perl-Crypt-CBC'
 pkgname=perl-Crypt-CBC
-version=2.33
-revision=2
+version=3.01
+revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl"
-checkdepends="perl-Crypt-Blowfish perl-Crypt-Blowfish_PP perl-Crypt-CAST5
- perl-Crypt-DES perl-Crypt-DES_EDE3 perl-Crypt-IDEA perl-Crypt-Rijndael"
 depends="perl"
 short_desc="Encrypt Data with Cipher Block Chaining Mode"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Crypt-CBC"
 distfiles="${CPAN_SITE}/Crypt/Crypt-CBC-${version}.tar.gz"
-checksum=6a70de21b6cc7f2b100067e8e188db966e9a8001b5db6fa976e7cb5b294ae645
+checksum=de259c1c94fc1fd2731dfd276e8b05e31edfd2150848afdff09ac6ae9a03e624
+# check requires a lot of new cascading dependencies
+make_check=no

From 8b15c6267d29b5420a2fca97199e34c2c7b6acd2 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 13 Feb 2021 08:19:39 +0100
Subject: [PATCH 1549/3458] perl-CryptX: update to 0.070

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

diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template
index 8c135f6e0980..ce6303e5b4d7 100644
--- a/srcpkgs/perl-CryptX/template
+++ b/srcpkgs/perl-CryptX/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-CryptX'
 pkgname=perl-CryptX
-version=0.069
-revision=2
+version=0.070
+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, Unlicense"
 homepage="https://metacpan.org/release/CryptX"
 distfiles="${CPAN_SITE}/Crypt/${pkgname#perl-}-${version}.tar.gz"
-checksum=b5503a35046a973174234a823dba63403b080957c4a370d60d66aa7c7587d850
+checksum=1f3a22c9035b4aaf96bb931dd57d6e431990d29c5f55dde949a54b6e65e9450e

From 6bacc671a92695a6bac1002686cf76669391389f Mon Sep 17 00:00:00 2001
From: saqfish <saqfish@gmail.com>
Date: Sat, 13 Feb 2021 00:06:46 -0600
Subject: [PATCH 1550/3458] rofi-calc: update to 2.0.0.

rofi-calc: update to 2.0.0
---
 srcpkgs/rofi-calc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rofi-calc/template b/srcpkgs/rofi-calc/template
index 23cf2a5e64e8..303ddf1aefc7 100644
--- a/srcpkgs/rofi-calc/template
+++ b/srcpkgs/rofi-calc/template
@@ -1,6 +1,6 @@
 # Template file for 'rofi-calc'
 pkgname=rofi-calc
-version=1.9
+version=2.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="MIT"
 homepage="https://github.com/svenstaro/rofi-calc"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ace7b863c9e8beea8ae4f4dce32ddd18121f4755f5abfa546fe6cce871851355
+checksum=9d4da34bec55227964ab32b00d586e359911a80ce2db83a5cd57e1eb8985829d
 
 pre_configure() {
 	autoreconf -i

From e0f60263ad871a75f102a6aa8edecf9ccfb13742 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 13 Feb 2021 01:42:15 +0100
Subject: [PATCH 1551/3458] qjackctl: update to 0.9.1.

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

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index e4a482e63cc6..eaf7e7779316 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -1,7 +1,7 @@
 # Template file for 'qjackctl'
 pkgname=qjackctl
-version=0.9.0
-revision=2
+version=0.9.1
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="$(vopt_enable jack_session jack-session)
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://qjackctl.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5196c5c01b7948c1a8ca37cd3198a7f0fe095a99a34a67086abd3466855b4abd
+checksum=4fbe4c98ec5ce45efdd6a1088e2f5b208f5bcce994a8697b0bc96ecee99be254
 
 build_options="jack_session"
 build_options_default="jack_session"

From 032b2d725c9a7fe50ae174ad98e55b6d7a43d773 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 13 Feb 2021 16:13:16 +0100
Subject: [PATCH 1552/3458] minio: update to 2021.02.11.

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

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 49b4b3eb7c7f..bc78bbf6b84e 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2021.02.01
+version=2021.02.11
 revision=1
-_version="${version//./-}T22-56-52Z"
+_version="${version//./-}T08-23-43Z"
 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=5ee70a2ba2f73fa1d019fcca03244dd792a5ba0633e678de29b88fb5441508cf
+checksum=0b852c9fcf1bb6e389fbf8d57d2fb400663e95baf2c45fcc62959e8a5ec8f43e
 system_accounts="_minio"
 _minio_homedir="/var/lib/minio"
 _minio_descr="Minio Daemon User"

From a13a54a9824f8cf7bbd00929d7930a7bb7e18680 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sat, 13 Feb 2021 12:09:12 +0300
Subject: [PATCH 1553/3458] wob: update to 0.11.

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

diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index bd20c5cb7ac1..7e8ee6ad993f 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.10
+version=0.11
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=706fc2469924ca34d2af60997460fc9723dc4825669a57017024906dc444654c
+checksum=bcc81c96d2f7292cea9c290ab5bdf80970329a5645a34b60d4aa3621512ea1fe
 
 post_install() {
 	vlicense LICENSE

From 63407c6723ff222415ff899efac9dda1f9ee59f6 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 16:17:12 +0000
Subject: [PATCH 1554/3458] evince: update to 3.38.1.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 5c2e811c507d..c0e9fae7a2cc 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.0
+version=3.38.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26df897a417545b476d2606b14731122e84278ae994bd64ea535449c3cf01948
+checksum=00f6d6689cc22de3c005bd87d4c2ebf720064cb8dc6a1887816f8b7e082b2e63
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From d33668c6067000bccccc6bb4f494a5265fc56f68 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Fri, 12 Feb 2021 21:43:24 -0500
Subject: [PATCH 1555/3458] network-manager-applet: update to 1.20.0

---
 srcpkgs/network-manager-applet/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 303ded924567..be2ecd7c2e88 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.18.0
-revision=2
+version=1.20.0
+revision=1
 build_style=meson
 configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
@@ -11,10 +11,10 @@ makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
  libsecret-devel polkit-devel mobile-broadband-provider-info"
 depends="NetworkManager hicolor-icon-theme iso-codes"
 short_desc="NetworkManager panel applet for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b
+checksum=8ab205385d8380e3b7e4994b46f6ff009c453e3430bd2b2853c74263f69a5253
 lib32disabled=yes

From d20593630f4d273f7f508148317ef8bb0ae6c714 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Sat, 13 Feb 2021 09:48:22 +0100
Subject: [PATCH 1556/3458] clazy: update to 1.9.

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

diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index a74c4a5f1dde..39f529593ebd 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,14 +1,14 @@
 # Template file for 'clazy'
 pkgname=clazy
-version=1.8
+version=1.9
 revision=1
-create_wrksrc=yes
 build_style=cmake
 makedepends="clang llvm"
+depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://apps.kde.org/en/clazy"
 distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ff0a5b5e694149df5f60bb7a4dc253ee4752b803453c5d29fa79611b54ecffdc
+checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8
 nocross="Clang cannot be installed as makedep"

From 9a8973c6579c896967b849aa327a715e3e193f4f Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 12 Feb 2021 12:59:29 +0100
Subject: [PATCH 1557/3458] pounce: update to 2.3

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

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 57959706a54f..63b55178a178 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,6 +1,6 @@
 # Template file for 'pounce'
 pkgname=pounce
-version=2.2
+version=2.3
 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=2edde674f3d5d7f92211d25a7a5f0b011d91ab893942c09f9cbde5106e0f9b0c
+checksum=47e77cf01ccd94c6ecb83410d7f832426de61e28573b7aa4ac60fec5ac3f468b

From c70f6f4478c1852ee733d5d212c47b7a89e63d05 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 13 Feb 2021 12:14:58 +0100
Subject: [PATCH 1558/3458] easyrpg-player: update to 0.6.2.3, fix homepage and
 license

---
 srcpkgs/easyrpg-player/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/easyrpg-player/template b/srcpkgs/easyrpg-player/template
index 2fae4c771517..e39f02ffc806 100644
--- a/srcpkgs/easyrpg-player/template
+++ b/srcpkgs/easyrpg-player/template
@@ -1,6 +1,6 @@
 # Template file for 'easyrpg-player'
 pkgname=easyrpg-player
-version=0.6.2.1
+version=0.6.2.3
 revision=1
 wrksrc="Player-${version}"
 build_style=gnu-configure
@@ -10,15 +10,11 @@ makedepends="liblcf-devel SDL2-devel pixman-devel libpng-devel zlib-devel
  libsndfile-devel libxmp-devel speexdsp-devel SDL2_mixer-devel"
 short_desc="RPG Maker 2000/2003 and EasyRPG games interpreter"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
-homepage="https://github.com/EasyRPG/Player"
+license="GPL-3.0-or-later"
+homepage="https://easyrpg.org/player"
 distfiles="https://github.com/EasyRPG/Player/archive/${version}.tar.gz"
-checksum=59ffaff8da684b3cc391ac7bff5b95ddab524896cfb732cc2a8ff193bbbec8ac
+checksum=67cab7a42480a7a738624c4078ebca6b79fbf922e42806794650637e4cb0128f
 
 pre_configure() {
 	autoreconf -i
 }
-
-post_install() {
-	vlicense COPYING
-}

From 0fdab283aa6ca92ee191ac3dbb8a7e98a43c2a1a Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 16:28:47 +0000
Subject: [PATCH 1559/3458] powerstat: update to 0.02.24.

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

diff --git a/srcpkgs/powerstat/template b/srcpkgs/powerstat/template
index 331dad49fb83..1c8d9a62db52 100644
--- a/srcpkgs/powerstat/template
+++ b/srcpkgs/powerstat/template
@@ -1,6 +1,6 @@
 # Template file for 'powerstat'
 pkgname=powerstat
-version=0.02.20
+version=0.02.24
 revision=1
 build_style=gnu-makefile
 short_desc="Measures the power consumption using the ACPI battery information"
@@ -8,7 +8,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/powerstat/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz"
-checksum=679305b3a6d2cc9820d19247e9acc1fb2fa48e96a65bc253b358ba5b0a985de3
+checksum=12781cb108be1fc3be5ec893e6d025bfb40ada060bdc5f7715b65397620f2c7b
 
 do_build() {
 	make CC=$CC CFLAGS+="-DVERSION=\\\"$version\\\" $CFLAGS" ${makejobs}

From ec2965a75b4d37629f65a022dd6794924443c63a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 12 Feb 2021 09:40:14 +0100
Subject: [PATCH 1560/3458] mimeo: update to 2021.2.

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

diff --git a/srcpkgs/mimeo/template b/srcpkgs/mimeo/template
index 0f7080919df9..6e9eb5283ea2 100644
--- a/srcpkgs/mimeo/template
+++ b/srcpkgs/mimeo/template
@@ -1,9 +1,8 @@
 # Template file for 'mimeo'
 pkgname=mimeo
-version=2019.7
-revision=3
+version=2021.2
+revision=1
 build_style=python3-module
-pycompile_module="Mimeo.py"
 hostmakedepends="python3"
 depends="python3-xdg"
 short_desc="Open files by MIME-type or file name using regular expressions"
@@ -11,8 +10,4 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xyne.archlinux.ca/projects/mimeo/"
 distfiles="${homepage}/src/mimeo-${version}.tar.xz"
-checksum=f9106c1a1b0267c11f6131158cc279be361c3eb4949a804d3b61ad5b373ef65b
-
-post_install() {
-	vbin mimeo
-}
+checksum=4e2effd88e127f6a3c20664cf37b6bb95dcfa97906100a7a9352bd4704b87184

From 39fd35a3e944d1ad20f74bdb17d96312a815b3c9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 12 Feb 2021 09:32:07 +0100
Subject: [PATCH 1561/3458] fava: update to 1.1.8.

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

diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index 0478e0115011..d14e25c39974 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,7 +1,7 @@
 # Template file for 'fava'
 pkgname=fava
-version=1.17
-revision=2
+version=1.18
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask
@@ -13,7 +13,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="https://beancount.github.io/fava/"
 distfiles="${PYPI_SITE}/f/fava/fava-${version}.tar.gz"
-checksum=efad3a4b5697b9d7ee29eff5dc0c8367fc1df37b1abacc8d0b2071602e94a6cd
+checksum=21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5
 
 do_check() {
 	# CLI test expects fava on $PATH.  Not sure why static_url fails.

From 5116c420cd438f83542b49e32d967215047621a2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 12 Feb 2021 13:26:16 +0300
Subject: [PATCH 1562/3458] cointop: update to 1.6.0

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

diff --git a/srcpkgs/cointop/template b/srcpkgs/cointop/template
index 124dcfb399b4..87ce490415b5 100644
--- a/srcpkgs/cointop/template
+++ b/srcpkgs/cointop/template
@@ -1,6 +1,6 @@
 # Template file for 'cointop'
 pkgname=cointop
-version=1.5.5
+version=1.6.0
 revision=1
 build_style=go
 go_import_path="github.com/miguelmota/${pkgname}"
@@ -9,4 +9,4 @@ maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/miguelmota/cointop"
 distfiles="https://github.com/miguelmota/cointop/archive/v${version}.tar.gz"
-checksum=ec0a0765d768d5f019cf47b1173db84881b5540088cc0e5570fb8140355d3199
+checksum=42f007173b2d0fc61d6364da6bfc53da5cb3a4f8288cc8bfffd53964a96fd8c2

From b82ec79181026654620a902a67e31ee5911db3fe Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Fri, 12 Feb 2021 12:26:18 +0100
Subject: [PATCH 1563/3458] darkhttpd: update to 1.13.

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

diff --git a/srcpkgs/darkhttpd/template b/srcpkgs/darkhttpd/template
index 098f74a7d3c7..9a1baa0c4fcd 100644
--- a/srcpkgs/darkhttpd/template
+++ b/srcpkgs/darkhttpd/template
@@ -1,13 +1,13 @@
 # Template file for 'darkhttpd'
 pkgname=darkhttpd
-version=1.12
-revision=3
+version=1.13
+revision=1
 short_desc="Small and secure static webserver"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="ISC"
 homepage="https://unix4lyfe.org/darkhttpd/"
-distfiles="https://unix4lyfe.org/darkhttpd/darkhttpd-${version}.tar.bz2"
-checksum=a50417b622b32b5f421b3132cb94ebeff04f02c5fb87fba2e31147d23de50505
+distfiles="https://github.com/emikulic/darkhttpd/archive/v${version}.tar.gz"
+checksum=1d88c395ac79ca9365aa5af71afe4ad136a4ed45099ca398168d4a2014dc0fc2
 CFLAGS="$CFLAGS $LDFLAGS"
 
 # Create darkhttpd system user/group

From 0c040f58c8d4417f5d932adfcade26ca73473470 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 23:53:54 +0100
Subject: [PATCH 1564/3458] vanitygen: update to 1.53.

change to vanitygen-plus fork,
vanitygen wasn't compatible with OpenSSL-1.1+
---
 ...4a646873c8439d3b5ee3a2278e727575521f.patch | 1171 +++++++++++++++++
 ...3e6fff7da52c4aecbd898d9df2e60a56f134.patch |   98 ++
 srcpkgs/vanitygen/template                    |   15 +-
 3 files changed, 1276 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
 create mode 100644 srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch

diff --git a/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch b/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
new file mode 100644
index 000000000000..ac590bf3eae6
--- /dev/null
+++ b/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
@@ -0,0 +1,1171 @@
+From 4b814a646873c8439d3b5ee3a2278e727575521f Mon Sep 17 00:00:00 2001
+From: Antonio Spadaro <ilovelinux@users.noreply.github.com>
+Date: Sat, 2 Jun 2018 22:27:51 +0000
+Subject: [PATCH] Fix OpenSSL 1.1.0 incompatibilities (#56)
+
+* Fix openssl 1.1.0 incompatibilities
+
+* Replace BN_MASK2 with 0xffffffffL
+
+* Fix other openssl 1.1.0 incompatibilities
+
+* Fix retrocompatibility issue
+
+* Remove BN_bn2lebinpad due to incompatibility
+
+* Fix other incompatibility errors
+
+* Fixed retrocompatibility (maybe). Thanks to  @DesWurstes
+
+* Fix OpenSSL 1.1 and backwards compatibility
+---
+ keyconv.c   |  18 ++--
+ oclengine.c | 130 ++++++++++++++++++---------
+ pattern.c   | 252 ++++++++++++++++++++++++++--------------------------
+ pattern.h   |   8 +-
+ util.c      |  90 +++++++++----------
+ vanitygen.c |  14 +--
+ 6 files changed, 277 insertions(+), 235 deletions(-)
+
+diff --git a/keyconv.c b/keyconv.c
+index f7475e5..394c3a0 100644
+--- keyconv.c
++++ keyconv.c
+@@ -1160,7 +1160,7 @@ main(int argc, char **argv)
+ 
+ 	if (key2_in) {
+ 		BN_CTX *bnctx;
+-		BIGNUM bntmp, bntmp2;
++		BIGNUM *bntmp, *bntmp2;
+ 		EC_KEY *pkey2;
+ 
+ 		pkey2 = EC_KEY_new_by_curve_name(NID_secp256k1);
+@@ -1182,19 +1182,19 @@ main(int argc, char **argv)
+ 			compressed = 1;
+ 		}
+ 
+-		BN_init(&bntmp);
+-		BN_init(&bntmp2);
++		bntmp = BN_new();
++		bntmp2 = BN_new();
+ 		bnctx = BN_CTX_new();
+-		EC_GROUP_get_order(EC_KEY_get0_group(pkey), &bntmp2, NULL);
+-		BN_mod_add(&bntmp,
++		EC_GROUP_get_order(EC_KEY_get0_group(pkey), bntmp2, NULL);
++		BN_mod_add(bntmp,
+ 			   EC_KEY_get0_private_key(pkey),
+ 			   EC_KEY_get0_private_key(pkey2),
+-			   &bntmp2,
++			   bntmp2,
+ 			   bnctx);
+-		vg_set_privkey(&bntmp, pkey);
++		vg_set_privkey(bntmp, pkey);
+ 		EC_KEY_free(pkey2);
+-		BN_clear_free(&bntmp);
+-		BN_clear_free(&bntmp2);
++		BN_clear_free(bntmp);
++		BN_clear_free(bntmp2);
+ 		BN_CTX_free(bnctx);
+ 	}
+ 
+diff --git a/oclengine.c b/oclengine.c
+index 4085edd..6f65846 100644
+--- oclengine.c
++++ oclengine.c
+@@ -43,6 +43,34 @@
+ #include "pattern.h"
+ #include "util.h"
+ 
++// Unfortunately we need this!
++#if OPENSSL_VERSION_NUMBER >= 0x0010100000
++#define PPNT_ARROW_X ppnt->X
++#define PPNT_ARROW_Y ppnt->Y
++#define PPNT_ARROW_Z ppnt->Z
++#define PPS_ARROW_X pps->X
++#define PPS_ARROW_Y pps->Y
++#define PPS_ARROW_Z pps->Z
++#define PPT_ARROW_X ppt->X
++#define PPT_ARROW_Y ppt->Y
++#define PPR_ARROW_X ppr->X
++#define PPR_ARROW_Y ppr->Y
++#define PPC_ARROW_X ppc->X
++#define PPC_ARROW_Y ppc->Y
++#else
++#define PPNT_ARROW_X &ppnt->X
++#define PPNT_ARROW_Y &ppnt->Y
++#define PPNT_ARROW_Z &ppnt->Z
++#define PPS_ARROW_X &pps->X
++#define PPS_ARROW_Y &pps->Y
++#define PPS_ARROW_Z &pps->Z
++#define PPT_ARROW_X &ppt->X
++#define PPT_ARROW_Y &ppt->Y
++#define PPR_ARROW_X &ppr->X
++#define PPR_ARROW_Y &ppr->Y
++#define PPC_ARROW_X &ppc->X
++#define PPC_ARROW_Y &ppc->Y
++#endif
+ 
+ #define MAX_SLOT 2
+ #define MAX_ARG 6
+@@ -1307,14 +1335,21 @@ vg_ocl_kernel_wait(vg_ocl_context_t *vocp, int slot)
+ static INLINE void
+ vg_ocl_get_bignum_raw(BIGNUM *bn, const unsigned char *buf)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x0010100000
++	BN_lebin2bn(buf, 32, bn);
++#else
+ 	bn_expand(bn, 256);
+ 	memcpy(bn->d, buf, 32);
+ 	bn->top = (32 / sizeof(BN_ULONG));
++#endif
+ }
+ 
+ static INLINE void
+ vg_ocl_put_bignum_raw(unsigned char *buf, const BIGNUM *bn)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x0010100000
++	BN_bn2lebinpad(bn, buf, 32);
++#else
+ 	int bnlen = (bn->top * sizeof(BN_ULONG));
+ 	if (bnlen >= 32) {
+ 		memcpy(buf, bn->d, 32);
+@@ -1322,6 +1357,7 @@ vg_ocl_put_bignum_raw(unsigned char *buf, const BIGNUM *bn)
+ 		memcpy(buf, bn->d, bnlen);
+ 		memset(buf + bnlen, 0, 32 - bnlen);
+ 	}
++#endif
+ }
+ 
+ #define ACCESS_BUNDLE 1024
+@@ -1351,9 +1387,15 @@ vg_ocl_get_bignum_tpa(BIGNUM *bn, const unsigned char *buf, int cell)
+ 
+ struct ec_point_st {
+ 	const EC_METHOD *meth;
++#if OPENSSL_VERSION_NUMBER >= 0x0010100000
++	BIGNUM *X;
++	BIGNUM *Y;
++	BIGNUM *Z;
++#else
+ 	BIGNUM X;
+ 	BIGNUM Y;
+ 	BIGNUM Z;
++#endif
+ 	int Z_is_one;
+ };
+ 
+@@ -1361,11 +1403,11 @@ static INLINE void
+ vg_ocl_get_point(EC_POINT *ppnt, const unsigned char *buf)
+ {
+ 	static const unsigned char mont_one[] = { 0x01,0x00,0x00,0x03,0xd1 };
+-	vg_ocl_get_bignum_raw(&ppnt->X, buf);
+-	vg_ocl_get_bignum_raw(&ppnt->Y, buf + 32);
++	vg_ocl_get_bignum_raw(PPNT_ARROW_X, buf);
++	vg_ocl_get_bignum_raw(PPNT_ARROW_Y, buf + 32);
+ 	if (!ppnt->Z_is_one) {
+ 		ppnt->Z_is_one = 1;
+-		BN_bin2bn(mont_one, sizeof(mont_one), &ppnt->Z);
++		BN_bin2bn(mont_one, sizeof(mont_one), PPNT_ARROW_Z);
+ 	}
+ }
+ 
+@@ -1373,8 +1415,8 @@ static INLINE void
+ vg_ocl_put_point(unsigned char *buf, const EC_POINT *ppnt)
+ {
+ 	assert(ppnt->Z_is_one);
+-	vg_ocl_put_bignum_raw(buf, &ppnt->X);
+-	vg_ocl_put_bignum_raw(buf + 32, &ppnt->Y);
++	vg_ocl_put_bignum_raw(buf, PPNT_ARROW_X);
++	vg_ocl_put_bignum_raw(buf + 32, PPNT_ARROW_Y);
+ }
+ 
+ static void
+@@ -1662,7 +1704,7 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
+ 	unsigned char *ocl_points_in = NULL, *ocl_strides_in = NULL;
+ 	const EC_GROUP *pgroup;
+ 	EC_POINT *ppr = NULL, *ppc = NULL, *pps = NULL, *ppt = NULL;
+-	BIGNUM bnz, bnez, bnm, *bnzc;
++	BIGNUM *bnz, *bnez, *bnm, *bnzc;
+ 	BN_CTX *bnctx = NULL;
+ 	BN_MONT_CTX *bnmont;
+ 	int ret = 0;
+@@ -1675,9 +1717,9 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
+ 		0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFC,0x2F
+ 	};
+ 
+-	BN_init(&bnz);
+-	BN_init(&bnez);
+-	BN_init(&bnm);
++	bnz = BN_new();
++	bnez = BN_new();
++	bnm = BN_new();
+ 
+ 	bnctx = BN_CTX_new();
+ 	bnmont = BN_MONT_CTX_new();
+@@ -1692,13 +1734,13 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
+ 		goto out;
+ 	}
+ 
+-	BN_bin2bn(raw_modulus, sizeof(raw_modulus), &bnm);
+-	BN_MONT_CTX_set(bnmont, &bnm, bnctx);
++	BN_bin2bn(raw_modulus, sizeof(raw_modulus), bnm);
++	BN_MONT_CTX_set(bnmont, bnm, bnctx);
+ 
+ 	if (z_inverted) {
+-		bnzc = &bnez;
++		bnzc = bnez;
+ 	} else {
+-		bnzc = &pps->Z;
++		bnzc = PPS_ARROW_Z;
+ 	}
+ 
+ 	z_heap = (unsigned char *)
+@@ -1726,15 +1768,15 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
+ 			EC_POINT_add(pgroup, pps, ppc, ppr, bnctx);
+ 			assert(!pps->Z_is_one);
+ 			vg_ocl_get_point_tpa(ppt, point_tmp, bx + x);
+-			vg_ocl_get_bignum_tpa(&bnz, z_heap, bx + x);
++			vg_ocl_get_bignum_tpa(bnz, z_heap, bx + x);
+ 			if (z_inverted) {
+-				BN_mod_inverse(&bnez, &pps->Z, &bnm, bnctx);
+-				BN_to_montgomery(&bnez, &bnez, bnmont, bnctx);
+-				BN_to_montgomery(&bnez, &bnez, bnmont, bnctx);
++				BN_mod_inverse(bnez, PPS_ARROW_Z, bnm, bnctx);
++				BN_to_montgomery(bnez, bnez, bnmont, bnctx);
++				BN_to_montgomery(bnez, bnez, bnmont, bnctx);
+ 			}
+-			if (BN_cmp(&ppt->X, &pps->X) ||
+-			    BN_cmp(&ppt->Y, &pps->Y) ||
+-			    BN_cmp(&bnz, bnzc)) {
++			if (BN_cmp(PPT_ARROW_X, PPS_ARROW_X) ||
++			    BN_cmp(PPT_ARROW_Y, PPS_ARROW_Y) ||
++			    BN_cmp(bnz, bnzc)) {
+ 				if (!mismatches) {
+ 					fprintf(stderr, "Base privkey: ");
+ 					fdumpbn(stderr, EC_KEY_get0_private_key(
+@@ -1747,33 +1789,33 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
+ 				if (!mm_r) {
+ 					mm_r = 1;
+ 					fprintf(stderr, "Row X   : ");
+-					fdumpbn(stderr, &ppr->X);
++					fdumpbn(stderr, PPR_ARROW_X);
+ 					fprintf(stderr, "Row Y   : ");
+-					fdumpbn(stderr, &ppr->Y);
++					fdumpbn(stderr, PPS_ARROW_Y);
+ 				}
+ 
+ 				fprintf(stderr, "Column X: ");
+-				fdumpbn(stderr, &ppc->X);
++				fdumpbn(stderr, PPC_ARROW_X);
+ 				fprintf(stderr, "Column Y: ");
+-				fdumpbn(stderr, &ppc->Y);
++				fdumpbn(stderr, PPC_ARROW_Y);
+ 
+-				if (BN_cmp(&ppt->X, &pps->X)) {
++				if (BN_cmp(PPT_ARROW_X, PPS_ARROW_X)) {
+ 					fprintf(stderr, "Expect X: ");
+-					fdumpbn(stderr, &pps->X);
++					fdumpbn(stderr, PPS_ARROW_X);
+ 					fprintf(stderr, "Device X: ");
+-					fdumpbn(stderr, &ppt->X);
++					fdumpbn(stderr, PPT_ARROW_X);
+ 				}
+-				if (BN_cmp(&ppt->Y, &pps->Y)) {
++				if (BN_cmp(PPT_ARROW_Y, PPS_ARROW_Y)) {
+ 					fprintf(stderr, "Expect Y: ");
+-					fdumpbn(stderr, &pps->Y);
++					fdumpbn(stderr, PPS_ARROW_Y);
+ 					fprintf(stderr, "Device Y: ");
+-					fdumpbn(stderr, &ppt->Y);
++					fdumpbn(stderr, PPT_ARROW_Y);
+ 				}
+-				if (BN_cmp(&bnz, bnzc)) {
++				if (BN_cmp(bnz, bnzc)) {
+ 					fprintf(stderr, "Expect Z: ");
+ 					fdumpbn(stderr, bnzc);
+ 					fprintf(stderr, "Device Z: ");
+-					fdumpbn(stderr, &bnz);
++					fdumpbn(stderr, bnz);
+ 				}
+ 			}
+ 		}
+@@ -1798,9 +1840,9 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
+ 		EC_POINT_free(pps);
+ 	if (ppt)
+ 		EC_POINT_free(ppt);
+-	BN_clear_free(&bnz);
+-	BN_clear_free(&bnez);
+-	BN_clear_free(&bnm);
++	BN_clear_free(bnz);
++	BN_clear_free(bnez);
++	BN_clear_free(bnm);
+ 	if (bnmont)
+ 		BN_MONT_CTX_free(bnmont);
+ 	if (bnctx)
+@@ -1971,13 +2013,13 @@ vg_opencl_loop(vg_exec_context_t *arg)
+ 	if (!pbatchinc || !poffset || !pseek)
+ 		goto enomem;
+ 
+-	BN_set_word(&vxcp->vxc_bntmp, ncols);
+-	EC_POINT_mul(pgroup, pbatchinc, &vxcp->vxc_bntmp, NULL, NULL,
++	BN_set_word(vxcp->vxc_bntmp, ncols);
++	EC_POINT_mul(pgroup, pbatchinc, vxcp->vxc_bntmp, NULL, NULL,
+ 		     vxcp->vxc_bnctx);
+ 	EC_POINT_make_affine(pgroup, pbatchinc, vxcp->vxc_bnctx);
+ 
+-	BN_set_word(&vxcp->vxc_bntmp, round);
+-	EC_POINT_mul(pgroup, poffset, &vxcp->vxc_bntmp, NULL, NULL,
++	BN_set_word(vxcp->vxc_bntmp, round);
++	EC_POINT_mul(pgroup, poffset, vxcp->vxc_bntmp, NULL, NULL,
+ 		     vxcp->vxc_bnctx);
+ 	EC_POINT_make_affine(pgroup, poffset, vxcp->vxc_bnctx);
+ 
+@@ -2046,12 +2088,12 @@ vg_opencl_loop(vg_exec_context_t *arg)
+ 	}
+ 
+ 	/* Determine rekey interval */
+-	EC_GROUP_get_order(pgroup, &vxcp->vxc_bntmp, vxcp->vxc_bnctx);
+-	BN_sub(&vxcp->vxc_bntmp2,
+-	       &vxcp->vxc_bntmp,
++	EC_GROUP_get_order(pgroup, vxcp->vxc_bntmp, vxcp->vxc_bnctx);
++	BN_sub(vxcp->vxc_bntmp2,
++	       vxcp->vxc_bntmp,
+ 	       EC_KEY_get0_private_key(pkey));
+-	rekey_at = BN_get_word(&vxcp->vxc_bntmp2);
+-	if ((rekey_at == BN_MASK2) || (rekey_at > rekey_max))
++	rekey_at = BN_get_word(vxcp->vxc_bntmp2);
++	if ((rekey_at == 0xffffffffL) || (rekey_at > rekey_max))
+ 		rekey_at = rekey_max;
+ 	assert(rekey_at > 0);
+ 
+diff --git a/pattern.c b/pattern.c
+index b84334e..5673a7e 100644
+--- pattern.c
++++ pattern.c
+@@ -151,12 +151,12 @@ vg_exec_context_init(vg_context_t *vcp, vg_exec_context_t *vxcp)
+ 
+ 	vxcp->vxc_vc = vcp;
+ 
+-	BN_init(&vxcp->vxc_bntarg);
+-	BN_init(&vxcp->vxc_bnbase);
+-	BN_init(&vxcp->vxc_bntmp);
+-	BN_init(&vxcp->vxc_bntmp2);
++	vxcp->vxc_bntarg = BN_new();
++	vxcp->vxc_bnbase = BN_new();
++	vxcp->vxc_bntmp = BN_new();
++	vxcp->vxc_bntmp2 = BN_new();
+ 
+-	BN_set_word(&vxcp->vxc_bnbase, 58);
++	BN_set_word(vxcp->vxc_bnbase, 58);
+ 
+ 	vxcp->vxc_bnctx = BN_CTX_new();
+ 	assert(vxcp->vxc_bnctx);
+@@ -196,10 +196,10 @@ vg_exec_context_del(vg_exec_context_t *vxcp)
+ 	if (tp->vxc_stop)
+ 		pthread_cond_signal(&vg_thread_upcond);
+ 
+-	BN_clear_free(&vxcp->vxc_bntarg);
+-	BN_clear_free(&vxcp->vxc_bnbase);
+-	BN_clear_free(&vxcp->vxc_bntmp);
+-	BN_clear_free(&vxcp->vxc_bntmp2);
++	BN_clear_free(vxcp->vxc_bntarg);
++	BN_clear_free(vxcp->vxc_bnbase);
++	BN_clear_free(vxcp->vxc_bntmp);
++	BN_clear_free(vxcp->vxc_bntmp2);
+ 	BN_CTX_free(vxcp->vxc_bnctx);
+ 	vxcp->vxc_bnctx = NULL;
+ 	pthread_mutex_unlock(&vg_thread_lock);
+@@ -225,12 +225,12 @@ void
+ vg_exec_context_consolidate_key(vg_exec_context_t *vxcp)
+ {
+ 	if (vxcp->vxc_delta) {
+-		BN_clear(&vxcp->vxc_bntmp);
+-		BN_set_word(&vxcp->vxc_bntmp, vxcp->vxc_delta);
+-		BN_add(&vxcp->vxc_bntmp2,
++		BN_clear(vxcp->vxc_bntmp);
++		BN_set_word(vxcp->vxc_bntmp, vxcp->vxc_delta);
++		BN_add(vxcp->vxc_bntmp2,
+ 		       EC_KEY_get0_private_key(vxcp->vxc_key),
+-		       &vxcp->vxc_bntmp);
+-		vg_set_privkey(&vxcp->vxc_bntmp2, vxcp->vxc_key);
++		       vxcp->vxc_bntmp);
++		vg_set_privkey(vxcp->vxc_bntmp2, vxcp->vxc_key);
+ 		vxcp->vxc_delta = 0;
+ 	}
+ }
+@@ -751,20 +751,20 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 	int b58pow, b58ceil, b58top = 0;
+ 	int ret = -1;
+ 
+-	BIGNUM bntarg, bnceil, bnfloor;
+-	BIGNUM bnbase;
++	BIGNUM *bntarg, *bnceil, *bnfloor;
++	BIGNUM *bnbase;
+ 	BIGNUM *bnap, *bnbp, *bntp;
+ 	BIGNUM *bnhigh = NULL, *bnlow = NULL, *bnhigh2 = NULL, *bnlow2 = NULL;
+-	BIGNUM bntmp, bntmp2;
++	BIGNUM *bntmp, *bntmp2;
+ 
+-	BN_init(&bntarg);
+-	BN_init(&bnceil);
+-	BN_init(&bnfloor);
+-	BN_init(&bnbase);
+-	BN_init(&bntmp);
+-	BN_init(&bntmp2);
++	bntarg = BN_new();
++	bnceil = BN_new();
++	bnfloor = BN_new();
++	bnbase = BN_new();
++	bntmp = BN_new();
++	bntmp2 = BN_new();
+ 
+-	BN_set_word(&bnbase, 58);
++	BN_set_word(bnbase, 58);
+ 
+ 	p = strlen(pfx);
+ 
+@@ -791,20 +791,20 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 
+ 			/* First non-zero character */
+ 			b58top = c;
+-			BN_set_word(&bntarg, c);
++			BN_set_word(bntarg, c);
+ 
+ 		} else {
+-			BN_set_word(&bntmp2, c);
+-			BN_mul(&bntmp, &bntarg, &bnbase, bnctx);
+-			BN_add(&bntarg, &bntmp, &bntmp2);
++			BN_set_word(bntmp2, c);
++			BN_mul(bntmp, bntarg, bnbase, bnctx);
++			BN_add(bntarg, bntmp, bntmp2);
+ 		}
+ 	}
+ 
+ 	/* Power-of-two ceiling and floor values based on leading 1s */
+-	BN_clear(&bntmp);
+-	BN_set_bit(&bntmp, 200 - (zero_prefix * 8));
+-	BN_sub(&bnceil, &bntmp, BN_value_one());
+-	BN_set_bit(&bnfloor, 192 - (zero_prefix * 8));
++	BN_clear(bntmp);
++	BN_set_bit(bntmp, 200 - (zero_prefix * 8));
++	BN_sub(bnceil, bntmp, BN_value_one());
++	BN_set_bit(bnfloor, 192 - (zero_prefix * 8));
+ 
+ 	bnlow = BN_new();
+ 	bnhigh = BN_new();
+@@ -815,13 +815,13 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 		 * numeric boundaries of the prefix.
+ 		 */
+ 
+-		BN_copy(&bntmp, &bnceil);
+-		bnap = &bntmp;
+-		bnbp = &bntmp2;
++		BN_copy(bntmp, bnceil);
++		bnap = bntmp;
++		bnbp = bntmp2;
+ 		b58pow = 0;
+-		while (BN_cmp(bnap, &bnbase) > 0) {
++		while (BN_cmp(bnap, bnbase) > 0) {
+ 			b58pow++;
+-			BN_div(bnbp, NULL, bnap, &bnbase, bnctx);
++			BN_div(bnbp, NULL, bnap, bnbase, bnctx);
+ 			bntp = bnap;
+ 			bnap = bnbp;
+ 			bnbp = bntp;
+@@ -837,11 +837,11 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 			/* goto out; */
+ 		}
+ 
+-		BN_set_word(&bntmp2, b58pow - (p - zero_prefix));
+-		BN_exp(&bntmp, &bnbase, &bntmp2, bnctx);
+-		BN_mul(bnlow, &bntmp, &bntarg, bnctx);
+-		BN_sub(&bntmp2, &bntmp, BN_value_one());
+-		BN_add(bnhigh, bnlow, &bntmp2);
++		BN_set_word(bntmp2, b58pow - (p - zero_prefix));
++		BN_exp(bntmp, bnbase, bntmp2, bnctx);
++		BN_mul(bnlow, bntmp, bntarg, bnctx);
++		BN_sub(bntmp2, bntmp, BN_value_one());
++		BN_add(bnhigh, bnlow, bntmp2);
+ 
+ 		if (b58top <= b58ceil) {
+ 			/* Fill out the upper range too */
+@@ -849,16 +849,16 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 			bnlow2 = BN_new();
+ 			bnhigh2 = BN_new();
+ 
+-			BN_mul(bnlow2, bnlow, &bnbase, bnctx);
+-			BN_mul(&bntmp2, bnhigh, &bnbase, bnctx);
+-			BN_set_word(&bntmp, 57);
+-			BN_add(bnhigh2, &bntmp2, &bntmp);
++			BN_mul(bnlow2, bnlow, bnbase, bnctx);
++			BN_mul(bntmp2, bnhigh, bnbase, bnctx);
++			BN_set_word(bntmp, 57);
++			BN_add(bnhigh2, bntmp2, bntmp);
+ 
+ 			/*
+ 			 * Addresses above the ceiling will have one
+ 			 * fewer "1" prefix in front than we require.
+ 			 */
+-			if (BN_cmp(&bnceil, bnlow2) < 0) {
++			if (BN_cmp(bnceil, bnlow2) < 0) {
+ 				/* High prefix is above the ceiling */
+ 				check_upper = 0;
+ 				BN_free(bnhigh2);
+@@ -866,15 +866,15 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 				BN_free(bnlow2);
+ 				bnlow2 = NULL;
+ 			}
+-			else if (BN_cmp(&bnceil, bnhigh2) < 0)
++			else if (BN_cmp(bnceil, bnhigh2) < 0)
+ 				/* High prefix is partly above the ceiling */
+-				BN_copy(bnhigh2, &bnceil);
++				BN_copy(bnhigh2, bnceil);
+ 
+ 			/*
+ 			 * Addresses below the floor will have another
+ 			 * "1" prefix in front instead of our target.
+ 			 */
+-			if (BN_cmp(&bnfloor, bnhigh) >= 0) {
++			if (BN_cmp(bnfloor, bnhigh) >= 0) {
+ 				/* Low prefix is completely below the floor */
+ 				assert(check_upper);
+ 				check_upper = 0;
+@@ -885,35 +885,35 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 				bnlow = bnlow2;
+ 				bnlow2 = NULL;
+ 			}			
+-			else if (BN_cmp(&bnfloor, bnlow) > 0) {
++			else if (BN_cmp(bnfloor, bnlow) > 0) {
+ 				/* Low prefix is partly below the floor */
+-				BN_copy(bnlow, &bnfloor);
++				BN_copy(bnlow, bnfloor);
+ 			}
+ 		}
+ 
+ 	} else {
+-		BN_copy(bnhigh, &bnceil);
++		BN_copy(bnhigh, bnceil);
+ 		BN_clear(bnlow);
+ 	}
+ 
+ 	/* Limit the prefix to the address type */
+-	BN_clear(&bntmp);
+-	BN_set_word(&bntmp, addrtype);
+-	BN_lshift(&bntmp2, &bntmp, 192);
++	BN_clear(bntmp);
++	BN_set_word(bntmp, addrtype);
++	BN_lshift(bntmp2, bntmp, 192);
+ 
+ 	if (check_upper) {
+-		if (BN_cmp(&bntmp2, bnhigh2) > 0) {
++		if (BN_cmp(bntmp2, bnhigh2) > 0) {
+ 			check_upper = 0;
+ 			BN_free(bnhigh2);
+ 			bnhigh2 = NULL;
+ 			BN_free(bnlow2);
+ 			bnlow2 = NULL;
+ 		}
+-		else if (BN_cmp(&bntmp2, bnlow2) > 0)
+-			BN_copy(bnlow2, &bntmp2);
++		else if (BN_cmp(bntmp2, bnlow2) > 0)
++			BN_copy(bnlow2, bntmp2);
+ 	}
+ 
+-	if (BN_cmp(&bntmp2, bnhigh) > 0) {
++	if (BN_cmp(bntmp2, bnhigh) > 0) {
+ 		if (!check_upper)
+ 			goto not_possible;
+ 		check_upper = 0;
+@@ -924,26 +924,26 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 		bnlow = bnlow2;
+ 		bnlow2 = NULL;
+ 	}
+-	else if (BN_cmp(&bntmp2, bnlow) > 0) {
+-		BN_copy(bnlow, &bntmp2);
++	else if (BN_cmp(bntmp2, bnlow) > 0) {
++		BN_copy(bnlow, bntmp2);
+ 	}
+ 
+-	BN_set_word(&bntmp, addrtype + 1);
+-	BN_lshift(&bntmp2, &bntmp, 192);
++	BN_set_word(bntmp, addrtype + 1);
++	BN_lshift(bntmp2, bntmp, 192);
+ 
+ 	if (check_upper) {
+-		if (BN_cmp(&bntmp2, bnlow2) < 0) {
++		if (BN_cmp(bntmp2, bnlow2) < 0) {
+ 			check_upper = 0;
+ 			BN_free(bnhigh2);
+ 			bnhigh2 = NULL;
+ 			BN_free(bnlow2);
+ 			bnlow2 = NULL;
+ 		}
+-		else if (BN_cmp(&bntmp2, bnhigh2) < 0)
+-			BN_copy(bnlow2, &bntmp2);
++		else if (BN_cmp(bntmp2, bnhigh2) < 0)
++			BN_copy(bnlow2, bntmp2);
+ 	}
+ 
+-	if (BN_cmp(&bntmp2, bnlow) < 0) {
++	if (BN_cmp(bntmp2, bnlow) < 0) {
+ 		if (!check_upper)
+ 			goto not_possible;
+ 		check_upper = 0;
+@@ -954,8 +954,8 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 		bnlow = bnlow2;
+ 		bnlow2 = NULL;
+ 	}
+-	else if (BN_cmp(&bntmp2, bnhigh) < 0) {
+-		BN_copy(bnhigh, &bntmp2);
++	else if (BN_cmp(bntmp2, bnhigh) < 0) {
++		BN_copy(bnhigh, bntmp2);
+ 	}
+ 
+ 	/* Address ranges are complete */
+@@ -976,12 +976,12 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
+ 	}
+ 
+ out:
+-	BN_clear_free(&bntarg);
+-	BN_clear_free(&bnceil);
+-	BN_clear_free(&bnfloor);
+-	BN_clear_free(&bnbase);
+-	BN_clear_free(&bntmp);
+-	BN_clear_free(&bntmp2);
++	BN_clear_free(bntarg);
++	BN_clear_free(bnceil);
++	BN_clear_free(bnfloor);
++	BN_clear_free(bnbase);
++	BN_clear_free(bntmp);
++	BN_clear_free(bntmp2);
+ 	if (bnhigh)
+ 		BN_free(bnhigh);
+ 	if (bnlow)
+@@ -1266,7 +1266,7 @@ prefix_case_iter_next(prefix_case_iter_t *cip)
+ typedef struct _vg_prefix_context_s {
+ 	vg_context_t		base;
+ 	avl_root_t		vcp_avlroot;
+-	BIGNUM			vcp_difficulty;
++	BIGNUM			*vcp_difficulty;
+ 	int			vcp_caseinsensitive;
+ } vg_prefix_context_t;
+ 
+@@ -1294,7 +1294,7 @@ vg_prefix_context_clear_all_patterns(vg_context_t *vcp)
+ 	vcpp->base.vc_npatterns = 0;
+ 	vcpp->base.vc_npatterns_start = 0;
+ 	vcpp->base.vc_found = 0;
+-	BN_clear(&vcpp->vcp_difficulty);
++	BN_clear(vcpp->vcp_difficulty);
+ }
+ 
+ static void
+@@ -1302,7 +1302,7 @@ vg_prefix_context_free(vg_context_t *vcp)
+ {
+ 	vg_prefix_context_t *vcpp = (vg_prefix_context_t *) vcp;
+ 	vg_prefix_context_clear_all_patterns(vcp);
+-	BN_clear_free(&vcpp->vcp_difficulty);
++	BN_clear_free(vcpp->vcp_difficulty);
+ 	free(vcpp);
+ }
+ 
+@@ -1314,7 +1314,7 @@ vg_prefix_context_next_difficulty(vg_prefix_context_t *vcpp,
+ 
+ 	BN_clear(bntmp);
+ 	BN_set_bit(bntmp, 192);
+-	BN_div(bntmp2, NULL, bntmp, &vcpp->vcp_difficulty, bnctx);
++	BN_div(bntmp2, NULL, bntmp, vcpp->vcp_difficulty, bnctx);
+ 
+ 	dbuf = BN_bn2dec(bntmp2);
+ 	if (vcpp->base.vc_verbose > 0) {
+@@ -1337,7 +1337,7 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
+ 	prefix_case_iter_t caseiter;
+ 	vg_prefix_t *vp, *vp2;
+ 	BN_CTX *bnctx;
+-	BIGNUM bntmp, bntmp2, bntmp3;
++	BIGNUM *bntmp, *bntmp2, *bntmp3;
+ 	BIGNUM *ranges[4];
+ 	int ret = 0;
+ 	int i, impossible = 0;
+@@ -1346,9 +1346,9 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
+ 	char *dbuf;
+ 
+ 	bnctx = BN_CTX_new();
+-	BN_init(&bntmp);
+-	BN_init(&bntmp2);
+-	BN_init(&bntmp3);
++	bntmp = BN_new();
++	bntmp2 = BN_new();
++	bntmp3 = BN_new();
+ 
+ 	npfx = 0;
+ 	for (i = 0; i < npatterns; i++) {
+@@ -1426,16 +1426,16 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
+ 		npfx++;
+ 
+ 		/* Determine the probability of finding a match */
+-		vg_prefix_range_sum(vp, &bntmp, &bntmp2);
+-		BN_add(&bntmp2, &vcpp->vcp_difficulty, &bntmp);
+-		BN_copy(&vcpp->vcp_difficulty, &bntmp2);
++		vg_prefix_range_sum(vp, bntmp, bntmp2);
++		BN_add(bntmp2, vcpp->vcp_difficulty, bntmp);
++		BN_copy(vcpp->vcp_difficulty, bntmp2);
+ 
+ 		if (vcp->vc_verbose > 1) {
+-			BN_clear(&bntmp2);
+-			BN_set_bit(&bntmp2, 192);
+-			BN_div(&bntmp3, NULL, &bntmp2, &bntmp, bnctx);
++			BN_clear(bntmp2);
++			BN_set_bit(bntmp2, 192);
++			BN_div(bntmp3, NULL, bntmp2, bntmp, bnctx);
+ 
+-			dbuf = BN_bn2dec(&bntmp3);
++			dbuf = BN_bn2dec(bntmp3);
+ 			fprintf(stderr,
+ 				"Prefix difficulty: %20s %s\n",
+ 				dbuf, patterns[i]);
+@@ -1469,13 +1469,13 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
+ 	}
+ 
+ 	if (npfx)
+-		vg_prefix_context_next_difficulty(vcpp, &bntmp, &bntmp2, bnctx);
++		vg_prefix_context_next_difficulty(vcpp, bntmp, bntmp2, bnctx);
+ 
+ 	ret = (npfx != 0);
+ 
+-	BN_clear_free(&bntmp);
+-	BN_clear_free(&bntmp2);
+-	BN_clear_free(&bntmp3);
++	BN_clear_free(bntmp);
++	BN_clear_free(bntmp2);
++	BN_clear_free(bntmp3);
+ 	BN_CTX_free(bnctx);
+ 	return ret;
+ }
+@@ -1484,39 +1484,39 @@ double
+ vg_prefix_get_difficulty(int addrtype, const char *pattern)
+ {
+ 	BN_CTX *bnctx;
+-	BIGNUM result, bntmp;
++	BIGNUM *result, *bntmp;
+ 	BIGNUM *ranges[4];
+ 	char *dbuf;
+ 	int ret;
+ 	double diffret = 0.0;
+ 
+ 	bnctx = BN_CTX_new();
+-	BN_init(&result);
+-	BN_init(&bntmp);
++	result = BN_new();
++	bntmp = BN_new();
+ 
+ 	ret = get_prefix_ranges(addrtype,
+ 				pattern, ranges, bnctx);
+ 
+ 	if (ret == 0) {
+-		BN_sub(&bntmp, ranges[1], ranges[0]);
+-		BN_add(&result, &result, &bntmp);
++		BN_sub(bntmp, ranges[1], ranges[0]);
++		BN_add(result, result, bntmp);
+ 		if (ranges[2]) {
+-			BN_sub(&bntmp, ranges[3], ranges[2]);
+-			BN_add(&result, &result, &bntmp);
++			BN_sub(bntmp, ranges[3], ranges[2]);
++			BN_add(result, result, bntmp);
+ 		}
+ 		free_ranges(ranges);
+ 
+-		BN_clear(&bntmp);
+-		BN_set_bit(&bntmp, 192);
+-		BN_div(&result, NULL, &bntmp, &result, bnctx);
++		BN_clear(bntmp);
++		BN_set_bit(bntmp, 192);
++		BN_div(result, NULL, bntmp, result, bnctx);
+ 
+-		dbuf = BN_bn2dec(&result);
++		dbuf = BN_bn2dec(result);
+ 		diffret = strtod(dbuf, NULL);
+ 		OPENSSL_free(dbuf);
+ 	}
+ 
+-	BN_clear_free(&result);
+-	BN_clear_free(&bntmp);
++	BN_clear_free(result);
++	BN_clear_free(bntmp);
+ 	BN_CTX_free(bnctx);
+ 	return diffret;
+ }
+@@ -1535,10 +1535,10 @@ vg_prefix_test(vg_exec_context_t *vxcp)
+ 	 * check code.
+ 	 */
+ 
+-	BN_bin2bn(vxcp->vxc_binres, 25, &vxcp->vxc_bntarg);
++	BN_bin2bn(vxcp->vxc_binres, 25, vxcp->vxc_bntarg);
+ 
+ research:
+-	vp = vg_prefix_avl_search(&vcpp->vcp_avlroot, &vxcp->vxc_bntarg);
++	vp = vg_prefix_avl_search(&vcpp->vcp_avlroot, vxcp->vxc_bntarg);
+ 	if (vp) {
+ 		if (vg_exec_context_upgrade_lock(vxcp))
+ 			goto research;
+@@ -1558,20 +1558,20 @@ vg_prefix_test(vg_exec_context_t *vxcp)
+ 		if (vcpp->base.vc_remove_on_match) {
+ 			/* Subtract the range from the difficulty */
+ 			vg_prefix_range_sum(vp,
+-					    &vxcp->vxc_bntarg,
+-					    &vxcp->vxc_bntmp);
+-			BN_sub(&vxcp->vxc_bntmp,
+-			       &vcpp->vcp_difficulty,
+-			       &vxcp->vxc_bntarg);
+-			BN_copy(&vcpp->vcp_difficulty, &vxcp->vxc_bntmp);
++					    vxcp->vxc_bntarg,
++					    vxcp->vxc_bntmp);
++			BN_sub(vxcp->vxc_bntmp,
++			       vcpp->vcp_difficulty,
++			       vxcp->vxc_bntarg);
++			BN_copy(vcpp->vcp_difficulty, vxcp->vxc_bntmp);
+ 
+ 			vg_prefix_delete(&vcpp->vcp_avlroot,vp);
+ 			vcpp->base.vc_npatterns--;
+ 
+ 			if (!avl_root_empty(&vcpp->vcp_avlroot))
+ 				vg_prefix_context_next_difficulty(
+-					vcpp, &vxcp->vxc_bntmp,
+-					&vxcp->vxc_bntmp2,
++					vcpp, vxcp->vxc_bntmp,
++					vxcp->vxc_bntmp2,
+ 					vxcp->vxc_bnctx);
+ 			vcpp->base.vc_pattern_generation++;
+ 		}
+@@ -1652,7 +1652,7 @@ vg_prefix_context_new(int addrtype, int privtype, int caseinsensitive)
+ 		vcpp->base.vc_test = vg_prefix_test;
+ 		vcpp->base.vc_hash160_sort = vg_prefix_hash160_sort;
+ 		avl_root_init(&vcpp->vcp_avlroot);
+-		BN_init(&vcpp->vcp_difficulty);
++		vcpp->vcp_difficulty = BN_new();
+ 		vcpp->vcp_caseinsensitive = caseinsensitive;
+ 	}
+ 	return &vcpp->base;
+@@ -1778,21 +1778,21 @@ vg_regex_test(vg_exec_context_t *vxcp)
+ 	unsigned char hash1[32], hash2[32];
+ 	int i, zpfx, p, d, nres, re_vec[9];
+ 	char b58[40];
+-	BIGNUM bnrem;
++	BIGNUM *bnrem;
+ 	BIGNUM *bn, *bndiv, *bnptmp;
+ 	int res = 0;
+ 
+ 	pcre *re;
+ 
+-	BN_init(&bnrem);
++	bnrem = BN_new();
+ 
+ 	/* Hash the hash and write the four byte check code */
+ 	SHA256(vxcp->vxc_binres, 21, hash1);
+ 	SHA256(hash1, sizeof(hash1), hash2);
+ 	memcpy(&vxcp->vxc_binres[21], hash2, 4);
+ 
+-	bn = &vxcp->vxc_bntmp;
+-	bndiv = &vxcp->vxc_bntmp2;
++	bn = vxcp->vxc_bntmp;
++	bndiv = vxcp->vxc_bntmp2;
+ 
+ 	BN_bin2bn(vxcp->vxc_binres, 25, bn);
+ 
+@@ -1801,11 +1801,11 @@ vg_regex_test(vg_exec_context_t *vxcp)
+ 	p = sizeof(b58) - 1;
+ 	b58[p] = '\0';
+ 	while (!BN_is_zero(bn)) {
+-		BN_div(bndiv, &bnrem, bn, &vxcp->vxc_bnbase, vxcp->vxc_bnctx);
++		BN_div(bndiv, bnrem, bn, vxcp->vxc_bnbase, vxcp->vxc_bnctx);
+ 		bnptmp = bn;
+ 		bn = bndiv;
+ 		bndiv = bnptmp;
+-		d = BN_get_word(&bnrem);
++		d = BN_get_word(bnrem);
+ 		b58[--p] = vg_b58_alphabet[d];
+ 	}
+ 	while (zpfx--) {
+@@ -1878,7 +1878,7 @@ vg_regex_test(vg_exec_context_t *vxcp)
+ 		res = 1;
+ 	}
+ out:
+-	BN_clear_free(&bnrem);
++	BN_clear_free(bnrem);
+ 	return res;
+ }
+ 
+diff --git a/pattern.h b/pattern.h
+index 3ce2d1f..0b604ea 100644
+--- pattern.h
++++ pattern.h
+@@ -51,10 +51,10 @@ struct _vg_exec_context_s {
+ 	EC_KEY				*vxc_key;
+ 	int				vxc_delta;
+ 	unsigned char			vxc_binres[28];
+-	BIGNUM				vxc_bntarg;
+-	BIGNUM				vxc_bnbase;
+-	BIGNUM				vxc_bntmp;
+-	BIGNUM				vxc_bntmp2;
++	BIGNUM				*vxc_bntarg;
++	BIGNUM				*vxc_bnbase;
++	BIGNUM				*vxc_bntmp;
++	BIGNUM				*vxc_bntmp2;
+ 
+ 	vg_exec_context_threadfunc_t	vxc_threadfunc;
+ 	pthread_t			vxc_pthread;
+diff --git a/util.c b/util.c
+index 4f3cbb8..35cd592 100644
+--- util.c
++++ util.c
+@@ -110,19 +110,19 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
+ 
+ 	BN_CTX *bnctx;
+ 	BIGNUM *bn, *bndiv, *bntmp;
+-	BIGNUM bna, bnb, bnbase, bnrem;
++	BIGNUM *bna, *bnb, *bnbase, *bnrem;
+ 	unsigned char *binres;
+ 	int brlen, zpfx;
+ 
+ 	bnctx = BN_CTX_new();
+-	BN_init(&bna);
+-	BN_init(&bnb);
+-	BN_init(&bnbase);
+-	BN_init(&bnrem);
+-	BN_set_word(&bnbase, 58);
++	bna = BN_new();
++	bnb = BN_new();
++	bnbase = BN_new();
++	bnrem = BN_new();
++	BN_set_word(bnbase, 58);
+ 
+-	bn = &bna;
+-	bndiv = &bnb;
++	bn = bna;
++	bndiv = bnb;
+ 
+ 	brlen = (2 * len) + 4;
+ 	binres = (unsigned char*) malloc(brlen);
+@@ -154,11 +154,11 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
+ 
+ 	p = brlen;
+ 	while (!BN_is_zero(bn)) {
+-		BN_div(bndiv, &bnrem, bn, &bnbase, bnctx);
++		BN_div(bndiv, bnrem, bn, bnbase, bnctx);
+ 		bntmp = bn;
+ 		bn = bndiv;
+ 		bndiv = bntmp;
+-		d = BN_get_word(&bnrem);
++		d = BN_get_word(bnrem);
+ 		binres[--p] = vg_b58_alphabet[d];
+ 	}
+ 
+@@ -170,10 +170,10 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
+ 	result[brlen - p] = '\0';
+ 
+ 	free(binres);
+-	BN_clear_free(&bna);
+-	BN_clear_free(&bnb);
+-	BN_clear_free(&bnbase);
+-	BN_clear_free(&bnrem);
++	BN_clear_free(bna);
++	BN_clear_free(bnb);
++	BN_clear_free(bnbase);
++	BN_clear_free(bnrem);
+ 	BN_CTX_free(bnctx);
+ }
+ 
+@@ -185,7 +185,7 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
+ {
+ 	int i, l, c;
+ 	unsigned char *xbuf = NULL;
+-	BIGNUM bn, bnw, bnbase;
++	BIGNUM *bn, *bnw, *bnbase;
+ 	BN_CTX *bnctx;
+ 	unsigned char hash1[32], hash2[32];
+ 	unsigned char groestlhash1[64];
+@@ -193,10 +193,10 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
+ 	int zpfx;
+ 	int res = 0;
+ 
+-	BN_init(&bn);
+-	BN_init(&bnw);
+-	BN_init(&bnbase);
+-	BN_set_word(&bnbase, 58);
++	bn = BN_new();
++	bnw = BN_new();
++	bnbase = BN_new();
++	BN_set_word(bnbase, 58);
+ 	bnctx = BN_CTX_new();
+ 
+ 	/* Build a bignum from the encoded value */
+@@ -207,10 +207,10 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
+ 		c = vg_b58_reverse_map[(int)input[i]];
+ 		if (c < 0)
+ 			goto out;
+-		BN_clear(&bnw);
+-		BN_set_word(&bnw, c);
+-		BN_mul(&bn, &bn, &bnbase, bnctx);
+-		BN_add(&bn, &bn, &bnw);
++		BN_clear(bnw);
++		BN_set_word(bnw, c);
++		BN_mul(bn, bn, bnbase, bnctx);
++		BN_add(bn, bn, bnw);
+ 	}
+ 
+ 	/* Copy the bignum to a byte buffer */
+@@ -221,7 +221,7 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
+ 			break;
+ 		zpfx++;
+ 	}
+-	c = BN_num_bytes(&bn);
++	c = BN_num_bytes(bn);
+ 	l = zpfx + c;
+ 	if (l < 5)
+ 		goto out;
+@@ -231,7 +231,7 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
+ 	if (zpfx)
+ 		memset(xbuf, 0, zpfx);
+ 	if (c)
+-		BN_bn2bin(&bn, xbuf + zpfx);
++		BN_bn2bin(bn, xbuf + zpfx);
+ 
+ 	/* Check the hash code */
+ 	l -= 4;
+@@ -270,9 +270,9 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
+ out:
+ 	if (xbuf)
+ 		free(xbuf);
+-	BN_clear_free(&bn);
+-	BN_clear_free(&bnw);
+-	BN_clear_free(&bnbase);
++	BN_clear_free(bn);
++	BN_clear_free(bnw);
++	BN_clear_free(bnbase);
+ 	BN_CTX_free(bnctx);
+ 	return res;
+ }
+@@ -420,7 +420,7 @@ vg_set_privkey(const BIGNUM *bnpriv, EC_KEY *pkey)
+ int
+ vg_decode_privkey(const char *b58encoded, EC_KEY *pkey, int *addrtype)
+ {
+-	BIGNUM bnpriv;
++	BIGNUM *bnpriv;
+ 	unsigned char ecpriv[48];
+ 	int res, ret;
+ 
+@@ -430,10 +430,10 @@ vg_decode_privkey(const char *b58encoded, EC_KEY *pkey, int *addrtype)
+ 
+ 	ret = res - 32;
+ 
+-	BN_init(&bnpriv);
+-	BN_bin2bn(ecpriv + 1, 32, &bnpriv);
+-	res = vg_set_privkey(&bnpriv, pkey);
+-	BN_clear_free(&bnpriv);
++	bnpriv = BN_new();
++	BN_bin2bn(ecpriv + 1, 32, bnpriv);
++	res = vg_set_privkey(bnpriv, pkey);
++	BN_clear_free(bnpriv);
+ 	*addrtype = ecpriv[0];
+ 	return ret;
+ }
+@@ -632,15 +632,15 @@ vg_protect_crypt(int parameter_group,
+ 		salt_len = 4;
+ 		hmac_len = 8;
+ 		hmac_keylen = 16;
+-		ciphertext_len = ((plaintext_len + cipher->block_size - 1) /
+-				  cipher->block_size) * cipher->block_size;
++		ciphertext_len = ((plaintext_len + EVP_CIPHER_block_size(cipher) - 1) /
++				  EVP_CIPHER_block_size(cipher)) * EVP_CIPHER_block_size(cipher);
+ 		pkcs7_padding = 0;
+ 		hmac_digest = EVP_sha256();
+ 	} else {
+ 		/* PKCS-compliant encoding */
+ 		salt_len = 8;
+-		ciphertext_len = ((plaintext_len + cipher->block_size) /
+-				  cipher->block_size) * cipher->block_size;
++		ciphertext_len = ((plaintext_len + EVP_CIPHER_block_size(cipher)) /
++				  EVP_CIPHER_block_size(cipher)) * EVP_CIPHER_block_size(cipher);
+ 		hmac_digest = NULL;
+ 	}
+ 
+@@ -666,12 +666,12 @@ vg_protect_crypt(int parameter_group,
+ 			  salt, salt_len,
+ 			  params->iterations,
+ 			  pbkdf_digest,
+-			  cipher->key_len + cipher->iv_len + hmac_keylen,
++			  EVP_CIPHER_key_length(cipher) + EVP_CIPHER_iv_length(cipher) + hmac_keylen,
+ 			  keymaterial);
+ 
+ 	if (!EVP_CipherInit(ctx, cipher,
+ 			    keymaterial,
+-			    keymaterial + cipher->key_len,
++			    keymaterial + EVP_CIPHER_key_length(cipher),
+ 			    enc)) {
+ 		fprintf(stderr, "ERROR: could not configure cipher\n");
+ 		goto out;
+@@ -707,7 +707,7 @@ vg_protect_crypt(int parameter_group,
+ 	if (hmac_len) {
+ 		hlen = sizeof(hmac);
+ 		HMAC(hmac_digest,
+-		     keymaterial + cipher->key_len + cipher->iv_len,
++		     keymaterial + EVP_CIPHER_key_length(cipher) + EVP_CIPHER_iv_length(cipher),
+ 		     hmac_keylen,
+ 		     enc ? data_in : data_out, plaintext_len,
+ 		     hmac, &hlen);
+@@ -786,7 +786,7 @@ vg_protect_decode_privkey(EC_KEY *pkey, int *keytype,
+ {
+ 	unsigned char ecpriv[64];
+ 	unsigned char ecenc[128];
+-	BIGNUM bn;
++	BIGNUM *bn;
+ 	int restype;
+ 	int res;
+ 
+@@ -810,10 +810,10 @@ vg_protect_decode_privkey(EC_KEY *pkey, int *keytype,
+ 
+ 	res = 1;
+ 	if (pkey) {
+-		BN_init(&bn);
+-		BN_bin2bn(ecpriv, 32, &bn);
+-		res = vg_set_privkey(&bn, pkey);
+-		BN_clear_free(&bn);
++		bn = BN_new();
++		BN_bin2bn(ecpriv, 32, bn);
++		res = vg_set_privkey(bn, pkey);
++		BN_clear_free(bn);
+ 		OPENSSL_cleanse(ecpriv, sizeof(ecpriv));
+ 	}
+ 
+diff --git a/vanitygen.c b/vanitygen.c
+index fb7925a..992e5d7 100644
+--- vanitygen.c
++++ vanitygen.c
+@@ -94,8 +94,8 @@ vg_thread_loop(void *arg)
+ 		exit(1);
+ 	}
+ 
+-	BN_set_word(&vxcp->vxc_bntmp, ptarraysize);
+-	EC_POINT_mul(pgroup, pbatchinc, &vxcp->vxc_bntmp, NULL, NULL,
++	BN_set_word(vxcp->vxc_bntmp, ptarraysize);
++	EC_POINT_mul(pgroup, pbatchinc, vxcp->vxc_bntmp, NULL, NULL,
+ 		     vxcp->vxc_bnctx);
+ 	EC_POINT_make_affine(pgroup, pbatchinc, vxcp->vxc_bnctx);
+ 
+@@ -139,13 +139,13 @@ vg_thread_loop(void *arg)
+ 			npoints = 0;
+ 
+ 			/* Determine rekey interval */
+-			EC_GROUP_get_order(pgroup, &vxcp->vxc_bntmp,
++			EC_GROUP_get_order(pgroup, vxcp->vxc_bntmp,
+ 					   vxcp->vxc_bnctx);
+-			BN_sub(&vxcp->vxc_bntmp2,
+-			       &vxcp->vxc_bntmp,
++			BN_sub(vxcp->vxc_bntmp2,
++			       vxcp->vxc_bntmp,
+ 			       EC_KEY_get0_private_key(pkey));
+-			rekey_at = BN_get_word(&vxcp->vxc_bntmp2);
+-			if ((rekey_at == BN_MASK2) || (rekey_at > rekey_max))
++			rekey_at = BN_get_word(vxcp->vxc_bntmp2);
++			if ((rekey_at == 0xffffffffL) || (rekey_at > rekey_max))
+ 				rekey_at = rekey_max;
+ 			assert(rekey_at > 0);
+ 
diff --git a/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch b/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
new file mode 100644
index 000000000000..a289891f4db5
--- /dev/null
+++ b/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
@@ -0,0 +1,98 @@
+From 5f163e6fff7da52c4aecbd898d9df2e60a56f134 Mon Sep 17 00:00:00 2001
+From: DesWurstes <DesWurstes@users.noreply.github.com>
+Date: Sun, 3 Jun 2018 17:46:16 +0300
+Subject: [PATCH] Privkey prefix OpenSSL 1.1 compatibility (#116)
+
+Fixes #114
+---
+ oclengine.c | 18 +++++++++++++-----
+ vanitygen.c | 12 ++++++++++--
+ 2 files changed, 23 insertions(+), 7 deletions(-)
+
+diff --git a/oclengine.c b/oclengine.c
+index 6585fc6..c69bd4b 100644
+--- oclengine.c
++++ oclengine.c
+@@ -5,7 +5,7 @@
+  * Vanitygen is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Affero General Public License as published by
+  * the Free Software Foundation, either version 3 of the License, or
+- * any later version. 
++ * any later version.
+  *
+  * Vanitygen is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+@@ -1058,7 +1058,7 @@ vg_ocl_kernel_arg_alloc(vg_ocl_context_t *vocp, int slot,
+ 					     karg,
+ 					     sizeof(clbuf),
+ 					     &clbuf);
+-			
++
+ 			if (ret) {
+ 				fprintf(stderr,
+ 					"clSetKernelArg(%d,%d): ", knum, karg);
+@@ -1090,7 +1090,7 @@ vg_ocl_copyout_arg(vg_ocl_context_t *vocp, int wslot, int arg,
+ 				   buffer,
+ 				   0, NULL,
+ 				   NULL);
+-			
++
+ 	if (ret) {
+ 		fprintf(stderr, "clEnqueueWriteBuffer(%d): ", arg);
+ 		vg_ocl_error(vocp, ret, NULL);
+@@ -2079,7 +2079,15 @@ vg_opencl_loop(vg_exec_context_t *arg)
+ 	npoints = 0;
+ 	if (vcp->vc_privkey_prefix_length > 0) {
+ 		BIGNUM *pkbn = BN_dup(EC_KEY_get0_private_key(pkey));
+-		memcpy((char *)pkbn->d + 32 - vcp->vc_privkey_prefix_length, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
++		unsigned char pkey_arr[32];
++		assert(BN_bn2bin(pkbn, pkey_arr) < 33);
++		memcpy((char *) pkey_arr, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
++		for (int i = 0; i < vcp->vc_privkey_prefix_length / 2; i++) {
++			int k = pkey_arr[i];
++			pkey_arr[i] = pkey_arr[vcp->vc_privkey_prefix_length - 1 - i];
++			pkey_arr[vcp->vc_privkey_prefix_length - 1 - i] = k;
++		}
++		BN_bin2bn(pkey_arr, 32, pkbn);
+ 		EC_KEY_set_private_key(pkey, pkbn);
+ 
+ 		EC_POINT *origin = EC_POINT_new(pgroup);
+@@ -2240,7 +2248,7 @@ vg_opencl_loop(vg_exec_context_t *arg)
+ 			slot_busy = 1;
+ 			slot = (slot + 1) % nslots;
+ 
+-		} else { 
++		} else {
+ 			if (slot_busy) {
+ 				pthread_mutex_lock(&vocp->voc_lock);
+ 				while (vocp->voc_ocl_slot != -1) {
+diff --git a/vanitygen.c b/vanitygen.c
+index 992e5d7..5e49df7 100644
+--- vanitygen.c
++++ vanitygen.c
+@@ -129,7 +129,15 @@ vg_thread_loop(void *arg)
+ 			EC_KEY_generate_key(pkey);
+ 			if (vcp->vc_privkey_prefix_length > 0) {
+ 				BIGNUM *pkbn = BN_dup(EC_KEY_get0_private_key(pkey));
+-				memcpy((char *)pkbn->d + 32 - vcp->vc_privkey_prefix_length, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
++        unsigned char pkey_arr[32];
++        assert(BN_bn2bin(pkbn, pkey_arr) < 33);
++        memcpy((char *) pkey_arr, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
++				for (int i = 0; i < vcp->vc_privkey_prefix_length / 2; i++) {
++					int k = pkey_arr[i];
++					pkey_arr[i] = pkey_arr[vcp->vc_privkey_prefix_length - 1 - i];
++					pkey_arr[vcp->vc_privkey_prefix_length - 1 - i] = k;
++				}
++        BN_bin2bn(pkey_arr, 32, pkbn);
+ 				EC_KEY_set_private_key(pkey, pkbn);
+ 
+ 				EC_POINT *origin = EC_POINT_new(pgroup);
+@@ -1395,7 +1403,7 @@ main(int argc, char **argv)
+ 					addrtype = 60;
+ 					privtype = 128;
+ 					break;
+-			}			
++			}
+ 			break;
+ 
+ /*END ALTCOIN GENERATOR*/
diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 5bb6f9c4bde8..21cdeac96a92 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,17 +1,16 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
-version=0.22
-revision=3
-_commit=9e04497a127aa6413463ccf4a4aee75f0d581d92
-wrksrc="vanitygen-${_commit}"
+version=1.53
+revision=1
+wrksrc="vanitygen-plus-PLUS${version}"
 makedepends="pcre-devel libressl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
-homepage="https://github.com/samr7/vanitygen"
-changelog="https://raw.githubusercontent.com/samr7/vanitygen/master/CHANGELOG"
-distfiles="https://github.com/samr7/vanitygen/archive/${_commit}.tar.gz"
-checksum=cf81e1eb4c81a3dcf86ab681ef1ad9229702ad8b00d1367462f396718b13d1fc
+homepage="https://github.com/exploitagency/vanitygen-plus"
+changelog="https://raw.githubusercontent.com/exploitagency/vanitygen-plus/master/CHANGELOG"
+distfiles="https://github.com/exploitagency/vanitygen-plus/archive/PLUS${version}.tar.gz"
+checksum=976a9afe2a4470551a8b6b0da97101a3a2e6c54c5a26dc870ae755bb2d8c7041
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From ad1755c7f8128c4efd50326dae019039c04e5149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:11:30 -0300
Subject: [PATCH 1565/3458] srcpkgs/: remove go from hostmakedepends for
 packages with build_style=go.

---
 srcpkgs/darch/template     | 2 +-
 srcpkgs/docker/template    | 2 +-
 srcpkgs/git-lfs/template   | 2 +-
 srcpkgs/yggdrasil/template | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 238eebd3158c..161af0a666b1 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -7,7 +7,7 @@ build_style=go
 go_import_path=github.com/godarch/darch
 conf_files="/etc/darch/hooks/ssh/hook /etc/darch/hooks/hostname/hook /etc/darch/hooks/fstab/hook"
 make_dirs="/var/lib/darch 0755 root root"
-hostmakedepends="git go"
+hostmakedepends="git"
 depends="containerd"
 short_desc="Tool for building/booting stateless and immutable images, bare metal"
 maintainer="Paul Knopf <pauldotknopf@gmail.com>"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index ec79c20b11a7..e0830515a33e 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -4,7 +4,7 @@ version=19.03.15
 revision=1
 create_wrksrc=yes
 build_style=go
-hostmakedepends="go pkg-config cmake tar"
+hostmakedepends="pkg-config cmake tar"
 makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
  libapparmor-devel libltdl-devel"
 depends="containerd runc"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 8a4c8af65b39..588d7fe9aa3f 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -4,7 +4,7 @@ version=2.12.1
 revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="go git ruby-ronn"
+hostmakedepends="git ruby-ronn"
 short_desc="Git extension for versioning large files"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b9e6246b1cd5..74c3c32537e0 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="yggdrasil-go-${version}"
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="go git"
+hostmakedepends="git"
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="LGPL-3.0-only"

From e487d230fb0b0b84a0e8f4633f3696c7b5174fb9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 14 Feb 2021 08:42:56 +0100
Subject: [PATCH 1566/3458] meld: update to 3.20.3.

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

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index ea135d7c2dee..f861e382184a 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,7 +1,7 @@
 # Template file for 'meld'
 pkgname=meld
-version=3.20.2
-revision=3
+version=3.20.3
+revision=1
 build_style=python3-module
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool python3 itstool gtk-update-icon-cache libxml2-python3"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://meldmerge.org/"
 distfiles="${GNOME_SITE}/meld/${version%.*}/meld-${version}.tar.xz"
-checksum=ac0985f986ca44c25927ca31ac4d75b60f1f5f1a9e439bc1f3828ffc4d091d28
+checksum=f0e32b29bdb3aeb10060265042fd3541b1ecd38410c87a40b1456ef8d416051a
 
 post_install() {
 	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \

From cddc3ed96a8699d6ff3e484d89f547fe68e1e23e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 14 Feb 2021 08:47:06 +0100
Subject: [PATCH 1567/3458] linux5.4: update to 5.4.98.

---
 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 75d8e5d8d534..fda74484e494 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.97
+version=5.4.98
 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=71a866100a630fbc66d24770f932feb121dd764c0bb95a88c0a00e3cb629483f
+checksum=83a248d6fbe388f133769d736f36b754767abc9d66f1c034b537ad778fbd46b1
 python_version=3
 patch_args="-Np1"
 

From f1f3afbd22a25965da3cbeb2e2f7568fc65498d5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 14 Feb 2021 08:48:52 +0100
Subject: [PATCH 1568/3458] linux4.19: update to 4.19.176.

---
 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 e21433f132ad..c5c83ab3ff17 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.175
+version=4.19.176
 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=ccee4b84ff2b16ad438e013bd211efea12f14e69f7cadb0e095fc89c781b2b25
+checksum=e1c3b8d21ba31bd5c50bb3b2a741f62958eb2a116bf13fa0e14f1656c4826073
 python_version=2 #unverified
 patch_args="-Np1"
 

From 0248396565d8abd9ca74626b87d9cde34a7842e7 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, 14 Feb 2021 17:06:37 +0700
Subject: [PATCH 1569/3458] gcab: build gir

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

diff --git a/srcpkgs/gcab/template b/srcpkgs/gcab/template
index dbc3d55ebbc9..671cd5839393 100644
--- a/srcpkgs/gcab/template
+++ b/srcpkgs/gcab/template
@@ -1,11 +1,12 @@
 # Template file for 'gcab'
 pkgname=gcab
 version=1.4
-revision=1
+revision=2
 build_style=meson
-configure_args="-Dintrospection=false -Ddocs=false"
-hostmakedepends="git glib-devel intltool pkg-config"
-makedepends="glib-devel"
+build_helper=gir
+configure_args="$(vopt_bool gir introspection) -Ddocs=false"
+hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
+makedepends="libglib-devel $(vopt_if gir vala)"
 short_desc="GObject library to create cabinet files"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -13,6 +14,10 @@ homepage="https://wiki.gnome.org/msitools"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
 checksum=67a5fa9be6c923fbc9197de6332f36f69a33dadc9016a2b207859246711c048f
 
+build_options="gir"
+build_options_default="gir"
+
+
 gcab-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} glib-devel"
 	short_desc+=" - development files"
@@ -20,5 +25,9 @@ gcab-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 	}
 }

From 07ef2e36066df1e6b17f1fa523071e3af84fd87b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 14 Feb 2021 13:57:43 +0100
Subject: [PATCH 1570/3458] vim: update to 8.2.2513.

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

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 3e40e60ce636..c1769a552d34 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,6 +1,6 @@
 # Template file for 'vim'
 pkgname=vim
-version=8.2.1948
+version=8.2.2513
 revision=1
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel gtk+3-devel libXt-devel lua53-devel ncurses-devel
@@ -11,7 +11,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="Vim"
 homepage="https://www.vim.org"
 distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=7f868ab36bd1a7f56e68366d7c767239b30c49beddb725c4b254cf95cf8b7dda
+checksum=de00136dd5f5194d15717bab449bf04baaa3a8c5efa8547da878514e50879b36
 python_version=3
 
 subpackages="xxd vim-common vim-x11 gvim"

From 9c41ae03cbaa28668fd01c652479ae2747192afa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 14 Feb 2021 14:01:49 +0100
Subject: [PATCH 1571/3458] maildrop: update to 3.0.2.

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

diff --git a/srcpkgs/maildrop/template b/srcpkgs/maildrop/template
index f33fba05893c..45a0ece46ce4 100644
--- a/srcpkgs/maildrop/template
+++ b/srcpkgs/maildrop/template
@@ -1,6 +1,6 @@
 # Template file for 'maildrop'
 pkgname=maildrop
-version=3.0.1
+version=3.0.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-maildrop-uid= --enable-maildrop-gid=
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.courier-mta.org/maildrop/"
 distfiles="${SOURCEFORGE_SITE}/courier/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=5d0c3643ebfd45a31335dcabc09d014388476db3da329ab9cd5e5dd2aa484a7e
+checksum=0b53d93da9851e520d218dce07c94c79754893a2f80de1036eebaa85cb2bd597

From 58575cc10fedbdde2350b4f6b581f36f092a29b0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 14 Feb 2021 14:03:11 +0100
Subject: [PATCH 1572/3458] stress-ng: update to 0.12.03.

---
 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 010b901b2e4a..03de2662bf92 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.02
+version=0.12.03
 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=f847be115f60d3ad7d37c806fd1bfb1412aa3c631fca581d6dc233322f50d6a5
+checksum=f27ff439b76a17641291d4234c73655cddcb0a5a588441d6ade290b06ca4b805

From 1d4fe5edd9baadd90acba21a6001c6bddab0b2a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Feb 2021 00:22:11 +0100
Subject: [PATCH 1573/3458] tlsdate: remove package

---
 srcpkgs/removed-packages/template             |  1 +
 srcpkgs/tlsdate/files/tlsdated/run            |  2 -
 .../tlsdate/patches/libressl-no-sslv3.patch   | 57 -------------------
 .../tlsdate/patches/libressl-sslstate.patch   | 11 ----
 srcpkgs/tlsdate/patches/sandbox.patch         | 27 ---------
 srcpkgs/tlsdate/template                      | 34 -----------
 6 files changed, 1 insertion(+), 131 deletions(-)
 delete mode 100755 srcpkgs/tlsdate/files/tlsdated/run
 delete mode 100644 srcpkgs/tlsdate/patches/libressl-no-sslv3.patch
 delete mode 100644 srcpkgs/tlsdate/patches/libressl-sslstate.patch
 delete mode 100644 srcpkgs/tlsdate/patches/sandbox.patch
 delete mode 100644 srcpkgs/tlsdate/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1c869a6950fc..b97af9661287 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -217,6 +217,7 @@ replaces="
  spacefm-ng<=1.0.6_3
  sqlite-replication<=3.32.3_2
  tagainijisho<=1.0.3_1
+ tlsdate<=0.0.13_16
  ttyload-git<=20141117_4
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
diff --git a/srcpkgs/tlsdate/files/tlsdated/run b/srcpkgs/tlsdate/files/tlsdated/run
deleted file mode 100755
index 5ef7326d15d9..000000000000
--- a/srcpkgs/tlsdate/files/tlsdated/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec tlsdated 2>/dev/null
diff --git a/srcpkgs/tlsdate/patches/libressl-no-sslv3.patch b/srcpkgs/tlsdate/patches/libressl-no-sslv3.patch
deleted file mode 100644
index 3865f71c2cbd..000000000000
--- a/srcpkgs/tlsdate/patches/libressl-no-sslv3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- src/tlsdate.c.orig	2016-03-30 23:41:39.121031885 +0200
-+++ src/tlsdate.c	2016-03-30 23:41:49.442032351 +0200
-@@ -88,7 +88,7 @@
-            " [-n|--dont-set-clock]\n"
-            " [-H|--host] [hostname|ip]\n"
-            " [-p|--port] [port number]\n"
--           " [-P|--protocol] [sslv23|sslv3|tlsv1]\n"
-+           " [-P|--protocol] [sslv23|tlsv1]\n"
-            " [-C|--certcontainer] [dirname|filename]\n"
-            " [-v|--verbose]\n"
-            " [-V|--showtime] [human|raw]\n"
---- man/tlsdate.1.orig	2016-03-30 23:42:18.100033647 +0200
-+++ man/tlsdate.1	2016-03-30 23:42:35.659034441 +0200
-@@ -5,7 +5,7 @@
- .SH NAME
- tlsdate \- secure parasitic rdate replacement
- .SH SYNOPSIS
--.B tlsdate [\-hnvVstlw] [\-H [hostname]] [\-p [port]] [\-P [sslv23|sslv3|tlsv1]] \
-+.B tlsdate [\-hnvVstlw] [\-H [hostname]] [\-p [port]] [\-P [sslv23|tlsv1]] \
- [\-\-certdir [dirname]] [\-x [\-\-proxy] proxy\-type://proxyhost:proxyport]
- .SH DESCRIPTION
- .B tlsdate
-@@ -30,7 +30,7 @@
- Do not set the system clock to the time of the remote server
- .IP "\-p | \-\-port [port]"
- Set remote port (default: '443')
--.IP "\-P | \-\-protocol [sslv23|sslv3|tlsv1]"
-+.IP "\-P | \-\-protocol [sslv23|tlsv1]"
- Set protocol to use when communicating with server (default: 'tlsv1')
- .IP "\-C | \-\-certdir [dirname]"
- Set the local directory where certificates are located
---- src/tlsdate-helper-plan9.c.orig	2016-03-30 23:43:12.577036110 +0200
-+++ src/tlsdate-helper-plan9.c	2016-03-30 23:43:32.403037006 +0200
-@@ -978,10 +978,6 @@
-   {
-     verb ("V: using SSLv23_client_method()\n");
-     ctx = SSL_CTX_new(SSLv23_client_method());
--  } else if (0 == strcmp("sslv3", protocol))
--  {
--    verb ("V: using SSLv3_client_method()\n");
--    ctx = SSL_CTX_new(SSLv3_client_method());
-   } else if (0 == strcmp("tlsv1", protocol))
-   {
-     verb ("V: using TLSv1_client_method()\n");
---- src/tlsdate-helper.c.orig	2016-03-30 23:33:02.056008510 +0200
-+++ src/tlsdate-helper.c	2016-03-30 23:34:46.400013227 +0200
-@@ -1133,10 +1133,6 @@
-   {
-     verb ("V: using SSLv23_client_method()");
-     ctx = SSL_CTX_new(SSLv23_client_method());
--  } else if (0 == strcmp("sslv3", protocol))
--  {
--    verb ("V: using SSLv3_client_method()");
--    ctx = SSL_CTX_new(SSLv3_client_method());
-   } else if (0 == strcmp("tlsv1", protocol))
-   {
-     verb ("V: using TLSv1_client_method()");
diff --git a/srcpkgs/tlsdate/patches/libressl-sslstate.patch b/srcpkgs/tlsdate/patches/libressl-sslstate.patch
deleted file mode 100644
index 5207753222bc..000000000000
--- a/srcpkgs/tlsdate/patches/libressl-sslstate.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tlsdate-helper.c.orig
-+++ src/tlsdate-helper.c
-@@ -374,7 +374,7 @@
- openssl_time_callback (const SSL* ssl, int where, int ret)
- {
-   if (where == SSL_CB_CONNECT_LOOP &&
--      (ssl->state == SSL3_ST_CR_SRVR_HELLO_A || ssl->state == SSL3_ST_CR_SRVR_HELLO_B))
-+      (SSL_state(ssl) == SSL3_ST_CR_SRVR_HELLO_A || SSL_state(ssl) == SSL3_ST_CR_SRVR_HELLO_B))
-   {
-     // XXX TODO: If we want to trust the remote system for time,
-     // can we just read that time out of the remote system and if the
diff --git a/srcpkgs/tlsdate/patches/sandbox.patch b/srcpkgs/tlsdate/patches/sandbox.patch
deleted file mode 100644
index f5afd54f28d6..000000000000
--- a/srcpkgs/tlsdate/patches/sandbox.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/seccomp.c.orig	2018-12-20 16:56:30.070932156 +0100
-+++ src/seccomp.c	2018-12-20 16:57:19.849670660 +0100
-@@ -43,6 +43,14 @@
- #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386
- #elif defined(__x86_64__)
- #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64
-+#elif defined(__aarch64__)
-+#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_AARCH64
-+#elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)
-+#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
-+#elif defined(__powerpc64__)
-+#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+#elif defined(__powerpc__)
-+#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
- #elif defined(__arm__)
- # ifndef EM_ARM
- #   define EM_ARM 40
-@@ -87,7 +89,9 @@
-     SC_ALLOW (exit_group),
-     SC_ALLOW (exit),
- 
-+#ifdef __NR_open
-     SC_DENY (open, EINVAL),
-+#endif
-     SC_DENY (fcntl, EINVAL),
-     SC_DENY (fstat, EINVAL),
- #ifdef __NR_mmap
diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
deleted file mode 100644
index ccdbef1a5d74..000000000000
--- a/srcpkgs/tlsdate/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'tlsdate'
-pkgname=tlsdate
-version=0.0.13
-revision=15
-wrksrc="${pkgname}-${pkgname}-${version}"
-build_style=gnu-configure
-configure_args="--with-polarssl=no ac_cv_func_clock_gettime=yes"
-conf_files="/etc/tlsdate/tlsdated.conf"
-make_dirs="/var/cache/tlsdated 0755 root root"
-hostmakedepends="automake pkg-config libtool"
-makedepends="libressl-devel dbus-devel libevent-devel"
-depends="ca-certificates"
-short_desc="Secure parasitic rdate replacement using HTTPS"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/ioerror/tlsdate"
-distfiles="https://github.com/ioerror/tlsdate/archive/${pkgname}-${version}.tar.gz"
-checksum=90efdff87504b5159cb6a3eefa9ddd43723c073d49c4b3febba9e48fc1292bf9
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	# use system certs
-	sed -i Makefile.am \
-		-e 's|/tlsdate/ca-roots/tlsdate-ca-roots.conf|/ssl/certs/ca-certificates.crt|'
-	sh ./autogen.sh
-}
-
-post_install() {
-	vlicense LICENSE
-	rm ${DESTDIR}/etc/tlsdate/ca-roots/tlsdate-ca-roots.conf
-	rm ${DESTDIR}/usr/share/doc/${pkgname}/{TODO,LICENSE}
-	vsv tlsdated
-}

From 9c300102717c1caad5a782f39e47d20b55c5e631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Feb 2021 01:44:55 -0300
Subject: [PATCH 1574/3458] tvbrowser: depends on openjdk11.

It is possible to depend on `java-runtime>=11`, but only if the
openjdk11 package has already been built. Until xbps-src has a mechanism
for dealing with this, and while openjdk11 is our latest java runtime,
depending directly on openjdk11 works fine.
---
 srcpkgs/tvbrowser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvbrowser/template b/srcpkgs/tvbrowser/template
index 5619ce740a27..3810d4859285 100644
--- a/srcpkgs/tvbrowser/template
+++ b/srcpkgs/tvbrowser/template
@@ -1,8 +1,8 @@
 # Template file for 'tvbrowser'
 pkgname=tvbrowser
 version=4.2.1
-revision=2
-depends="java-runtime>=11 hicolor-icon-theme bash"
+revision=3
+depends="openjdk11 hicolor-icon-theme bash" # XXX: openjdk11 or later version, when available
 short_desc="Ad free open source TV guide for more than 1000 channels"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="GPL-3.0-or-later, GPL-2.0-or-later, LPPL-1.0, Apache-2.0, LGPL-2.1-or-later, custom:other"

From 3b90863496de841991927befb56546c10d85f306 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 14 Feb 2021 18:18:39 +0100
Subject: [PATCH 1575/3458] yturl: remove package

Doesn't work anymore, unmaintained and unsupported since 2020. Developer advises to switch to youtube-dl.
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/yturl/template            | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 srcpkgs/yturl/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index b97af9661287..6b46ebfdb11e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -231,6 +231,7 @@ replaces="
  xlennart<=1.1.1_1
  xnoise<=0.2.21_4
  xnoise-devel<=0.2.21_4
+ yturl<=2.0.2_5
  yt-play<=20140117_2
  nvidia340<=340.108_4
  nvidia340-dkms<=340.108_4
diff --git a/srcpkgs/yturl/template b/srcpkgs/yturl/template
deleted file mode 100644
index 138684c88316..000000000000
--- a/srcpkgs/yturl/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'yturl'
-pkgname=yturl
-version=2.0.2
-revision=5
-build_style=python3-module
-hostmakedepends="python3-setuptools texinfo"
-depends="python3-setuptools python3-requests python3-six"
-short_desc="YouTube videos on the command line"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="Public Domain"
-homepage="https://github.com/cdown/yturl"
-distfiles="https://github.com/cdown/yturl/archive/${version}.tar.gz"
-checksum=0fb50a9cf7137a95eaa4df34c6a35944eb0a8baacfc04436c9644e968a6604a3

From c58c217557122a4cd356a780a36c55cf40532f8a Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 14 Feb 2021 20:12:27 +0300
Subject: [PATCH 1576/3458] gallery-dl: update to 1.16.5

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

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 1a761809852f..3630b3f141dc 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.4
+version=1.16.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ 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="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
-checksum=92b774e1406b35940861d9bc53f47ace7a096e60410b98560652688c61d8653c
+checksum=96217375bb95b76af628c2d9d917cd2a8ade38857f70ceecd7021ae12cbf48b3
 
 do_check() {
 	make test

From 9667e06bbd8b327fef6f26fa9146a471e460cc86 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 12 Feb 2021 12:59:12 +0100
Subject: [PATCH 1577/3458] catgirl: update to 1.6

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

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 24967a8c1f04..4a93282dc541 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,6 +1,6 @@
 # Template file for 'catgirl'
 pkgname=catgirl
-version=1.5
+version=1.6
 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=bea9fd47a55ad624113cec71c758427f485b841d92da59dbe9bfed4ef5c08c7c
+checksum=3b32ee3b57cab5fa29b0a6cb9d21a4a5e5f41efd4a698cb9df15e316bf000f6a

From bb3843db156f3a774b01ddc4e879e61c903ca142 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 1 Feb 2021 15:26:09 +0100
Subject: [PATCH 1578/3458] hub: add vim config files

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

diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 9865d359fd26..6d27860df0ef 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"
@@ -47,4 +47,10 @@ post_install() {
 	vinstall etc/hub.zsh_completion 644 usr/share/zsh/site-functions _hub
 	vinstall etc/hub.bash_completion.sh 644 usr/share/bash-completion/completions hub
 	vinstall etc/hub.fish_completion 644 usr/share/fish/vendor_completions.d hub.fish
+	for i in share/vim/vimfiles/*/pullrequest.vim; do
+		dir="${i%/*}"
+		vinstall "$i" 644 "usr/$dir"
+		vmkdir "usr/${dir/vim/nvim}"
+		ln -sr "$DESTDIR/usr/${i}" "$DESTDIR/usr/${i/vim/nvim}"
+	done
 }

From d23662ef2f256438b91b093cf7f78cfc2d8dc5f7 Mon Sep 17 00:00:00 2001
From: Laurence de Bruxelles <lfdebrux@gmail.com>
Date: Tue, 9 Feb 2021 20:43:54 +0000
Subject: [PATCH 1579/3458] micropython: update to 1.14.

Additionally, use nopie on arm*-musl, otherwise the resulting binary
contains text relocations, which aren't supported by musl.

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

diff --git a/srcpkgs/micropython/template b/srcpkgs/micropython/template
index 5c88d5e399f3..b3501120e458 100644
--- a/srcpkgs/micropython/template
+++ b/srcpkgs/micropython/template
@@ -1,6 +1,6 @@
 # Template file for 'micropython'
 pkgname=micropython
-version=1.13
+version=1.14
 revision=1
 build_wrksrc=ports/unix
 hostmakedepends="pkg-config python3"
@@ -9,10 +9,11 @@ short_desc="Implementation of Python 3.x for microcontrollers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://micropython.org/"
-distfiles="https://github.com/micropython/micropython/releases/download/v${version}/micropython-${version}.tar.gz"
-checksum=9ab32eb2c19a682f6de7e9b4226de849c42cb92e1ecb4cf56438a75d763bd451
+distfiles="https://github.com/micropython/micropython/releases/download/v${version}/micropython-${version}.tar.xz"
+checksum=97306156fdeab120a1244626c75a929bb820722afdfc1317dbd5dadef388d94c
 
 case "$XBPS_TARGET_MACHINE" in
+	arm*-musl) nopie=yes ;; # building with PIE creates text relocations in the binary
 	ppc*) broken="missing nlr_push" ;;
 esac
 

From 982abf3ea2500d4c642dd846649c55a9a928659c Mon Sep 17 00:00:00 2001
From: "Jiang Meng Liao (Faerryn)" <alexandre.liao@gmail.com>
Date: Sun, 14 Feb 2021 01:07:34 -0500
Subject: [PATCH 1580/3458] wine-mono: update to 6.0.0

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

diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 4b43744ff075..da8a3e647f7a 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=5.1.1
+version=6.0.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later, LGPL-2.0-or-later"
 homepage="https://wiki.winehq.org/Mono"
 distfiles="http://dl.winehq.org/wine/wine-mono/${version}/${pkgname}-${version}-x86.msi"
-checksum=74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227
+checksum=5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From 6bf1c3de5d151feb0c21110204ee0fc9628c96e7 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 13 Feb 2021 15:27:01 +0100
Subject: [PATCH 1581/3458] yabasic: update to 2.89.1, fix license

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

diff --git a/srcpkgs/yabasic/template b/srcpkgs/yabasic/template
index c06e991d7749..b9e51fe313c6 100644
--- a/srcpkgs/yabasic/template
+++ b/srcpkgs/yabasic/template
@@ -1,17 +1,17 @@
 # Template file for 'yabasic'
 pkgname=yabasic
 reverts="2.769_1"
-version=2.87.1
+version=2.89.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXt-devel ncurses-devel libffi-devel"
 short_desc="Yet another Basic"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="MIT, GPL-3.0-or-later"
+license="MIT"
 homepage="https://2484.de/yabasic/"
 distfiles="https://2484.de/yabasic/download/yabasic-${version}.tar.gz"
-checksum=432f912d80ca00ae00a93ede197d45fde4db1345a61dc42976d10f2b7f9e1dce
+checksum=93c426402a6cccbca8b448960eb1bcefc44cdb0a92abb2385bd8fa67651bdd88
 
 do_install() {
 	vbin yabasic

From 1c5bc7123cdf2f6ca63326ff18646bd3abc09a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 14 Feb 2021 16:56:05 -0300
Subject: [PATCH 1582/3458] Manual.md: link deps_runtime section when referring
 to it.

---
 Manual.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index acd23a32b426..86dfeff6103e 100644
--- a/Manual.md
+++ b/Manual.md
@@ -481,7 +481,8 @@ in the local repository exists to satisfy the required version. Dependencies
 can be specified with the following version comparators: `<`, `>`, `<=`, `>=`
 or `foo-1.0_1` to match an exact version. If version comparator is not
 defined (just a package name), the version comparator is automatically set to `>=0`.
-Example: `depends="foo blah>=1.0"`. See the `Runtime dependencies` section for more information.
+Example: `depends="foo blah>=1.0"`. See the [Runtime dependencies](#deps_runtime) section
+for more information.
 
 - `bootstrap` If enabled the source package is considered to be part of the `bootstrap`
 process and required to be able to build packages in the chroot. Only a

From 081a590ba46baa2af9b58bd2a5575295e97ba460 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 13 Feb 2021 15:15:42 +0100
Subject: [PATCH 1583/3458] ratpoison: update website and license

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

diff --git a/srcpkgs/ratpoison/template b/srcpkgs/ratpoison/template
index 8e58489a2421..32951572c4b4 100644
--- a/srcpkgs/ratpoison/template
+++ b/srcpkgs/ratpoison/template
@@ -9,8 +9,8 @@ makedepends="libICE-devel libXft-devel libXinerama-devel libXrandr-devel
 depends="perl"
 short_desc="Window manager without mouse dependency"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
-homepage="http://savannah.nongnu.org/download/ratpoison/"
+license="GPL-2.0-only"
+homepage="https://www.nongnu.org/ratpoison/"
 distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=d98fa4be025ecca453c407ff311ab3949f29f20d6d8abedf8f0716b85fc8d1f1
 

From 6e90c4f51d6b7d86da627b9c7d3666e8d121ad08 Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Sun, 14 Feb 2021 18:47:53 +0200
Subject: [PATCH 1584/3458] googler: update to 4.3.2

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

diff --git a/srcpkgs/googler/template b/srcpkgs/googler/template
index a08bc4d79396..30596b211f84 100644
--- a/srcpkgs/googler/template
+++ b/srcpkgs/googler/template
@@ -1,6 +1,6 @@
 # Template file for 'googler'
 pkgname=googler
-version=4.3.1
+version=4.3.2
 revision=1
 build_style=gnu-makefile
 make_build_target=disable-self-upgrade
@@ -10,7 +10,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/googler"
 distfiles="https://github.com/jarun/googler/archive/v${version}.tar.gz"
-checksum=f756182ed383050cbdaac8ee4f02c904ca26f76a727f3ec58cc8ab6a8cba3f23
+checksum=bd59af407e9a45c8a6fcbeb720790cb9eccff21dc7e184716a60e29f14c68d54
 
 post_install() {
 	vinstall auto-completion/bash/googler-completion.bash 644 /usr/share/bash-completion/completions/googler

From 13a910d2cbc58ba231178ca9d9bb979e6ef21313 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 13 Feb 2021 16:59:33 -0800
Subject: [PATCH 1585/3458] fuse-overlayfs: update to 1.4.0.

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

diff --git a/srcpkgs/fuse-overlayfs/template b/srcpkgs/fuse-overlayfs/template
index 08760b953f6a..8a7ef532b2cc 100644
--- a/srcpkgs/fuse-overlayfs/template
+++ b/srcpkgs/fuse-overlayfs/template
@@ -1,6 +1,6 @@
 # Template file for 'fuse-overlayfs'
 pkgname=fuse-overlayfs
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/containers/fuse-overlayfs"
 distfiles="https://github.com/containers/fuse-overlayfs/archive/v${version}.tar.gz"
-checksum=91e78a93aac7698c65083deea04952bc86af6abbb0830785ef1dd4a8707ad8bf
+checksum=7e5666aef4f2047e6a5202d6438b08c2d314dba5b40e431014e7dbb8168d9018
 
 pre_configure() {
 	./autogen.sh

From 6659a8916b657d38ed4cdb2b3e3e5a4b90152cb9 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 13 Feb 2021 16:55:23 -0800
Subject: [PATCH 1586/3458] R-cran-rlang: update to 0.4.10

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

diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index 33e1d96c82fb..73a4a65e4e9b 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -1,10 +1,10 @@
 # Template file for 'R-cran-rlang'
 pkgname=R-cran-rlang
-version=0.4.7
-revision=2
+version=0.4.10
+revision=1
 build_style=R-cran
 short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-3.0-or-later"
 homepage="https://rlang.r-lib.org/"
-checksum=78a3d927f46f71a0b1ad7f9de6a66f986d232340f57b40c9413b3fe8a1859938
+checksum=07530270c4c199f2b7efc5d57a476d99babd9d0c3388a02bb7d57fe312da3576

From c022f209be429443d80e4f1ada0add6642c2090c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 13 Feb 2021 16:55:42 -0800
Subject: [PATCH 1587/3458] R-cran-dplyr: upgrade to 1.0.4

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

diff --git a/srcpkgs/R-cran-dplyr/template b/srcpkgs/R-cran-dplyr/template
index 502500e84a0e..accff9c5957c 100644
--- a/srcpkgs/R-cran-dplyr/template
+++ b/srcpkgs/R-cran-dplyr/template
@@ -1,6 +1,6 @@
 # Template file for 'R-cran-dplyr'
 pkgname=R-cran-dplyr
-version=1.0.2
+version=1.0.4
 revision=1
 build_style=R-cran
 makedepends="R-cran-ellipsis R-cran-generics R-cran-glue R-cran-lifecycle
@@ -13,7 +13,7 @@ short_desc="Grammar of Data Manipulation for R"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
 homepage="https://dplyr.tidyverse.org/"
-checksum=7cb1329fbf5c9609ca300f695fdfae67198b6b7273cf81b71cfc01c12d0adc4a
+checksum=9bf68f71d1519432bad08089fc254b872c990c5a40b32a7e63b03d49f88e093a
 
 post_install() {
 	vlicense LICENSE

From c9827375c3c36c48e11174122af30fd48a8ac9c4 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sun, 14 Feb 2021 13:23:37 +0100
Subject: [PATCH 1588/3458] mkvtoolnix: update to 53.0.0

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

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0e0948a8f03d..457671f25faf 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=52.0.0
+version=53.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=ba48b036f9cd30dcbc98835bc938e316d1d8c8e0c57270e8b49469172954c797
+checksum=8dfd66278c81e6f1df0fd84aad30ce2b4cf7a2ad4336924f01f1879f9d1e4cd6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 00b0b089f4f6324978980b9f53c499c6c5c50eaa Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 14 Feb 2021 12:33:27 +0100
Subject: [PATCH 1589/3458] tllist: update to 1.0.5.

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

diff --git a/srcpkgs/tllist/template b/srcpkgs/tllist/template
index 7a9805571f16..5ebcb2d241cc 100644
--- a/srcpkgs/tllist/template
+++ b/srcpkgs/tllist/template
@@ -1,6 +1,6 @@
 # Template file for 'tllist'
 pkgname=tllist
-version=1.0.4
+version=1.0.5
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -9,7 +9,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/tllist"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=a135934d4955902d67f75f3c542ace3bfb7be3be9c44796852e76ea9e1d82b33
+checksum=b0f32c9b2c2015c8d8dd068fd4e8b586aa91ca1670badc274ec962559ee0aadd
 
 post_install() {
 	vlicense LICENSE

From 7ad0f9e346c1d9051a0882f18b1fa0c2d0631331 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 14 Feb 2021 12:33:56 +0100
Subject: [PATCH 1590/3458] foot: update to 1.6.4.

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

diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index 3782240fead1..f85ea5cfb24f 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.6.3
+version=1.6.4
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,10 +13,12 @@ short_desc="Fast, lightweight and minimalistic Wayland terminal emulator"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/foot"
+changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0340df647d3baae5bcafe6b081173d1850d3f92452d0d0b68d3edf0ef6eb1819
+checksum=73142dcb7d0223ca740f880d372084b6dfdd56700c375709b3166bcaf32e034c
 
 post_install() {
+	rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE
 	vlicense LICENSE
 }
 

From 4533280f700cb57faf1220aec9a8f857073bb859 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Feb 2021 19:55:49 +0200
Subject: [PATCH 1591/3458] New package: execline-man-pages-2.7.0.1.2

---
 srcpkgs/execline-man-pages/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/execline-man-pages/template

diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
new file mode 100644
index 000000000000..54f720e8f163
--- /dev/null
+++ b/srcpkgs/execline-man-pages/template
@@ -0,0 +1,19 @@
+# Template file for 'execline-man-pages'
+pkgname=execline-man-pages
+version=2.7.0.1.2
+revision=1
+build_style=gnu-makefile
+hostmakedepends="mdocml"
+short_desc="Mdoc versions of the documentation for the execline suite"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="https://github.com/flexibeast/execline-man-pages"
+distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
+checksum=e81ae14e87d72c56308b14b1d854a6e56476bc17c48d83d89701e05b67579b8c
+
+do_install() {
+	vmkdir usr/share/man/man1
+	vmkdir usr/share/man/man7
+	make MANPATH="${DESTDIR}/usr/share/man"
+	vlicense LICENSE
+}

From e33fae4c44611f655311c9acfba01570d8bdd16a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 14 Feb 2021 19:56:32 +0200
Subject: [PATCH 1592/3458] execline: add execline-man-pages as a dep to
 execline-doc.

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

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 7fc5dfbfc897..326a843b962e 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,7 +1,7 @@
 # Template file for 'execline'
 pkgname=execline
 version=2.7.0.1
-revision=1
+revision=2
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -39,7 +39,7 @@ post_install() {
 
 execline-doc_package() {
 	short_desc+=" - Documentation"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} execline-man-pages"
 	pkg_install() {
 		vmove usr/share/doc
 	}

From 49a3f424ada0daebb49087fe36d0be27354df022 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 14 Feb 2021 20:49:19 +0100
Subject: [PATCH 1593/3458] openfortivpn: update to 1.16.0.

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

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 9369b4c5a6ff..846d7d725120 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.15.0
+version=1.16.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=5279dbd3da779b818d201bbd9243cff9421a7e790fd2190438610a03c88641f8
+checksum=599b1e159a03be557242aa0e693bb7ddbadf2a4a2b3ffcf77dc15459fe7f6cd6
 
 conf_files="/etc/openfortivpn/config"
 

From 351a09ad10c24e582ed00b274a8ed3cf37a0e0d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 14 Feb 2021 20:52:48 +0100
Subject: [PATCH 1594/3458] bdf2sfd: update to 1.1.6.

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

diff --git a/srcpkgs/bdf2sfd/template b/srcpkgs/bdf2sfd/template
index 49a0c7645001..1d3f7b463160 100644
--- a/srcpkgs/bdf2sfd/template
+++ b/srcpkgs/bdf2sfd/template
@@ -1,6 +1,6 @@
 # Template file for 'bdf2sfd'
 pkgname=bdf2sfd
-version=1.1.5
+version=1.1.6
 revision=1
 build_style=cmake
 short_desc="BDF to SFD converter to vectorize bitmap fonts"
@@ -9,7 +9,7 @@ license="BSD-2-clause"
 homepage="https://github.com/fcambus/bdf2sfd"
 changelog="https://github.com/fcambus/bdf2sfd/raw/master/ChangeLog"
 distfiles="https://github.com/fcambus/bdf2sfd/archive/${version}.tar.gz"
-checksum=8c623226db249afcc6a290318e892bfd1f71058fc791bd56536241254cd02a41
+checksum=c9e8d675e5c5f4b40dfa4645db5d1133bcb526a3b7faf75bdfe613cf22003699
 
 post_install() {
 	vlicense LICENSE

From d021299d0eb61ec690344b6f4d51d6763eabae20 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 14 Feb 2021 20:56:29 +0100
Subject: [PATCH 1595/3458] libite: update to 2.3.1.

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

diff --git a/srcpkgs/libite/template b/srcpkgs/libite/template
index 76d67b0df87a..f7d6bfadc875 100644
--- a/srcpkgs/libite/template
+++ b/srcpkgs/libite/template
@@ -1,6 +1,6 @@
 # Template file for 'libite'
 pkgname=libite
-version=2.2.0
+version=2.3.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -10,7 +10,7 @@ license="MIT, ISC, BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/troglobit/libite"
 changelog="https://raw.githubusercontent.com/troglobit/libite/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/libite/archive/v${version}.tar.gz"
-checksum=642e591b0f678e2c1dfe71590457a2a19e3a5f18728b7ec1221c348af603fd0b
+checksum=d6a01bcfae45db066c771db03996882110dca2222444ee13160bf29bfb206da7
 
 pre_configure() {
 	./autogen.sh
@@ -21,6 +21,11 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc/libite
 }
 
+pre_check() {
+	# avoid installing which for testing a which function
+	vsed -e 's;/usr/bin/which;/usr/bin/id;' -i tests/which.c
+}
+
 libite-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 48861f08e8f4f3ff601716850034b7a4eda5093c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 14 Feb 2021 21:21:57 +0100
Subject: [PATCH 1596/3458] libuev: update to 2.3.2.

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

diff --git a/srcpkgs/libuev/template b/srcpkgs/libuev/template
index 1100604c58f8..f573d05b4df8 100644
--- a/srcpkgs/libuev/template
+++ b/srcpkgs/libuev/template
@@ -1,6 +1,6 @@
 # Template file for 'libuev'
 pkgname=libuev
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/troglobit/libuev"
 changelog="https://github.com/troglobit/libuev/raw/master/ChangeLog.md"
 distfiles="https://github.com/troglobit/libuev/archive/v${version}.tar.gz"
-checksum=c9585ec5254d0deeff00ab42abf18771c869411b6552de6792b8167bc4a2ba5c
+checksum=df61afd529af6f223c4dbfd8bb22e4a45b98b91d090e0bb409957ea7c6147899
 
 pre_configure() {
 	./autogen.sh

From 91f8a110ad03e348573810f153db3645870d3213 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 12 Feb 2021 23:15:55 +0400
Subject: [PATCH 1597/3458] osinfo-db: update to 20210202.

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

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 1d5de64c7b65..0377c7686ad9 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20201218
+version=20210202
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=00f2ae5d6b67a45d6bfead8c5dd75a0de067062831e21c0c7af3f0c79b8dab79
+checksum=0bb56aeddf94a2cf48853c0e82cacaeb873d98c19590d81fbceadb06a391b11b
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From b453f6e7cafe7deb8f978c04df8f3b89f3e924ca Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 13 Feb 2021 23:00:45 -0800
Subject: [PATCH 1598/3458] GraphicsMagick: update to 1.3.36

Assorted bug fixes, enhancements, and build cleanups, full list here:
http://www.graphicsmagick.org/NEWS.html#december-26-2020

Additionally, PerlMagick is built but tests are disabled since there is
currently an installation order issue with the tests. Specifically,
the PerlMagick tests require GraphicsMagick to be installed for the
tests to pass but the tests are run as part of the main suite. See:
https://sourceforge.net/p/graphicsmagick/bugs/580/ for more details.
---
 .../patches/disable_perlmagick_tests.patch    | 24 +++++++++++++++++++
 srcpkgs/GraphicsMagick/template               |  8 +++----
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch

diff --git a/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch
new file mode 100644
index 000000000000..2080d6da7c98
--- /dev/null
+++ b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch
@@ -0,0 +1,24 @@
+# workaround for https://sourceforge.net/p/graphicsmagick/bugs/580/
+
+--- Makefile.am.orig    2021-02-14 00:46:02.239418403 -0800
++++ Makefile.am 2021-02-14 00:46:48.431547444 -0800
+@@ -79,7 +79,6 @@
+ 
+ # Tests to run
+ TESTS = \
+-       $(PERLMAGICK_TESTS) \
+        $(TESTS_TESTS) \
+        $(MAGICKPP_TESTS) \
+        $(WAND_TESTS) \
+
+--- Makefile.in.orig    2021-02-14 00:49:51.414058625 -0800
++++ Makefile.in 2021-02-14 00:50:19.996138472 -0800
+@@ -4767,7 +4767,7 @@
+ @WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl
+ @WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local
+ #PERLMAGICK_CHECK_LOCAL_TARGETS = check-perl
+-@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh
++#@WITH_PERL_TRUE@PERLMAGICK_TESTS = PerlMagick/PerlMagickCheck.sh
+ @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRIPTS = perl-build
+ 
+ #PERLMAGICK_CHECKSCRIPTS = perl-build
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 945ed5c3aee5..35f5269eac7c 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,10 +1,10 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.35
-revision=2
+version=1.3.36
+revision=1
 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"
+ --with-modules --with-perl --without-jp2 --enable-shared --disable-static"
 hostmakedepends="pkg-config perl"
 # libraries listed in GraphicsMagick++-config --libs
 _develdepends="lcms2-devel freetype-devel libXext-devel libSM-devel libICE-devel
@@ -19,7 +19,7 @@ license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="http://www.graphicsmagick.org/NEWS.html"
 distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=d96d5ce2ef7e0e90166551e38742713728bfd33d6f18495a9ddda938700fc055
+checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
 keep_libtool_archives=yes
 
 post_install() {

From 293f2e814c049d0c5ba1d9b5afeeee209314a2ca Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 13 Feb 2021 14:16:44 +0100
Subject: [PATCH 1599/3458] inspectrum: update to 0.2.3, fix license

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

diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index b42e70d95284..83ba7b100956 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,16 +1,16 @@
 # Template file for 'inspectrum'
 pkgname=inspectrum
-version=0.2.2
+version=0.2.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="fftw-devel qt5-devel liquid-dsp-devel"
 short_desc="Offline radio signal analyzer"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
-license="GPL-3.0-only"
+license="GPL-3.0-or-later"
 homepage="https://github.com/miek/inspectrum"
 distfiles="https://github.com/miek/inspectrum/archive/v${version}.tar.gz"
-checksum=9e513101a59822c86b84cb7717f395c59bb27a6c192fe021cf4ffb7cf1d09c78
+checksum=7be5be96f50b0cea5b3dd647f06cc00adfa805a395484aa2ab84cf3e49b7227b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 742210ea6a801b7b2f558f05076af70b90cb9a0a Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 13 Feb 2021 16:16:22 -0800
Subject: [PATCH 1600/3458] cni-plugins: update to 0.9.1.

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

diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 05b0bc34d52a..b5e64bffd9d2 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
-version=0.9.0
+version=0.9.1
 revision=1
 wrksrc="plugins-${version}"
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containernetworking/plugins"
 distfiles="https://github.com/containernetworking/plugins/archive/v${version}.tar.gz"
-checksum=54abd2fb7762943ff57832dfba19de12db09f0a0f8e69b31f1a2bb2baca395e7
+checksum=35e96c6c47b9d080d1cbdcfca02808b01a95464607cd2a2c971b3ad596285928
 
 do_build() {
 	./build_linux.sh

From 7082a74dd09d0c429f64d877e2fce8994de4a3fe Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 13 Feb 2021 16:38:00 -0800
Subject: [PATCH 1601/3458] conmon: update to 2.0.26.

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

diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index d9c36d8104a3..9154f4ca6b7b 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,6 +1,6 @@
 # Template file for 'conmon'
 pkgname=conmon
-version=2.0.22
+version=2.0.26
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/conmon"
 distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz"
-checksum=41181db43c544cdd1a31aa851286e8c09a825879656f00f6adde431830893983
+checksum=845744c3323bbf9adab4444d70fd7de0ceb12a578c9cf2fd2366c6bed0ac7970
 
 do_install() {
 	vbin bin/conmon

From f060ffa36eef6ff3257958ca5af7c020e28b8bbd Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 1 Feb 2021 00:34:57 +0100
Subject: [PATCH 1602/3458] dosfstools: update to 4.2.

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

diff --git a/srcpkgs/dosfstools/template b/srcpkgs/dosfstools/template
index fec18cb7ace2..edfdf079db87 100644
--- a/srcpkgs/dosfstools/template
+++ b/srcpkgs/dosfstools/template
@@ -1,7 +1,7 @@
 # Template file for 'dosfstools'
 pkgname=dosfstools
-version=4.1
-revision=2
+version=4.2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-compat-symlinks"
 hostmakedepends="pkg-config"
@@ -10,8 +10,8 @@ short_desc="DOS filesystem tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dosfstools/dosfstools"
-distfiles="https://github.com/$pkgname/$pkgname/releases/download/v$version/${pkgname}-${version}.tar.xz"
-checksum=e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173
+distfiles="https://github.com/$pkgname/$pkgname/releases/download/v$version/${pkgname}-${version}.tar.gz"
+checksum=64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc

From 1a6ae203e228e733006b28c52b791690a22109ca Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Fri, 12 Feb 2021 17:43:19 -0800
Subject: [PATCH 1603/3458] python3-pycryptodomex: update to 3.10.1.

N.B.: Support dropped for py2.6 and py3.4.
https://github.com/Legrandin/pycryptodome/blob/v3.10.1/Changelog.rst#breaks-in-compatibility
---
 srcpkgs/python3-pycryptodomex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
index 9c6234007523..80d404ed6a7e 100644
--- a/srcpkgs/python3-pycryptodomex/template
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pycryptodomex'
 pkgname=python3-pycryptodomex
-version=3.9.9
+version=3.10.1
 revision=1
 wrksrc="pycryptodomex-${version}"
 build_style=python3-module
@@ -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=7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51
+checksum=541cd3e3e252fb19a7b48f420b798b53483302b7fe4d9954c947605d0a263d62
 
 post_install() {
 	vlicense LICENSE.rst

From 3fb38393660d1c95c4ff5f465b12af54b9a83012 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 11 Feb 2021 20:45:00 +0100
Subject: [PATCH 1604/3458] oce: remove package

---
 common/shlibs                           | 63 -------------------------
 srcpkgs/oce-devel                       |  1 -
 srcpkgs/oce/patches/musl-fenv.patch     | 36 --------------
 srcpkgs/oce/patches/musl-mallinfo.patch | 17 -------
 srcpkgs/oce/template                    | 32 -------------
 srcpkgs/removed-packages/template       |  4 +-
 6 files changed, 3 insertions(+), 150 deletions(-)
 delete mode 120000 srcpkgs/oce-devel
 delete mode 100644 srcpkgs/oce/patches/musl-fenv.patch
 delete mode 100644 srcpkgs/oce/patches/musl-mallinfo.patch
 delete mode 100644 srcpkgs/oce/template

diff --git a/common/shlibs b/common/shlibs
index 70596feb7698..fda9284996c4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2654,69 +2654,6 @@ libspnav.so.0 libspnav-0.2.3_1
 libsimage.so.20 simage-1.7.0_1
 libCoin.so.80 coin3-4.0.0_1
 libgl2ps.so.1 gl2ps-1.3.9_1
-libFWOSPlugin.so.11 oce-0.18_1
-libPTKernel.so.11 oce-0.18_1
-libTKBO.so.11 oce-0.18_1
-libTKBRep.so.11 oce-0.18_1
-libTKBin.so.11 oce-0.18_1
-libTKBinL.so.11 oce-0.18_1
-libTKBinTObj.so.11 oce-0.18_1
-libTKBinXCAF.so.11 oce-0.18_1
-libTKBool.so.11 oce-0.18_1
-libTKCAF.so.11 oce-0.18_1
-libTKCDF.so.11 oce-0.18_1
-libTKDCAF.so.11 oce-0.18_1
-libTKDraw.so.11 oce-0.18_1
-libTKFeat.so.11 oce-0.18_1
-libTKFillet.so.11 oce-0.18_1
-libTKG2d.so.11 oce-0.18_1
-libTKG3d.so.11 oce-0.18_1
-libTKGeomAlgo.so.11 oce-0.18_1
-libTKGeomBase.so.11 oce-0.18_1
-libTKHLR.so.11 oce-0.18_1
-libTKIGES.so.11 oce-0.18_1
-libTKLCAF.so.11 oce-0.18_1
-libTKMath.so.11 oce-0.18_1
-libTKMesh.so.11 oce-0.18_1
-libTKMeshVS.so.11 oce-0.18_1
-libTKNIS.so.11 oce-0.18_1
-libTKOffset.so.11 oce-0.18_1
-libTKOpenGl.so.11 oce-0.18_1
-libTKPCAF.so.11 oce-0.18_1
-libTKPLCAF.so.11 oce-0.18_1
-libTKPShape.so.11 oce-0.18_1
-libTKPrim.so.11 oce-0.18_1
-libTKSTEP.so.11 oce-0.18_1
-libTKSTEP209.so.11 oce-0.18_1
-libTKSTEPAttr.so.11 oce-0.18_1
-libTKSTEPBase.so.11 oce-0.18_1
-libTKSTL.so.11 oce-0.18_1
-libTKService.so.11 oce-0.18_1
-libTKShHealing.so.11 oce-0.18_1
-libTKShapeSchema.so.11 oce-0.18_1
-libTKStdLSchema.so.11 oce-0.18_1
-libTKStdSchema.so.11 oce-0.18_1
-libTKTObj.so.11 oce-0.18_1
-libTKTObjDRAW.so.11 oce-0.18_1
-libTKTopAlgo.so.11 oce-0.18_1
-libTKTopTest.so.11 oce-0.18_1
-libTKV3d.so.11 oce-0.18_1
-libTKVRML.so.11 oce-0.18_1
-libTKViewerTest.so.11 oce-0.18_1
-libTKVoxel.so.11 oce-0.18_1
-libTKXCAF.so.11 oce-0.18_1
-libTKXCAFSchema.so.11 oce-0.18_1
-libTKXDEDRAW.so.11 oce-0.18_1
-libTKXDEIGES.so.11 oce-0.18_1
-libTKXDESTEP.so.11 oce-0.18_1
-libTKXMesh.so.11 oce-0.18_1
-libTKXSBase.so.11 oce-0.18_1
-libTKXSDRAW.so.11 oce-0.18_1
-libTKXml.so.11 oce-0.18_1
-libTKXmlL.so.11 oce-0.18_1
-libTKXmlTObj.so.11 oce-0.18_1
-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
 libmilter.so.1.0.2 libmilter-1.0.2_1
diff --git a/srcpkgs/oce-devel b/srcpkgs/oce-devel
deleted file mode 120000
index cf92f4baef1b..000000000000
--- a/srcpkgs/oce-devel
+++ /dev/null
@@ -1 +0,0 @@
-oce
\ No newline at end of file
diff --git a/srcpkgs/oce/patches/musl-fenv.patch b/srcpkgs/oce/patches/musl-fenv.patch
deleted file mode 100644
index 217e3b12b50b..000000000000
--- a/srcpkgs/oce/patches/musl-fenv.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Following srcpkgs/flightgear/patches/musl-fenv.patch:
-"""
-Simply disabling the code which enables floating point exceptions
-is probably wrong, but I don't have a replacement for the
-non-posix functions fegetexcept(3) and feenableexcept(3).
-"""
-
---- src/OSD/OSD_signal.cxx.orig	2016-01-02 06:11:52.000000000 +0100
-+++ src/OSD/OSD_signal.cxx	2016-06-03 13:12:26.271621527 +0200
-@@ -216,7 +216,7 @@
-   // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " <<  endl ;
-   if ( ADR_ACT_SIGIO_HANDLER != NULL )
-     (*ADR_ACT_SIGIO_HANDLER)() ;
--#ifdef linux
-+#if defined(linux) && defined(__GLIBC__)
-   if (fFltExceptions)
-     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -337,7 +337,7 @@
-     return;
-   }
- #endif
--#ifdef linux
-+#if defined(linux) && defined(__GLIBC__)
-   if (fFltExceptions)
-     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -393,7 +393,7 @@
-       cerr << "ieee_handler does not work !!! KO " << endl;
- #endif
-     }
--#elif defined (linux)
-+#elif defined(linux) && defined(__GLIBC__)
-     feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-     //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-     fFltExceptions = Standard_True;
diff --git a/srcpkgs/oce/patches/musl-mallinfo.patch b/srcpkgs/oce/patches/musl-mallinfo.patch
deleted file mode 100644
index bb904217de85..000000000000
--- a/srcpkgs/oce/patches/musl-mallinfo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-In musl libc there is no struct mallinfo and no function mallinf()
-
---- src/OSD/OSD_MemInfo.cxx.orig	2016-01-02 06:11:52.000000000 +0100
-+++ src/OSD/OSD_MemInfo.cxx	2016-06-03 13:55:56.613147425 +0200
-@@ -144,8 +144,12 @@
-   }
-   aFile.close();
- 
-+  #if defined(__GLIBC__)
-   struct mallinfo aMI = mallinfo();
-   myCounters[MemHeapUsage] = aMI.uordblks;
-+  #else /* XXX not yet coded */
-+  myCounters[MemHeapUsage] = 0;
-+  #endif
- 
- #elif (defined(__APPLE__))
-   struct task_basic_info aTaskInfo;
diff --git a/srcpkgs/oce/template b/srcpkgs/oce/template
deleted file mode 100644
index 6c27108769a6..000000000000
--- a/srcpkgs/oce/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oce'
-pkgname=oce
-_majorver=0.18
-version=${_majorver}.3
-revision=1
-wrksrc="${pkgname}-OCE-${version}"
-build_style=cmake
-configure_args="-DOCE_INSTALL_PREFIX=/usr -DOCE_WITH_FREEIMAGE=ON
- -DOCE_WITH_GL2PS=ON -DOCE_MULTITHREAD_LIBRARY=TBB -DOCE_DRAW=ON"
-makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel tcl-devel tk-devel"
-short_desc="OpenCASCADE Community Edition"
-maintainer="yopito <pierre.bourgin@free.fr>"
-license="LGPL-2.1, OCCT"
-homepage="https://github.com/tpaviot/oce"
-distfiles="https://github.com/tpaviot/oce/archive/OCE-${version}.tar.gz"
-checksum=c553d6a7bf52f790abc3b6bb7a1e91a65947e92a426bb1a88a11960c31f0966c
-
-post_install() {
-	vlicense OCCT_LGPL_EXCEPTION.txt
-}
-
-oce-devel_package() {
-	short_desc+=" - development files"
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/oce-${_majorver}/*.cmake"
-		mkdir -p ${PKGDESTDIR}/usr/share/${pkgname}
-		vcopy samples usr/share/${pkgname}
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6b46ebfdb11e..533fae40e001 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=24
+revision=25
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -173,6 +173,8 @@ replaces="
  mozjs60<=60.8.0_5
  mozjs68<=68.11.0_1
  orage<=4.12.1_7
+ oce<=0.18.3_1
+ oce-devel<=0.18.3_1
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
  polkit-qt<=0.112.0_5

From 13d6f481fcfe204c7155e2717ef9095d21990723 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:02:10 +0100
Subject: [PATCH 1605/3458] acpica-utils: update to 20210105.

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

diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index d1840214ee2e..6bcf51414cf1 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20201113
+version=20210105
 revision=1
 archs="i686* x86_64* aarch64*"
 wrksrc="acpica-unix-${version}"
@@ -10,7 +10,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://www.acpica.org/"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=48c4e0c07b42581d017487cc9264470e6420605ddd24cbb5d16410d02a771461
+checksum=a9be7b749025e60f93fde2fe531bfe0d84a33641d3e0c9b0f6049f996dbb1ff8
 
 do_build() {
 	vsed -e 's/-Werror//g' \

From 8415764582873f4d146c3a1b047ef98a9ee045f1 Mon Sep 17 00:00:00 2001
From: John Rowley <hey@johnrowley.me>
Date: Thu, 21 Jan 2021 22:52:30 +0100
Subject: [PATCH 1606/3458] mpd: update to 0.22.4.

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

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 42e120418560..d03c063a3246 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.3
-revision=2
+version=0.22.4
+revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=338012037b5e67730529187c555a54cc567a85b15a7e8ddb3a807b1971566ccf
+checksum=891ea993a539246fa8f670346e5aa6c8cc85ce4be739ff12261712b0b3149dd0
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 patch_args="-Np1"
 

From 4a0904cbe79f1dc7d130d1a0955ed26cd4250809 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 14 Feb 2021 11:36:04 +0000
Subject: [PATCH 1607/3458] gnome-tweaks: update to 3.34.1.

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

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index 331ebac65ca3..d07507984433 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.34.0
-revision=4
+version=3.34.1
+revision=1
 build_style=meson
 hostmakedepends="gettext"
 depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=003326fab46e6faad9485924bca503f0c583e3b4553d6f673406eda396205250
+checksum=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From 81b05ec977f3715ba9c0bb2e448daf42ee866469 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 14 Feb 2021 11:23:55 +0000
Subject: [PATCH 1608/3458] gnome-terminal: update to 3.38.3.

---
 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 ca8dd08dc5f6..e3eb3a5c2c76 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.2
+version=3.38.3
 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=27bddc9d0ba614c86e5ecb4f54c75ebc3415e2887acd91442057548fd3206618
+checksum=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From 2dda5227f4b194cfae2e581b4f2578ac7b9b551f Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 14 Feb 2021 11:12:40 +0000
Subject: [PATCH 1609/3458] gnome-getting-started-docs: update to 3.38.1.

---
 srcpkgs/gnome-getting-started-docs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
index 515c8f38ba84..63ba35af86de 100644
--- a/srcpkgs/gnome-getting-started-docs/template
+++ b/srcpkgs/gnome-getting-started-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-getting-started-docs'
 pkgname=gnome-getting-started-docs
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -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=7ce3cf6f97c4243c5d756f7ea2aae3b568cff6ddb3e562dbe8194b4b22712c3a
+checksum=10fbe23f2c3ce427539a4e307a461694d3870b23200464f705b7d81af993c859

From f4cd89f63775e0c9fb968aa5ec00c5fdbc76102f Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 14 Feb 2021 10:29:35 +0000
Subject: [PATCH 1610/3458] evince: update to 3.38.2.

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index c0e9fae7a2cc..fa19b7bf1c40 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.1
+version=3.38.2
 revision=1
 build_helper="gir"
 build_style=meson
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=00f6d6689cc22de3c005bd87d4c2ebf720064cb8dc6a1887816f8b7e082b2e63
+checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From 080ea1e1d37f2d79780abcca847e4ce7e090f8d6 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 14 Feb 2021 10:06:27 +0000
Subject: [PATCH 1611/3458] eog: update to 3.38.2.

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 8ed50879fea8..2abc43032b5e 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.1
+version=3.38.2
 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=b71dc961c277effa70dbd466657a81585f52ee8b35bc6e9da20c993568740cf7
+checksum=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From 8a9bc8f0c743cd526670b46658e06ea0b4b0ad33 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 14 Feb 2021 13:45:20 -0800
Subject: [PATCH 1612/3458] k3s: remove package

---
 srcpkgs/k3s/files/k3s-agent/log/run       |  2 -
 srcpkgs/k3s/files/k3s-agent/run           | 11 ---
 srcpkgs/k3s/files/k3s-server/log/run      |  2 -
 srcpkgs/k3s/files/k3s-server/run          |  6 --
 srcpkgs/k3s/patches/0001-void-build.patch | 98 -----------------------
 srcpkgs/k3s/template                      | 53 ------------
 srcpkgs/removed-packages/template         |  1 +
 7 files changed, 1 insertion(+), 172 deletions(-)
 delete mode 100755 srcpkgs/k3s/files/k3s-agent/log/run
 delete mode 100755 srcpkgs/k3s/files/k3s-agent/run
 delete mode 100755 srcpkgs/k3s/files/k3s-server/log/run
 delete mode 100755 srcpkgs/k3s/files/k3s-server/run
 delete mode 100644 srcpkgs/k3s/patches/0001-void-build.patch
 delete mode 100644 srcpkgs/k3s/template

diff --git a/srcpkgs/k3s/files/k3s-agent/log/run b/srcpkgs/k3s/files/k3s-agent/log/run
deleted file mode 100755
index 6a3f7aaa612c..000000000000
--- a/srcpkgs/k3s/files/k3s-agent/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t k3s-agent
diff --git a/srcpkgs/k3s/files/k3s-agent/run b/srcpkgs/k3s/files/k3s-agent/run
deleted file mode 100755
index efeb002ab66a..000000000000
--- a/srcpkgs/k3s/files/k3s-agent/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-set --
-[ -r /etc/k3s/config ] && . /etc/k3s/config
-[ -r conf ] && . ./conf
-if [ 0 = $# ]; then
-  set -- \
-    ${K3S_SERVER:+--server="${K3S_SERVER}"} \
-    ${K3S_TOKEN:+--token="${K3S_TOKEN}"}
-fi
-exec 2>&1
-exec k3s agent ${K3S_OPTIONS} ${K3S_AGENT_OPTIONS} "$@"
diff --git a/srcpkgs/k3s/files/k3s-server/log/run b/srcpkgs/k3s/files/k3s-server/log/run
deleted file mode 100755
index e78f852bb29e..000000000000
--- a/srcpkgs/k3s/files/k3s-server/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t k3s-server
diff --git a/srcpkgs/k3s/files/k3s-server/run b/srcpkgs/k3s/files/k3s-server/run
deleted file mode 100755
index 38124326a38d..000000000000
--- a/srcpkgs/k3s/files/k3s-server/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set --
-[ -r /etc/k3s/config ] && . /etc/k3s/config
-[ -r ./conf ] && . ./conf
-exec 2>&1
-exec k3s server ${K3S_OPTIONS} ${K3S_SERVER_OPTIONS} "$@"
diff --git a/srcpkgs/k3s/patches/0001-void-build.patch b/srcpkgs/k3s/patches/0001-void-build.patch
deleted file mode 100644
index 739948889592..000000000000
--- a/srcpkgs/k3s/patches/0001-void-build.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 3440b2daf5aa68b6c0f02bb043bf4e7fc1d2e35c Mon Sep 17 00:00:00 2001
-From: Noel Cower <ncower@gmail.com>
-Date: Mon, 28 Oct 2019 19:09:04 -0700
-Subject: [PATCH] Patch build and package-cli scripts for Void
-
-- Remove -w and -s linker flags.
-
-- Disable cgo and unset GOARCH when running go generate. (Breaks
-  execution of anything using 'go run' inside of a go:generate line.)
-
-- Replace git clone of plugins.git with a distfile so that its
-  SHA256SUM can be verified, similar to the traefik files. Adds a go
-  clean call to the end of the subshell since `rm -rf` on
-  a GOPATH/pkg/mod directory will fail (because everything is
-  read-only).
-
-- Nullify BIN_SUFFIX variable. This makes it needlessly hard to use
-  vinstall with binaries, so remove it.
-
-diff --git k3s-1.0.0/scripts/build k3s-1.0.0/scripts/build
-index 4341e3a3a1..431d024ac6 100755
---- k3s-1.0.0/scripts/build
-+++ k3s-1.0.0/scripts/build
-@@ -17,8 +17,7 @@ VERSIONFLAGS="
-     -X ${VENDOR_PREFIX}${PKG_CONTAINERD}/version.Version=${VERSION_CONTAINERD}
-     -X ${VENDOR_PREFIX}${PKG_CONTAINERD}/version.Package=${PKG_RANCHER_CONTAINERD}
-     -X ${VENDOR_PREFIX}${PKG_CRICTL}/pkg/version.Version=${VERSION_CRICTL}"
--LDFLAGS="
--    -w -s"
-+LDFLAGS=""
- STATIC="
-     -extldflags '-static'
- "
-@@ -63,7 +62,7 @@ rm -f \
- 
- cleanup() {
-     exit_status=$?
--    rm -rf $TMPDIR
-+    go clean -modcache
-     exit ${exit_status}
- }
- 
-@@ -71,12 +70,11 @@ INSTALLBIN=$(pwd)/bin
- if [ ! -x ${INSTALLBIN}/cni ]; then
- (
-     echo Building cni
--    TMPDIR=$(mktemp -d)
-     trap cleanup EXIT
--    WORKDIR=$TMPDIR/src/github.com/containernetworking/plugins
--    git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR
--    cd $WORKDIR
--    GOPATH=$TMPDIR CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o $INSTALLBIN/cni
-+    SRCDIR=
-+    cd "$XBPS_BUILDDIR/k3s-${VERSION#v}/plugins-${VERSION_CNIPLUGINS#v}"
-+    [ -r go.mod ] || go mod init github.com/containernetworking/plugins
-+    CGO_ENABLED=0 go build -mod=vendor -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o $INSTALLBIN/cni
- )
- fi
- # echo Building agent
-@@ -95,7 +93,7 @@ ln -s containerd ./bin/ctr
- # echo Building containerd
- # CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/containerd/
- echo Building runc
--make EXTRA_LDFLAGS="-w -s" BUILDTAGS="apparmor seccomp" -C ./vendor/github.com/opencontainers/runc static
-+make EXTRA_LDFLAGS="" BUILDTAGS="apparmor seccomp" -C ./vendor/github.com/opencontainers/runc static
- cp -f ./vendor/github.com/opencontainers/runc/runc ./bin/runc
- 
- echo Building containerd-shim
-diff --git k3s-1.0.0/scripts/package-cli k3s-1.0.0/scripts/package-cli
-index 0aac10bb24..000f15f93e 100755
---- k3s-1.0.0/scripts/package-cli
-+++ k3s-1.0.0/scripts/package-cli
-@@ -40,20 +40,14 @@ HASH=$(sha256sum ./build/out/data.tar.gz | awk '{print $1}')
- 
- cp ./build/out/data.tar.gz ./build/data/${HASH}.tgz
- 
--BIN_SUFFIX="-${ARCH}"
--if [ ${ARCH} = amd64 ]; then
--    BIN_SUFFIX=""
--elif [ ${ARCH} = arm ]; then
--    BIN_SUFFIX="-armhf"
--fi
-+BIN_SUFFIX=""
- 
- CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX}
- 
--go generate
-+CGO_ENABLED=0 GOARCH= go generate -x
- LDFLAGS="
-     -X github.com/rancher/k3s/pkg/version.Version=$VERSION
-     -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8}
--    -w -s
- "
- STATIC="-extldflags '-static'"
- if [ "$DQLITE" = "true" ]; then
--- 
-2.23.0
-
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
deleted file mode 100644
index b0ee98e92687..000000000000
--- a/srcpkgs/k3s/template
+++ /dev/null
@@ -1,53 +0,0 @@
-# Template file for 'k3s'
-pkgname=k3s
-version=1.0.0
-revision=1
-create_wrksrc=yes
-build_wrksrc="${pkgname}-${version}"
-build_style=go
-go_import_path="github.com/rancher/k3s"
-hostmakedepends="git pkg-config"
-makedepends="libseccomp-devel"
-depends="ipset conntrack-tools"
-short_desc="Lightweight Kubernetes"
-maintainer="Cameron Nemo <cnemo@tutanota.com>"
-license="Apache-2.0"
-homepage="https://k3s.io"
-# _traefik_* variables' values from scripts/download in source distfile
-_traefik_version="1.77.1"
-_traefik_file="traefik-${_traefik_version}.tgz"
-_plugins_version="0.7.6-k3s1"
-_plugins_file="v${_plugins_version}.tar.gz"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz
- https://github.com/rancher/plugins/archive/${_plugins_file}
- https://kubernetes-charts.storage.googleapis.com/${_traefik_file}"
-checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
- 75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
- 15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
-skip_extraction="${_traefik_file}"
-
-_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
-
-pre_build() {
-	# Modify version.sh to use template variables' values.
-	vsed -i scripts/version.sh -e '
-		s@^COMMIT=.*@COMMIT='"${_git_commit::10}"'@;
-		s@^GIT_TAG=.*@GIT_TAG=v'"${version}"'@
-		'
-
-	# Recreate behavior of scripts/download minus downloading
-	# anything or having anything to do with busybox.
-	mkdir -p etc bin build/static/charts
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_traefik_file} build/static/charts/${_traefik_file}
-}
-
-do_build() {
-	scripts/build
-	scripts/package-cli
-}
-
-do_install() {
-	vbin dist/artifacts/k3s
-	vsv k3s-server
-	vsv k3s-agent
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 533fae40e001..7a0618cf3a6f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -146,6 +146,7 @@ replaces="
  icecat-i18n-zh-TW<=78.6.1_1
  isl16<=0.16_2
  js<=1.8.5_11
+ k3s<=1.0.0_1
  kadu<=4.3_6
  keepassx<=0.4.4_2
  keepassx2<=2.0.3_2

From a0d5b784eb159def3397160b79ff9545a12e4ad3 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 14 Feb 2021 11:47:36 +0000
Subject: [PATCH 1613/3458] orca: update to 3.38.2.

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

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index a615c6445ebe..21f6450b37d0 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.38.0
-revision=2
+version=3.38.2
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
 makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c3279d79898db10a105bcb705b5a4042b1b51a9c057a6bd0ffd65dac2356fee
+checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From 8dc5ec54e83c3292e57ff4671c2b46553ee7a47f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Feb 2021 23:35:45 +0100
Subject: [PATCH 1614/3458] rkt: remove package

closes #28554
---
 srcpkgs/removed-packages/template          |  5 +-
 srcpkgs/rkt-stage1-coreos                  |  1 -
 srcpkgs/rkt-stage1-fly                     |  1 -
 srcpkgs/rkt/files/rkt-gc                   |  2 -
 srcpkgs/rkt/files/rkt-metadata/run         |  2 -
 srcpkgs/rkt/patches/musl-accessperms.patch | 13 ----
 srcpkgs/rkt/template                       | 88 ----------------------
 7 files changed, 4 insertions(+), 108 deletions(-)
 delete mode 120000 srcpkgs/rkt-stage1-coreos
 delete mode 120000 srcpkgs/rkt-stage1-fly
 delete mode 100644 srcpkgs/rkt/files/rkt-gc
 delete mode 100644 srcpkgs/rkt/files/rkt-metadata/run
 delete mode 100644 srcpkgs/rkt/patches/musl-accessperms.patch
 delete mode 100644 srcpkgs/rkt/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7a0618cf3a6f..6be7dcd6f18e 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=25
+revision=26
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -212,6 +212,9 @@ replaces="
  qt-qmake<=4.8.7_29
  r2-bindings<=1.0.1_2
  reminiscence<=0.4.6_1
+ rkt<=1.30.0_3
+ rkt-stage1-fly<=1.30.0_3
+ rkt-stage1-coreos<=1.30.0_3
  scantailor<=0.9.12.1_2
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
diff --git a/srcpkgs/rkt-stage1-coreos b/srcpkgs/rkt-stage1-coreos
deleted file mode 120000
index 9572e0e83de5..000000000000
--- a/srcpkgs/rkt-stage1-coreos
+++ /dev/null
@@ -1 +0,0 @@
-rkt
\ No newline at end of file
diff --git a/srcpkgs/rkt-stage1-fly b/srcpkgs/rkt-stage1-fly
deleted file mode 120000
index 9572e0e83de5..000000000000
--- a/srcpkgs/rkt-stage1-fly
+++ /dev/null
@@ -1 +0,0 @@
-rkt
\ No newline at end of file
diff --git a/srcpkgs/rkt/files/rkt-gc b/srcpkgs/rkt/files/rkt-gc
deleted file mode 100644
index 3cdbb011601b..000000000000
--- a/srcpkgs/rkt/files/rkt-gc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rkt gc --grace-period=24h
diff --git a/srcpkgs/rkt/files/rkt-metadata/run b/srcpkgs/rkt/files/rkt-metadata/run
deleted file mode 100644
index af03ab826d70..000000000000
--- a/srcpkgs/rkt/files/rkt-metadata/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec rkt metadata-service
diff --git a/srcpkgs/rkt/patches/musl-accessperms.patch b/srcpkgs/rkt/patches/musl-accessperms.patch
deleted file mode 100644
index a7a044754296..000000000000
--- a/srcpkgs/rkt/patches/musl-accessperms.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- rkt-1.25.0/stage1/prepare-app/prepare-app.c	2017-02-20 11:16:05.000000000 +0100
-+++ rkt-1.25.0/stage1/prepare-app/prepare-app.c	2017-03-06 00:55:19.536542504 +0100
-@@ -27,6 +27,10 @@
- #include <inttypes.h>
- #include <stdbool.h>
- 
-+#if !defined(ACCESSPERMS)
-+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
-+#endif
-+
- #define err_out(_fmt, _args...)						\
- 		fprintf(stderr, "Error: " _fmt "\n", ##_args);
- static int exit_err;
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
deleted file mode 100644
index 84d4e32837ad..000000000000
--- a/srcpkgs/rkt/template
+++ /dev/null
@@ -1,88 +0,0 @@
-# Template file for 'rkt'
-pkgname=rkt
-version=1.30.0
-revision=2
-build_style=gnu-configure
-# KVM support broken
-configure_args="--enable-tpm=no --enable-sdjournal=no
- --with-stage1-flavors=fly,coreos,host
- --with-stage1-default-location=/usr/lib/rkt/stage1.aci"
-hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go"
-makedepends="acl-devel zlib-devel libressl-devel"
-depends="virtual?rkt-stage1"
-short_desc="App Container runtime for Linux"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0"
-homepage="https://github.com/coreos/rkt"
-distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
-checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
-
-patch_args="-Np1"
-nopie=yes
-
-system_groups="rkt"
-
-nocross=yes
-
-archs="x86_64*"
-
-make_dirs="/var/lib/rkt 2750 root rkt
- /var/lib/rkt/tmp 2750 root rkt
- /var/lib/rkt/cas 2770 root rkt
- /var/lib/rkt/cas/db 2770 root rkt
- /var/lib/rkt/cas/imagelocks 2770 root rkt
- /var/lib/rkt/cas/imageManifest 2770 root rkt
- /var/lib/rkt/cas/blob 2770 root rkt
- /var/lib/rkt/cas/tmp 2770 root rkt
- /var/lib/rkt/cas/tree 2700 root rkt
- /var/lib/rkt/cas/treestorelocks 2700 root rkt
- /var/lib/rkt/locks 2750 root rkt
- /var/lib/rkt/pods 2750 root rkt
- /var/lib/rkt/pods/embryo 2750 root rkt
- /var/lib/rkt/pods/prepare 2750 root rkt
- /var/lib/rkt/pods/prepared 2750 root rkt
- /var/lib/rkt/pods/run 2750 root rkt
- /var/lib/rkt/pods/exited-garbage 2750 root rkt
- /var/lib/rkt/pods/garbage 2750 root rkt"
-
-pre_configure() {
-	rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch
-	./autogen.sh
-}
-
-do_install() {
-	vsv rkt-metadata
-
-	vinstall ${FILESDIR}/rkt-gc 755 etc/cron.daily
-
-	vbin build-${pkgname}-${version}/target/bin/rkt
-	vbin build-${pkgname}-${version}/tools/actool
-}
-
-rkt-stage1-fly_package() {
-	alternatives="rkt-stage1:/usr/lib/rkt/stage1.aci:/usr/lib/rkt/stage1-fly.aci"
-	short_desc+=" - fly stage1"
-	provides="rkt-stage1-${version}_${revision}"
-	pkg_install() {
-		vinstall build-${sourcepkg}-${version}/target/bin/stage1-fly.aci 644 usr/lib/rkt
-	}
-}
-
-#rkt-stage1-kvm_package() {
-#	alternatives="rkt-stage1:/usr/lib/rkt/stage1.aci:/usr/lib/rkt/stage1-kvm.aci"
-#	depends="${sourcepkg}>=${version}_${revision}"
-#	short_desc+=" - kvm stage1"
-#	provides="rkt-stage1-${version}_${revision}"
-#	pkg_install() {
-#		vinstall build-${sourcepkg}-${version}/target/bin/stage1-kvm.aci 644 usr/lib/rkt
-#	}
-#}
-
-rkt-stage1-coreos_package() {
-	alternatives="rkt-stage1:/usr/lib/rkt/stage1.aci:/usr/lib/rkt/stage1-coreos.aci"
-	short_desc+=" - coreos stage1"
-	provides="rkt-stage1-${version}_${revision}"
-	pkg_install() {
-		vinstall build-${sourcepkg}-${version}/target/bin/stage1-coreos.aci 644 usr/lib/rkt
-	}
-}

From fec8305b3a193b813f501bb52db3de4b433af6fb Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sun, 14 Feb 2021 12:12:07 +0000
Subject: [PATCH 1615/3458] gthumb: update to 3.10.2.

By ericonr:
- clean up outdated CVE patch (upstream fixed in a different way, so
patch still applied).=
- add patch for build order
- move INSTALL.msg to README.voidlinux

Closes: #28757 [via git-merge-pr]
---
 .../{INSTALL.msg => files/README.voidlinux}   |  0
 srcpkgs/gthumb/patches/build-order.patch      | 15 +++++++++++++
 srcpkgs/gthumb/patches/cve-2018-18718.patch   | 21 -------------------
 srcpkgs/gthumb/template                       |  8 +++++--
 4 files changed, 21 insertions(+), 23 deletions(-)
 rename srcpkgs/gthumb/{INSTALL.msg => files/README.voidlinux} (100%)
 create mode 100644 srcpkgs/gthumb/patches/build-order.patch
 delete mode 100644 srcpkgs/gthumb/patches/cve-2018-18718.patch

diff --git a/srcpkgs/gthumb/INSTALL.msg b/srcpkgs/gthumb/files/README.voidlinux
similarity index 100%
rename from srcpkgs/gthumb/INSTALL.msg
rename to srcpkgs/gthumb/files/README.voidlinux
diff --git a/srcpkgs/gthumb/patches/build-order.patch b/srcpkgs/gthumb/patches/build-order.patch
new file mode 100644
index 000000000000..ceab3d3537f0
--- /dev/null
+++ b/srcpkgs/gthumb/patches/build-order.patch
@@ -0,0 +1,15 @@
+diff --git a/gthumb/meson.build b/gthumb/meson.build
+index 64c93578..c348af81 100644
+--- gthumb/meson.build
++++ gthumb/meson.build
+@@ -311,6 +311,7 @@ gthumb_exe = executable('gthumb',
+   ],
+   dependencies : [
+     common_deps,
++    gthumb_h_dep,
+     jpeg_deps,
+     authors_dep,
+     use_exiv2 ? exiv2_dep : [],
+-- 
+GitLab
+
diff --git a/srcpkgs/gthumb/patches/cve-2018-18718.patch b/srcpkgs/gthumb/patches/cve-2018-18718.patch
deleted file mode 100644
index 4280ef0bb376..000000000000
--- a/srcpkgs/gthumb/patches/cve-2018-18718.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: CVE-2018-18718
-             An issue was discovered in gThumb through 3.6.2. There is a 
-             double-free vulnerability in the add_themes_from_dir method in 
-             dlg-contact-sheet.c because of two successive calls of g_free,
-             each of which frees the same buffer.
-             Thanks Tianjun Wu - https://gitlab.gnome.org/leoaccount
-             https://gitlab.gnome.org/GNOME/gthumb/issues/18
-Author: Herbert Parentes Fortes Neto <hpfn@debian.org>
-Last-Update: 2018-10-30
-Index: gthumb/extensions/contact_sheet/dlg-contact-sheet.c
-===================================================================
---- extensions/contact_sheet/dlg-contact-sheet.c
-+++ extensions/contact_sheet/dlg-contact-sheet.c
-@@ -352,6 +352,7 @@ add_themes_from_dir (DialogData *data,
- 		if (! g_key_file_load_from_data (key_file, buffer, size, G_KEY_FILE_NONE, NULL)) {
- 			g_key_file_free (key_file);
- 			g_free (buffer);
-+			buffer = NULL;
- 			g_object_unref (file);
- 			g_object_unref (file_info);
- 		}
diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template
index cc2a53d07969..b5f8e2e54ccc 100644
--- a/srcpkgs/gthumb/template
+++ b/srcpkgs/gthumb/template
@@ -1,6 +1,6 @@
 # Template file for 'gthumb'
 pkgname=gthumb
-version=3.10.0
+version=3.10.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel"
@@ -14,7 +14,7 @@ maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
 license="GPL-2.0-or-later"
 homepage="http://live.gnome.org/gthumb"
 distfiles="${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz"
-checksum=3e71f8395a01acfc80af4126fca99d99e7b227aed750bafd64734f08c9edec48
+checksum=fdeae42818378f9b3cab00604eeeb5b7c0a7a5ecfe69de08b993867746435c93
 
 LDFLAGS="-fPIC"
 
@@ -24,6 +24,10 @@ desc_option_clutter="Enable clutter (for slideshows)"
 desc_option_soup="Enable webservices"
 build_options_default="clutter gstreamer soup"
 
+post_install() {
+	vdoc $FILESDIR/README.voidlinux
+}
+
 gthumb-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 8d3a14f0287c159b2f19658f180f8d337cb86736 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Sat, 13 Feb 2021 19:36:02 +0100
Subject: [PATCH 1616/3458] rtkit: requires dbus and polkit

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

diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template
index b418f54cea7f..da011f844cb1 100644
--- a/srcpkgs/rtkit/template
+++ b/srcpkgs/rtkit/template
@@ -1,10 +1,11 @@
 # Template file for 'rtkit'
 pkgname=rtkit
 version=0.13
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="dbus-devel libcap-devel"
+depends="dbus polkit"
 short_desc="Realtime Policy and Watchdog Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later"

From 66c7ce53050af1cbc6f2639e088937fbb8b8289e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 14 Feb 2021 13:39:07 -0800
Subject: [PATCH 1617/3458] libyang: update to 1.0.215

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

diff --git a/srcpkgs/libyang/template b/srcpkgs/libyang/template
index ddcc3a84e5b8..55ccc3ba74b5 100644
--- a/srcpkgs/libyang/template
+++ b/srcpkgs/libyang/template
@@ -1,6 +1,6 @@
 # Template file for 'libyang'
 pkgname=libyang
-version=1.0.184
+version=1.0.215
 revision=1
 build_style=cmake
 configure_args="-DENABLE_LYD_PRIV=ON"
@@ -11,7 +11,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/CESNET/libyang"
 distfiles="https://github.com/CESNET/libyang/archive/v${version}.tar.gz"
-checksum=1a5637451b73c4c5683837eb4c51371bb084795f653bc1a5fc20fed5541b58bc
+checksum=c4498a77a7c12a28c9911f993eeafbf2badd2ecea58bb74781bd61cfc635e4c9
 
 post_install() {
 	vlicense LICENSE

From 2bd80c1279756ea95cee1756f9bdea03fa7abad0 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 14 Feb 2021 13:39:23 -0800
Subject: [PATCH 1618/3458] frr: update to 7.5

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

diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index 5becfd4672e4..808601ff4973 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,7 +1,7 @@
 # Template file for 'frr'
 pkgname=frr
-version=7.4
-revision=2
+version=7.5
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 # chroot-texinfo is not able to build frr's docs
@@ -16,12 +16,13 @@ hostmakedepends="pkg-config flex bison autoconf automake libtool
  python3 python3-Sphinx python3-devel libyang-tools"
 makedepends="pcre-devel libcap-devel json-c-devel pam-devel c-ares-devel
  readline-devel python3-devel libyang-devel"
+checkdepends="python3-pytest"
 short_desc="IP routing protocol suite"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://frrouting.org"
 distfiles="https://github.com/FRRouting/frr/archive/${pkgname}-${version}.tar.gz"
-checksum=3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a
+checksum=54066e82a82751ec5876d9b67aa0cb24fe94e19e7371af290ac25099eda9f136
 python_version=3
 system_groups="_frrvty"
 system_accounts="_frr"

From 0d8a8bdadc1d069c36ca77662d1c9d12a2c2c6f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 15 Feb 2021 01:42:22 +0100
Subject: [PATCH 1619/3458] libheif: update to 1.11.0

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

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index ff9cafb43fa3..64518027febf 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,8 +1,9 @@
 # Template file for 'libheif'
 pkgname=libheif
-version=1.10.0
-revision=3
+version=1.11.0
+revision=1
 build_style=gnu-configure
+configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
 makedepends="libjpeg-turbo-devel libpng-devel libde265-devel"
 short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
@@ -10,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-3.0-or-later"
 homepage="http://www.libheif.org"
 distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=317a44bf157ba297638ab5a258040ef6ec4895d620cd58f52195f3f89c9eea28
+checksum=993c3320e179b8fdce983e3a7e96615af3830077be6b0ab28bfa25579df08d26
 
 pre_configure() {
 	./autogen.sh

From deec415867720d26856fa7cbb60966ef62f96219 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, 15 Feb 2021 08:48:00 +0700
Subject: [PATCH 1620/3458] gperftools: prepare for musl 1.2.2

Support was added to musl in v1.2.1-76-g7c71792e
---
 .../patches/sigev_notify_thread_id.patch      | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 srcpkgs/gperftools/patches/sigev_notify_thread_id.patch

diff --git a/srcpkgs/gperftools/patches/sigev_notify_thread_id.patch b/srcpkgs/gperftools/patches/sigev_notify_thread_id.patch
new file mode 100644
index 000000000000..131e06a3f9f0
--- /dev/null
+++ b/srcpkgs/gperftools/patches/sigev_notify_thread_id.patch
@@ -0,0 +1,65 @@
+From d9c4c3b481e641b719d3d790987ed7d094157bf2 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, 12 Feb 2021 19:21:18 +0700
+Subject: [PATCH] profile-handler: use documented sigev_notify_thread_id in
+ sigevent
+
+sigevent(7) is documented to have sigev_notify_thread_id as its member.
+In glibc system, it's a macro expanded to the legacy _sigev_un._tid,
+_sigev_un._tid is obviously an internal implementation detail as
+signaled by its underscore prefix. And this macro was hidden inside
+linux/signal.h in older version of glibc.
+
+On Linux that use musl libc, sigev_notify_thread_id is also a macro, but
+it's expanded to __sev_fields.sigev_notify_thread_id
+
+[alkondratenko@gmail.com: amputated broken linux/signal.h dependency]
+[alkondratenko@gmail.com: see https://github.com/gperftools/gperftools/pull/1250]
+Signed-off-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
+---
+ src/profile-handler.cc | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git src/profile-handler.cc src/profile-handler.cc
+index 7fdcb693..fe3715b1 100644
+--- src/profile-handler.cc
++++ src/profile-handler.cc
+@@ -49,6 +49,9 @@
+ #if HAVE_LINUX_SIGEV_THREAD_ID
+ // for timer_{create,settime} and associated typedefs & constants
+ #include <time.h>
++// for sigevent
++#include <signal.h>
++
+ // for sys_gettid
+ #include "base/linux_syscall_support.h"
+ // for perftools_pthread_key_create
+@@ -61,6 +64,18 @@
+ #include "base/spinlock.h"
+ #include "maybe_threads.h"
+ 
++// Some Linux systems don't have sigev_notify_thread_id defined in
++// signal.h (despite having SIGEV_THREAD_ID defined) and also lack
++// working linux/signal.h. So lets workaround. Note, we know that at
++// least on Linux sigev_notify_thread_id is macro.
++//
++// See https://sourceware.org/bugzilla/show_bug.cgi?id=27417 and
++// https://bugzilla.kernel.org/show_bug.cgi?id=200081
++//
++#if __linux__ && HAVE_LINUX_SIGEV_THREAD_ID && !defined(sigev_notify_thread_id)
++#define sigev_notify_thread_id _sigev_un._tid
++#endif
++
+ using std::list;
+ using std::string;
+ 
+@@ -272,7 +287,7 @@ static void StartLinuxThreadTimer(int timer_type, int signal_number,
+   struct itimerspec its;
+   memset(&sevp, 0, sizeof(sevp));
+   sevp.sigev_notify = SIGEV_THREAD_ID;
+-  sevp._sigev_un._tid = sys_gettid();
++  sevp.sigev_notify_thread_id = sys_gettid();
+   sevp.sigev_signo = signal_number;
+   clockid_t clock = CLOCK_THREAD_CPUTIME_ID;
+   if (timer_type == ITIMER_REAL) {

From 36210f4624aafeba1b5c98269d01db1935e1bcdf Mon Sep 17 00:00:00 2001
From: Colin Reeder <colin@vpzom.click>
Date: Sun, 14 Feb 2021 15:26:05 -0700
Subject: [PATCH 1621/3458] audacious-plugins: Add glib-devel to build deps

This seems to be required to build the mpris2 plugin
---
 srcpkgs/audacious-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index 9cc976b2f23d..84bcfd2113f3 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -2,10 +2,10 @@
 #Keep in sync with audacious!
 pkgname=audacious-plugins
 version=4.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
-hostmakedepends="gettext pkg-config"
+hostmakedepends="gettext pkg-config glib-devel"
 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

From 5846a906ae3306950fe063c8cc476e18dadbf914 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 27 Oct 2020 22:21:45 +0400
Subject: [PATCH 1622/3458] libevdev: update to 1.11.0.

Should include a license fix, but we always had it at MIT.

Closes: #25921 [via git-merge-pr]
---
 srcpkgs/libevdev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevdev/template b/srcpkgs/libevdev/template
index 2515be2f6380..2c077e03a5d8 100644
--- a/srcpkgs/libevdev/template
+++ b/srcpkgs/libevdev/template
@@ -1,6 +1,6 @@
 # Template file for 'libevdev'
 pkgname=libevdev
-version=1.9.1
+version=1.11.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gcov"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libevdev/"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f5603c48c5afd76b14df7a5124e0a94a102f8da0d45826192325069d1bbc7acb
+checksum=63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0
 
 post_install() {
 	vlicense COPYING

From 411386deb8743f316c9304d33878fdce75a455e2 Mon Sep 17 00:00:00 2001
From: Giuseppe Fierro <gspe@ae-design.ws>
Date: Thu, 14 Jan 2021 21:48:51 +0100
Subject: [PATCH 1623/3458] libzen: upgrade to 0.4.38

This version + patch applied by ericonr solve thread safety problem
https://github.com/sbraz/pymediainfo/issues/105

Also by ericonr:
- don't use create_wrksrc unnecessarily

Closes: #27936 [via git-merge-pr]
---
 srcpkgs/libzen/files/proper-mt-fix.patch | 109 +++++++++++++++++++++++
 srcpkgs/libzen/template                  |  16 ++--
 2 files changed, 120 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/libzen/files/proper-mt-fix.patch

diff --git a/srcpkgs/libzen/files/proper-mt-fix.patch b/srcpkgs/libzen/files/proper-mt-fix.patch
new file mode 100644
index 000000000000..ca5776474cbf
--- /dev/null
+++ b/srcpkgs/libzen/files/proper-mt-fix.patch
@@ -0,0 +1,109 @@
+Upstream: yes
+Fix checks for gmtime_r and localtime_r availability.
+Also fix Http_Cookies where gmtime() was still being used.
+
+diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
+index 8e431b5..6a25aee 100644
+--- a/Project/CMake/CMakeLists.txt
++++ b/Project/CMake/CMakeLists.txt
+@@ -133,6 +133,16 @@ if((LONG_SIZE GREATER 4) AND (SIZE_T_SIZE EQUAL LONG_SIZE))
+   target_compile_definitions(zen PUBLIC SIZE_T_IS_LONG)
+ endif()
+ 
++include(CheckSymbolExists)
++check_symbol_exists(gmtime_r time.h HAVE_GMTIME_R)
++if(HAVE_GMTIME_R)
++  target_compile_definitions(zen PUBLIC HAVE_GMTIME_R)
++endif()
++check_symbol_exists(localtime_r time.h HAVE_LOCALTIME_R)
++if(HAVE_LOCALTIME_R)
++  target_compile_definitions(zen PUBLIC HAVE_LOCALTIME_R)
++endif()
++
+ target_include_directories(zen PUBLIC
+   $<BUILD_INTERFACE:${ZenLib_SOURCES_PATH}>\r $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>)
+diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
+index c0ff266..62a1bf5 100644
+--- a/Project/GNU/Library/configure.ac
++++ b/Project/GNU/Library/configure.ac
+@@ -268,6 +268,11 @@ dnl External libs
+ dnl
+ LDFLAGS="$LDFLAGS -lpthread -lstdc++"
+ 
++dnl -------------------------------------------------------------------------
++dnl Check if thread safe variants of time functions are available
++dnl
++AC_CHECK_FUNCS(gmtime_r localtime_r)
++
+ dnl #########################################################################
+ dnl ### Output
+ dnl #########################################################################
+diff --git a/Source/ZenLib/Format/Http/Http_Cookies.cpp b/Source/ZenLib/Format/Http/Http_Cookies.cpp
+index 1345aa0..eb41690 100644
+--- a/Source/ZenLib/Format/Http/Http_Cookies.cpp
++++ b/Source/ZenLib/Format/Http/Http_Cookies.cpp
+@@ -86,7 +86,21 @@ void Cookies::Create_Lines(std::ostream& Out)
+         if (Cookie->second.Expires!=(time_t)-1)
+         {
+             char Temp[200];
+-            if (strftime(Temp, 200, "%a, %d-%b-%Y %H:%M:%S GMT", gmtime(&Cookie->second.Expires)))
++            #if defined(HAVE_GMTIME_R)
++            struct tm Gmt_Temp;
++            struct tm *Gmt=gmtime_r(&Cookie->second.Expires, &Gmt_Temp);
++            #elif defined(_MSC_VER)
++            struct tm Gmt_Temp;
++            errno_t gmtime_s_Result=gmtime_s(&Gmt_Temp , &Cookie->second.Expires);
++            struct tm* Gmt=gmtime_s_Result?NULL:&Gmt_Temp;
++            #else
++            #ifdef __GNUC__
++            #warning "This version of ZenLib is not thread safe"
++            #endif
++            struct tm *Gmt=gmtime(&Cookie->second.Expires);
++            #endif
++
++            if (strftime(Temp, 200, "%a, %d-%b-%Y %H:%M:%S GMT", Gmt))
+                 Out << "; expires=" << Temp;
+         }
+         if (!Cookie->second.Path.empty())
+diff --git a/Source/ZenLib/Ztring.cpp b/Source/ZenLib/Ztring.cpp
+index 6b705c3..069e001 100644
+--- a/Source/ZenLib/Ztring.cpp
++++ b/Source/ZenLib/Ztring.cpp
+@@ -1312,7 +1312,7 @@ Ztring& Ztring::Date_From_Seconds_1970 (const int32s Value)
+ Ztring& Ztring::Date_From_Seconds_1970 (const int64s Value)
+ {
+     time_t Time=(time_t)Value;
+-    #if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _BSD_SOURCE || _SVID_SOURCE || _POSIX_SOURCE
++    #if defined(HAVE_GMTIME_R)
+     struct tm Gmt_Temp;
+     struct tm *Gmt=gmtime_r(&Time, &Gmt_Temp);
+     #elif defined(_MSC_VER)
+@@ -1320,6 +1320,9 @@ Ztring& Ztring::Date_From_Seconds_1970 (const int64s Value)
+     errno_t gmtime_s_Result=gmtime_s(&Gmt_Temp , &Time);
+     struct tm* Gmt=gmtime_s_Result?NULL:&Gmt_Temp;
+     #else
++    #ifdef __GNUC__
++    #warning "This version of ZenLib is not thread safe"
++    #endif
+     struct tm *Gmt=gmtime(&Time);
+     #endif
+     if (!Gmt)
+@@ -1352,7 +1355,7 @@ Ztring& Ztring::Date_From_Seconds_1970 (const int64s Value)
+ Ztring& Ztring::Date_From_Seconds_1970_Local (const int32u Value)
+ {
+     time_t Time=(time_t)Value;
+-    #if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _BSD_SOURCE || _SVID_SOURCE || _POSIX_SOURCE
++    #if defined(HAVE_LOCALTIME_R)
+     struct tm Gmt_Temp;
+     struct tm *Gmt=localtime_r(&Time, &Gmt_Temp);
+     #elif defined(_MSC_VER)
+@@ -1360,6 +1363,9 @@ Ztring& Ztring::Date_From_Seconds_1970_Local (const int32u Value)
+     errno_t localtime_s_Result=localtime_s(&Gmt_Temp , &Time);
+     struct tm* Gmt=localtime_s_Result?NULL:&Gmt_Temp;
+     #else
++    #ifdef __GNUC__
++    #warning "This version of ZenLib is not thread safe"
++    #endif
+     struct tm *Gmt=localtime(&Time);
+     #endif
+     Ztring DateT;
diff --git a/srcpkgs/libzen/template b/srcpkgs/libzen/template
index 9294962da975..43a48529fba0 100644
--- a/srcpkgs/libzen/template
+++ b/srcpkgs/libzen/template
@@ -1,20 +1,26 @@
 # Template build file for 'libzen'.
 pkgname=libzen
-version=0.4.37
-revision=2
+version=0.4.38
+revision=1
 short_desc="Shared library for libmediainfo and mediainfo"
 homepage="http://mediaarea.net/MediaInfo"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="zlib"
 
 distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.gz"
-checksum=8c4323bd3f1a286a565b634cb00c9877922296679f49ac55b05f7c6e56d77c43
+checksum=ad98fccec235ed76a40e7da8856f0bcc9c8d07cafe4c3ce30c47407760add786
 
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 configure_args="--enable-shared"
-create_wrksrc=yes
-build_wrksrc="ZenLib/Project/GNU/Library"
+wrksrc=ZenLib
+build_wrksrc="Project/GNU/Library"
+
+do_patch() {
+	# applying via patches/ wasn't working great
+	cd $XBPS_BUILDDIR/ZenLib
+	patch -Np1 < $FILESDIR/proper-mt-fix.patch
+}
 
 pre_configure() {
 	autoreconf -fi

From eb86ed70863320c29aa505469bd422f5e328706b Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 20 Jan 2021 10:01:48 +1100
Subject: [PATCH 1624/3458] gcovr: add missing runtime dependencies

Closes: #28042 [via git-merge-pr]
---
 srcpkgs/gcovr/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gcovr/template b/srcpkgs/gcovr/template
index 06dec001cf56..0f3e294b827a 100644
--- a/srcpkgs/gcovr/template
+++ b/srcpkgs/gcovr/template
@@ -1,17 +1,19 @@
 # Template file for 'gcovr'
 pkgname=gcovr
 version=4.2
-revision=3
+revision=4
 build_style=python3-module
-pycompile_module="gcovr"
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-Jinja2"
+depends="python3-setuptools python3-Jinja2 python3-lxml python3-Pygments"
+#checkdepends="$depends cmake flake8 python3-pytest-cov which"
 short_desc="Generates a simple report that summarizes the gcc code coverage"
 maintainer="Andre Klitzing <aklitzing@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://gcovr.com/"
 distfiles="https://github.com/gcovr/gcovr/archive/${version}.tar.gz"
 checksum=589d5cb7164c285192ed0837d3cc17001ba25211e24933f0ba7cb9cf38b8a30e
+# requires unpackaged pyutilibs and ends up running code from examples, which require gcovr in PATH
+make_check=no
 
 post_install() {
 	vlicense LICENSE.txt

From d45be6409685173db8e339dcfc915155151e6f22 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:33:18 +0100
Subject: [PATCH 1625/3458] lttng-modules-dkms: update to 2.12.4.

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

diff --git a/srcpkgs/lttng-modules-dkms/template b/srcpkgs/lttng-modules-dkms/template
index a86877cd6239..97355e1bc7ff 100644
--- a/srcpkgs/lttng-modules-dkms/template
+++ b/srcpkgs/lttng-modules-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'lttng-modules-dkms'
 pkgname=lttng-modules-dkms
-version=2.12.3
+version=2.12.4
 revision=1
 wrksrc="lttng-modules-${version}"
 depends="dkms"
@@ -9,7 +9,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="LGPL-2.1-only, GPL-2.0-only, MIT"
 homepage="https://lttng.org"
 distfiles="${homepage}/files/lttng-modules/lttng-modules-${version}.tar.bz2"
-checksum=673ef85c9f03e9b8fed10795e09d4e68add39404b70068d08b10f7b85754d7f0
+checksum=fe66400fa1b85bff1b9ae24419c74e3bb7d358d643eade0594d81b48bd190688
 
 dkms_modules="lttng-modules ${version}"
 

From 395332424b98210078a65a8bde8c3e4c529060a0 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Wed, 13 Jan 2021 15:05:49 +0900
Subject: [PATCH 1626/3458] terraform-ls: update to 0.12.1

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 srcpkgs/terraform-ls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 65b952c7dca2..ace731beceed 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
-version=0.11.0
+version=0.12.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,7 +9,7 @@ maintainer="Sora Morimoto <sora@morimoto.io>"
 license="MPL-2.0"
 homepage="https://github.com/hashicorp/terraform-ls"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=1cdbc77a4f6c91183f54b7d9d2a2ae36f9561d313edfd2ab35b33310fd42a852
+checksum=796577a1b9da762d284b1765a033660670ed607c62455adb3299dacbd90cdb2e
 
 post_install() {
 	vlicense LICENSE

From 5d8db565bba8f8bfa53d66a5f6d3879b158ab956 Mon Sep 17 00:00:00 2001
From: AluminumTank <joel@thebeckmeyers.xyz>
Date: Mon, 4 Jan 2021 12:02:45 -0500
Subject: [PATCH 1627/3458] nginx: build with http_slice_module

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

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index e05fae00b8d5..14dd2dec2873 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,8 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
-reverts="1.17.7_1"
 version=1.18.0
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
@@ -32,9 +31,10 @@ make_dirs="/var/log/nginx 0750 root root
  /var/tmp 1777 root root
  /var/tmp/nginx 0750 nginx root"
 
-build_options="geoip stream"
+build_options="geoip stream slice"
 desc_option_stream="Enable support for stream proxies"
-build_options_default="geoip stream"
+desc_option_slice="Enable support for slice filters"
+build_options_default="geoip stream slice"
 
 do_configure() {
 	local cfgdir=/etc/nginx
@@ -77,7 +77,9 @@ do_configure() {
 		--with-http_stub_status_module \
 		--with-http_sub_module \
 		$(vopt_if geoip --with-http_geoip_module) \
-		$(vopt_if stream "$stream_modules")
+		$(vopt_if stream "$stream_modules") \
+		$(vopt_if slice --with-http_slice_module)
+
 }
 
 pre_build() {

From 29b07edcbef013c5574ebe358147607a2529a456 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sat, 7 Nov 2020 16:30:31 -0600
Subject: [PATCH 1628/3458] tpm2-tss: update to 3.0.3

Closes: #27408 [via git-merge-pr]
---
 srcpkgs/tpm2-tss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c93788439e06..b22b99847776 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,6 +1,6 @@
 # Template file for 'tpm2-tss'
 pkgname=tpm2-tss
-version=3.0.1
+version=3.0.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
@@ -11,7 +11,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/tpm2-software/tpm2-tss"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=136131edb7198b28430beb2c4c7f244c1590b2217c4a9a80bc33dc2a547a9237
+checksum=2242f2646fc13234dbeaf959d1fb1c23dc07b7786e7acfd98189cdeca1361efd
 
 system_accounts="_tss"
 

From 44a8e51f7afd4e539a889275919ca46c4f372163 Mon Sep 17 00:00:00 2001
From: endigma <34945114+endigma-4426@users.noreply.github.com>
Date: Tue, 12 Jan 2021 18:53:55 -0400
Subject: [PATCH 1629/3458] volctl: remove pulseaudio from depends.

volctl package requires pulseaudio currently, but is also totally
functional with pipewire's built in pulse server, so the dependency on
pulseaudio shouldn't be hardcoded.

Closes: #27872 [via git-merge-pr]
---
 srcpkgs/volctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 305e7e9ba1f5..0b4dc7d4409c 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -4,8 +4,8 @@ version=0.8.0
 revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-gobject pulseaudio desktop-file-utils"
-short_desc="Lightweight volume control that sits in your systray"
+depends="python3-gobject desktop-file-utils"
+short_desc="Lightweight volume control for pulseaudio that sits in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"

From 036da40d943b2f83c267713c388507702b3c6381 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 11 Oct 2020 02:24:27 -0300
Subject: [PATCH 1630/3458] devilutionX: update to 1.1.0

By ericonr:
- don't define our own do_install
- remove INSTALL.msg (mostly unnecessary)

Closes: #25511 [via git-merge-pr]
---
 srcpkgs/devilutionX/INSTALL.msg               |  1 -
 ...6fe89ea1977aa296277694a6e94314aca0a8.patch | 30 -------------------
 srcpkgs/devilutionX/template                  | 18 ++---------
 3 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/devilutionX/INSTALL.msg
 delete mode 100644 srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch

diff --git a/srcpkgs/devilutionX/INSTALL.msg b/srcpkgs/devilutionX/INSTALL.msg
deleted file mode 100644
index 82d521f6983c..000000000000
--- a/srcpkgs/devilutionX/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-This package does NOT include the Diablo I game data.
diff --git a/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch b/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch
deleted file mode 100644
index 9dfe2413e72c..000000000000
--- a/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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.
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 43963071c583..dfef90b4f407 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,6 +1,6 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=cmake
 configure_args="-DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
@@ -10,21 +10,9 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=165564fefdbfd0b4fbf74688ea1beb1d811eb1d8e200b9faad5b70ae2ac7564e
-
+checksum=395ec298df5383abe60550d45adba5e5811984589ccb1e504891b267b3c467c1
 nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/25453/steps/shell_3/logs/stdio"
 
-do_install() {
-	vbin build/devilutionx
-	vmkdir usr/share/applications
-	vmkdir usr/share/fonts/truetype
-	vmkdir usr/share/icons/hicolor/16x16/apps
-	vmkdir usr/share/icons/hicolor/32x32/apps
-	vmkdir usr/share/icons/hicolor/48x48/apps
-	vinstall Packaging/fedora/devilutionx.desktop 0644 usr/share/applications
-	vinstall Packaging/resources/CharisSILB.ttf 0644 usr/share/fonts/truetype
-	cp Packaging/resources/16.png ${DESTDIR}/usr/share/icons/hicolor/16x16/apps/devilutionx.png
-	cp Packaging/resources/Diablo_32.png ${DESTDIR}/usr/share/icons/hicolor/32x32/apps/devilutionx.png
-	cp Packaging/resources/Diablo_48.png ${DESTDIR}/usr/share/icons/hicolor/48x48/apps/devilutionx.png
+post_install() {
 	vlicense LICENSE
 }

From 651dcc6eedae9b4d25abb1a8e0e77e2baee9527f Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Jan 2021 17:38:38 -0800
Subject: [PATCH 1631/3458] fceux: update to 2.3.0.

This switches the GUI from GTK3 to Qt.
GTK3 is still available, but did not work fully in my testing.
Qt is the default and recommended GUI, and it worked.

By ericonr:
- fix build for musl

Closes: #27646 [via git-merge-pr]
---
 srcpkgs/fceux/patches/fix-cross-compile.patch |  10 --
 srcpkgs/fceux/patches/isascii-musl.patch      |  13 ++
 srcpkgs/fceux/patches/scons-python-3.patch    | 111 ------------------
 srcpkgs/fceux/template                        |  30 ++---
 4 files changed, 22 insertions(+), 142 deletions(-)
 delete mode 100644 srcpkgs/fceux/patches/fix-cross-compile.patch
 create mode 100644 srcpkgs/fceux/patches/isascii-musl.patch
 delete mode 100644 srcpkgs/fceux/patches/scons-python-3.patch

diff --git a/srcpkgs/fceux/patches/fix-cross-compile.patch b/srcpkgs/fceux/patches/fix-cross-compile.patch
deleted file mode 100644
index a4caee5bb7a1..000000000000
--- a/srcpkgs/fceux/patches/fix-cross-compile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- SConstruct.orig
-+++ SConstruct
-@@ -34,6 +34,7 @@
- 
- prefix = GetOption('prefix')
- env = Environment(options = opts)
-+env.Append(ENV = {'PATH' : os.environ['PATH']})
- 
- if env['RELEASE']:
-   env.Append(CPPDEFINES=["PUBLIC_RELEASE"])
diff --git a/srcpkgs/fceux/patches/isascii-musl.patch b/srcpkgs/fceux/patches/isascii-musl.patch
new file mode 100644
index 000000000000..53b9c20ebce1
--- /dev/null
+++ b/srcpkgs/fceux/patches/isascii-musl.patch
@@ -0,0 +1,13 @@
+diff --git src/drivers/Qt/HexEditor.cpp src/drivers/Qt/HexEditor.cpp
+index 8f078ac..010b2cf 100644
+--- src/drivers/Qt/HexEditor.cpp
++++ src/drivers/Qt/HexEditor.cpp
+@@ -43,6 +43,8 @@
+ #include "Qt/ConsoleUtilities.h"
+ #include "Qt/ConsoleWindow.h"
+ 
++#undef isascii
++
+ static bool memNeedsCheck = false;
+ static HexBookMarkManager_t hbm;
+ static std::list <HexEditorDialog_t*> winList;
diff --git a/srcpkgs/fceux/patches/scons-python-3.patch b/srcpkgs/fceux/patches/scons-python-3.patch
deleted file mode 100644
index b4805e93309a..000000000000
--- a/srcpkgs/fceux/patches/scons-python-3.patch
+++ /dev/null
@@ -1,111 +0,0 @@
- backported from 878245fe Altered SCons build scripts to work with Python 3.
-diff --git SConstruct SConstruct
---- SConstruct
-+++ SConstruct
-@@ -47,30 +47,30 @@ if platform.system == "ppc":
- # Default compiler flags:
- env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare'])
- 
--if os.environ.has_key('PLATFORM'):
-+if 'PLATFORM' in os.environ:
-   env.Replace(PLATFORM = os.environ['PLATFORM'])
--if os.environ.has_key('CC'):
-+if 'CC' in os.environ:
-   env.Replace(CC = os.environ['CC'])
--if os.environ.has_key('CXX'):
-+if 'CXX' in os.environ:
-   env.Replace(CXX = os.environ['CXX'])
--if os.environ.has_key('WINDRES'):
-+if 'WINDRES' in os.environ:
-   env.Replace(WINDRES = os.environ['WINDRES'])
--if os.environ.has_key('CFLAGS'):
-+if 'CFLAGS' in os.environ:
-   env.Append(CCFLAGS = os.environ['CFLAGS'].split())
--if os.environ.has_key('CXXFLAGS'):
-+if 'CXXFLAGS' in os.environ:
-   env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split())
--if os.environ.has_key('CPPFLAGS'):
-+if 'CPPFLAGS' in os.environ:
-   env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split())
--if os.environ.has_key('LDFLAGS'):
-+if 'LDFLAGS' in os.environ:
-   env.Append(LINKFLAGS = os.environ['LDFLAGS'].split())
--if os.environ.has_key('PKG_CONFIG_PATH'):
-+if 'PKG_CONFIG_PATH' in os.environ:
-   env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
--if not os.environ.has_key('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin':
-+if 'PKG_CONFIG_PATH' not in os.environ and env['PLATFORM'] == 'darwin':
-   env['ENV']['PKG_CONFIG_PATH'] = "/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig"
--if os.environ.has_key('PKG_CONFIG_LIBDIR'):
-+if 'PKG_CONFIG_LIBDIR' in os.environ:
-   env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR']
- 
--print "platform: ", env['PLATFORM']
-+print("platform: ", env['PLATFORM'])
- 
- # compile with clang
- if env['CLANG']:
-@@ -104,18 +104,18 @@ else:
-     assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
-   if env['SDL2']:
-     if not conf.CheckLib('SDL2'):
--      print 'Did not find libSDL2 or SDL2.lib, exiting!'
-+      print('Did not find libSDL2 or SDL2.lib, exiting!')
-       Exit(1)
-     env.Append(CPPDEFINES=["_SDL2"])
-     env.ParseConfig('pkg-config sdl2 --cflags --libs')
-   else:
-     if not conf.CheckLib('SDL'):
--      print 'Did not find libSDL or SDL.lib, exiting!'
-+      print('Did not find libSDL or SDL.lib, exiting!')
-       Exit(1)
-     env.ParseConfig('sdl-config --cflags --libs')
-   if env['GTK']:
-     if not conf.CheckLib('gtk-x11-2.0'):
--      print 'Could not find libgtk-2.0, exiting!'
-+      print('Could not find libgtk-2.0, exiting!')
-       Exit(1)
-     # Add compiler and linker flags from pkg-config
-     config_string = 'pkg-config --cflags --libs gtk+-2.0'
-@@ -154,7 +154,7 @@ else:
-         env.Append(CCFLAGS = ["-I/usr/include/lua"])
-         lua_available = True
-       if lua_available == False:
--        print 'Could not find liblua, exiting!'
-+        print ('Could not find liblua, exiting!')
-         Exit(1)
-     else:
-       env.Append(CCFLAGS = ["-Isrc/lua/src"])
-@@ -168,7 +168,7 @@ else:
-     gd = conf.CheckLib('gd', autoadd=1)
-     if gd == 0:
-       env['LOGO'] = 0
--      print 'Did not find libgd, you won\'t be able to create a logo screen for your avis.'
-+      print('Did not find libgd, you won\'t be able to create a logo screen for your avis.')
-    
-   if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c', autoadd=1):
-     conf.env.Append(CCFLAGS = "-DOPENGL")
-@@ -182,8 +182,8 @@ if sys.byteorder == 'little' or env['PLATFORM'] == 'win32':
- if env['FRAMESKIP']:
-   env.Append(CPPDEFINES = ['FRAMESKIP'])
- 
--print "base CPPDEFINES:",env['CPPDEFINES']
--print "base CCFLAGS:",env['CCFLAGS']
-+print("base CPPDEFINES:",env['CPPDEFINES'])
-+print("base CCFLAGS:",env['CCFLAGS'])
- 
- if env['DEBUG']:
-   env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0'])
-diff --git src/SConscript src/SConscript
-index 4713e15..2001146 100644
---- src/SConscript
-+++ src/SConscript
-@@ -33,7 +33,7 @@ else:
-   platform_files = SConscript('drivers/sdl/SConscript')
- file_list.append(platform_files)
- 
--print env['LINKFLAGS']
-+print(env['LINKFLAGS'])
- 
- if env['PLATFORM'] == 'win32':
-   fceux = env.Program('fceux.exe', file_list)
diff --git a/srcpkgs/fceux/template b/srcpkgs/fceux/template
index bb96ffd5cedf..5ecaa9c7e08f 100644
--- a/srcpkgs/fceux/template
+++ b/srcpkgs/fceux/template
@@ -1,26 +1,14 @@
 # Template file for 'fceux'
 pkgname=fceux
-version=2.2.3
-revision=4
-build_style=scons
-make_build_args="SYSTEM_LUA=1 RELEASE=1 GTK=0 GTK3=1"
-hostmakedepends="pkg-config"
-makedepends="zlib-devel lua51-devel SDL-devel gtk+3-devel gd-devel glu-devel"
+version=2.3.0
+revision=1
+wrksrc="fceux-fceux-$version"
+build_style=cmake
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
+makedepends="zlib-devel lua51-devel SDL2-devel qt5-devel minizip-devel"
 short_desc="All in one NES/Famicom Emulator"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.fceux.com/"
-distfiles="${SOURCEFORGE_SITE}/fceultra/Source%20Code/${version}%20src/${pkgname}-${version}.src.tar.gz"
-checksum=4be6dda9a347f941809a3c4a90d21815b502384adfdd596adaa7b2daf088823e
-
-export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
-export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
-
-pre_build() {
-	CPPFLAGS+=" $($PKG_CONFIG --cflags lua)"
-}
-
-do_install() {
-	CPPFLAGS+=" $($PKG_CONFIG --cflags lua)"
-	scons --prefix=${DESTDIR}/usr $make_build_args install
-}
+homepage="https://fceux.com/web/home.html"
+distfiles="https://github.com/TASVideos/fceux/archive/fceux-${version}.tar.gz"
+checksum=0d3b02b3f15032f7675acb95423fd81fae286615313dfbc58cdd4de2bce17f6e

From f6ca41f148136961b3ac8fc2c9584c1d37dcfe4b Mon Sep 17 00:00:00 2001
From: Alex Childs <misuchiru03+void@gmail.com>
Date: Sun, 14 Feb 2021 14:53:27 -0600
Subject: [PATCH 1632/3458] certbot: update to 1.12.0

Closes: #28764 [via git-merge-pr]
---
 srcpkgs/certbot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 7ab61e717409..e5cde381a41c 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.11.0
+version=1.12.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz"
-checksum=6b0ce04e55379aff0a47f873fa05c084538ad0f4a9b79f33108dbb0a7a668b43
+checksum=5ee738773479bcb7794e43fedd2415acc0969b75bdd2a21f451e3bff9d99df59
 
 do_check() {
 	python3 -m pytest

From a269caf3bcbc33080092b68e069cdd59daa408d5 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 15 Nov 2020 19:43:58 +0100
Subject: [PATCH 1633/3458] openldap: update to 2.4.56.

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

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index ce708074fbcb..c3524b1ee7ff 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,6 +1,6 @@
 # Template file for 'openldap'
 pkgname=openldap
-version=2.4.52
+version=2.4.56
 revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr
@@ -18,11 +18,11 @@ makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="OLDAP-2.0"
 homepage="http://www.openldap.org"
 distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=277b453f8e1593d759e6d6f4c8744f2042fa843e558f8e267f1c7890b8c35508
+checksum=25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0
 
 system_accounts="ldap"
 ldap_homedir="/var/lib/openldap"

From 7807b39d2b3dea516a31c50ce9ce21dcc8b53be4 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, 15 Feb 2021 12:43:39 +0700
Subject: [PATCH 1634/3458] mit-scheme-c: fix build musl 1.2.2

---
 srcpkgs/mit-scheme-c/patches/host_os-is-linux.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/mit-scheme-c/patches/host_os-is-linux.patch

diff --git a/srcpkgs/mit-scheme-c/patches/host_os-is-linux.patch b/srcpkgs/mit-scheme-c/patches/host_os-is-linux.patch
new file mode 100644
index 000000000000..66616f5e2df2
--- /dev/null
+++ b/srcpkgs/mit-scheme-c/patches/host_os-is-linux.patch
@@ -0,0 +1,13 @@
+Index: src/microcode/configure
+===================================================================
+--- src/microcode/configure.orig
++++ src/microcode/configure
+@@ -5441,7 +5441,7 @@ EXE_NAME=mit-scheme-${mit_scheme_native_
+ DO_GCC_TESTS=no
+ GNU_LD=no
+ case ${host_os} in
+-linux-gnu)
++linux-*)
+     M4_FLAGS="${M4_FLAGS} -P __linux__,1"
+     DO_GCC_TESTS=yes
+     GNU_LD=yes

From 2ac08a9956a10e2cb26e2ed240321a4b347ceac0 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:46:12 +0700
Subject: [PATCH 1635/3458] tldr: update to 1.0.0.alpha.

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

diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index 6c94e84a503b..c5616dc207cb 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,16 +1,19 @@
 # Template file for 'tldr'
 pkgname=tldr
-version=0.6.1
+version=1.0.0.alpha
 revision=1
+_version=${version/.alpha/-alpha}
+wrksrc=$pkgname-$_version
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"
-hostmakedepends="git"
+go_package="./cmd/tldr"
+depends="git"
 short_desc="Fast and interactive TLDR client written in Go"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="MIT"
 homepage="https://isacikgoz.me/tldr/"
-distfiles="https://github.com/isacikgoz/tldr/archive/v${version}.tar.gz"
-checksum=e377942c6dd9cbe3f9f55b7614e17b7c5f0694b326ad3993d0cde59aca8dc8fa
+distfiles="https://github.com/isacikgoz/tldr/archive/v${_version}.tar.gz"
+checksum=d40e1c602d84acc67cdee3b9bed001fb8ec198c7049c1d05eb071ab05af66c19
 alternatives="tldr:tldr:/usr/bin/gtldr"
 conflicts="tealdeer<=1.2.0_1"
 

From 5fb2cc53c49849404e127e3a6c9822fd6cabbab6 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, 15 Feb 2021 13:29:21 +0700
Subject: [PATCH 1636/3458] libzen: fix build

---
 srcpkgs/libzen/files/proper-mt-fix.patch | 1 +
 srcpkgs/libzen/template                  | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libzen/files/proper-mt-fix.patch b/srcpkgs/libzen/files/proper-mt-fix.patch
index ca5776474cbf..1bfbcd3c9034 100644
--- a/srcpkgs/libzen/files/proper-mt-fix.patch
+++ b/srcpkgs/libzen/files/proper-mt-fix.patch
@@ -22,6 +22,7 @@ index 8e431b5..6a25aee 100644
 +
  target_include_directories(zen PUBLIC
    $<BUILD_INTERFACE:${ZenLib_SOURCES_PATH}>\r $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>)
+
 diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
 index c0ff266..62a1bf5 100644
 --- a/Project/GNU/Library/configure.ac
diff --git a/srcpkgs/libzen/template b/srcpkgs/libzen/template
index 43a48529fba0..1b4c96e10e85 100644
--- a/srcpkgs/libzen/template
+++ b/srcpkgs/libzen/template
@@ -17,8 +17,7 @@ wrksrc=ZenLib
 build_wrksrc="Project/GNU/Library"
 
 do_patch() {
-	# applying via patches/ wasn't working great
-	cd $XBPS_BUILDDIR/ZenLib
+	cd $wrksrc
 	patch -Np1 < $FILESDIR/proper-mt-fix.patch
 }
 
@@ -29,18 +28,18 @@ pre_configure() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 	install -dm 755 ${DESTDIR}/usr/include/ZenLib
-	install -m 644 ${wrksrc}/ZenLib/Source/ZenLib/*.h \
+	install -m 644 ${wrksrc}/Source/ZenLib/*.h \
 		${DESTDIR}/usr/include/ZenLib
 	for i in HTTP_Client Format/Html Format/Http; do
 		install -dm0755 ${DESTDIR}/usr/include/ZenLib/$i
-		install -m0644 ${wrksrc}/ZenLib/Source/ZenLib/$i/*.h \
+		install -m0644 ${wrksrc}/Source/ZenLib/$i/*.h \
 			${DESTDIR}/usr/include/ZenLib/$i
 	done
 	install -dm 755 ${DESTDIR}/usr/lib/pkgconfig
 	install -m 644 libzen.pc ${DESTDIR}/usr/lib/pkgconfig
 	sed -i -e 's|Version: |Version: '$version'|g' \
 		${DESTDIR}/usr/lib/pkgconfig/libzen.pc
-	vlicense ${wrksrc}/ZenLib/License.txt
+	vlicense ${wrksrc}/License.txt
 }
 
 libzen-devel_package() {

From ad03596ec7f6b6aab0ccd64cf212816853e58c68 Mon Sep 17 00:00:00 2001
From: AlexDltg <adelatorregarcia.cf@iesesteveterradas.cat>
Date: Tue, 5 Jan 2021 13:11:49 +0100
Subject: [PATCH 1637/3458] intellij-idea-community-edition: add .desktop.

---
 .../intellij-idea-community-edition/files/idea.desktop   | 8 ++++++++
 srcpkgs/intellij-idea-community-edition/template         | 9 +++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/intellij-idea-community-edition/files/idea.desktop

diff --git a/srcpkgs/intellij-idea-community-edition/files/idea.desktop b/srcpkgs/intellij-idea-community-edition/files/idea.desktop
new file mode 100644
index 000000000000..5d32e21b0193
--- /dev/null
+++ b/srcpkgs/intellij-idea-community-edition/files/idea.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=IntelliJ IDEA Community Edition
+Comment=Java integrated development environment by JetBrains
+Exec=/usr/bin/idea %f
+Icon=idea
+Terminal=false
+Type=Application
+Categories=Development;
\ No newline at end of file
diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 8b41709db362..418d4518235e 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,9 +1,9 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
 version=2020.3.1
-revision=1
+revision=2
 archs="i686 x86_64"
-depends="virtual?java-environment giflib libXtst"
+depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
 short_desc="Java integrated development environment by JetBrains"
 maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
@@ -23,6 +23,8 @@ do_install() {
 	vmkdir usr/bin
 	vmkdir usr/share/doc/intellij-idea
 	vmkdir usr/lib/intellij-idea
+	vmkdir usr/share/pixmaps
+	vmkdir usr/share/icons/hicolor/scalable/apps
 
 	mv bin lib plugins redist product-info.json build.txt  ${DESTDIR}/usr/lib/intellij-idea
 	mv LICENSE.txt NOTICE.txt license ${DESTDIR}/usr/share/doc/intellij-idea
@@ -58,4 +60,7 @@ do_install() {
 	esac
 
 	ln -sf /usr/lib/intellij-idea/bin/idea.sh ${DESTDIR}/usr/bin/idea
+	ln -sf /usr/lib/intellij-idea/bin/idea.png ${DESTDIR}/usr/share/pixmaps
+	ln -sf /usr/lib/intellij-idea/bin/idea.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps
+	vinstall ${FILESDIR}/idea.desktop 644 usr/share/applications
 }

From 2d1c2ebe5bf18fe272f73df434a86d35be22aed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 15 Feb 2021 11:54:06 +0100
Subject: [PATCH 1638/3458] doxygen: fix time64 support and cross build
 (wizard)

---
 srcpkgs/doxygen/patches/fix-time64.patch | 19 +++++++++++++++++++
 srcpkgs/doxygen/template                 |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 srcpkgs/doxygen/patches/fix-time64.patch

diff --git a/srcpkgs/doxygen/patches/fix-time64.patch b/srcpkgs/doxygen/patches/fix-time64.patch
new file mode 100644
index 000000000000..7f94c20ba48e
--- /dev/null
+++ b/srcpkgs/doxygen/patches/fix-time64.patch
@@ -0,0 +1,19 @@
+--- qtools/qdatetime.cpp	2020-01-03 23:51:18.000000000 +0100
++++ qtools/qdatetime.cpp	2020-12-02 10:48:03.245635836 +0100
+@@ -35,7 +35,6 @@
+ **
+ **********************************************************************/
+ 
+-#define gettimeofday	__hide_gettimeofday
+ #include "qdatetime.h"
+ #include "qdatastream.h"
+ #include <stdio.h>
+@@ -55,8 +54,6 @@
+ #elif defined(_OS_UNIX_) || defined(_OS_MAC_)
+ #include <sys/time.h>
+ #include <unistd.h>
+-#undef	gettimeofday
+-extern "C" int gettimeofday( struct timeval *, struct timezone * );
+ #endif
+ 
+ static const uint FIRST_DAY	= 2361222;	// Julian day for 1752/09/14
diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index ea22d0d43a65..051c1568bbb2 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -18,6 +18,7 @@ desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"
 
 if [ "$build_option_wizard" ]; then
 	configure_args+=" -Dbuild_wizard=1"
+	hostmakedepends+=" qt5-host-tools qt5-qmake"
 	makedepends+=" qt5-devel"
 fi
 

From 0adc36cb761c7686393a4dff47021bc6c26af65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 15 Feb 2021 16:27:06 +0100
Subject: [PATCH 1639/3458] doomretro: update to 4.0.2.

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

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 7239d25ddfe5..529bc1b5eacc 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.0.1
+version=4.0.2
 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=89ea7b67c086512dcba561a02cc114708fe8a07df4aae53ab31333473ca458a0
+checksum=17e808ace40291d08d1c65f387bd82e5964aa14429ec5ce90356ac8d80c6b45f

From a449a35d68162ce791d733e866fff55c6b8b6c7c Mon Sep 17 00:00:00 2001
From: Alex <60660439+AlexDltg@users.noreply.github.com>
Date: Mon, 15 Feb 2021 12:04:22 +0100
Subject: [PATCH 1640/3458] intellij-idea-community-edition: update to
 2020.3.2.

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

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index 418d4518235e..4e8d1a29ac11 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,7 +1,7 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2020.3.1
-revision=2
+version=2020.3.2
+revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
 short_desc="Java integrated development environment by JetBrains"
@@ -9,7 +9,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=2e3825f6f70fabc32834a022da9a0e98e835371e6714edc8a82b56a7e9c65e7c
+checksum=6ee7cc7aa368d6ebec14b6536827cbb3dca5506245db3d2fa2a18f2ab9d6e3c0
 repository=nonfree
 nopie=yes
 python_version=3

From 8132fdd1b7b344e4be787c2f86d8009354f20991 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 15 Feb 2021 09:55:53 +0000
Subject: [PATCH 1641/3458] io.elementary.videos: update to 2.7.2.

---
 srcpkgs/io.elementary.videos/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index 24609cb5eae7..c989ccaf6954 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.videos'
 pkgname=io.elementary.videos
-version=2.7.1
+version=2.7.2
 revision=1
 wrksrc="videos-${version}"
 build_style=meson
@@ -8,8 +8,8 @@ hostmakedepends="intltool pkg-config vala AppStream"
 makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel
  gstreamer1-devel gst-plugins-base1-devel"
 short_desc="Video player and library app designed for elementary OS"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/videos"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=db34680b4d2c383b8db838e893a39e41c01d84f6450db12b886fa1bdee69c7f5
+checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a

From 6e3344fa299d1b6eeec864b0a8c76400f2168797 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 15 Feb 2021 09:39:06 +0000
Subject: [PATCH 1642/3458] gnome-control-center: update to 3.38.4.

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index a7ccbdbcfb97..11071d9f2831 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.3
-revision=2
+version=3.38.4
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dcheese=$(vopt_if cheese true false)"
@@ -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=3b4a4b18ba91803dce133f443f9d1d1f5a1b6c26b7727876e0a699349f5696e3
+checksum=49dc6378d4d35c1c6ed59224f5636916c2b6fa49bbfb8b56eb19a84d6e90cd19
 
 build_options="cheese"
 build_options_default="cheese"

From 42e39266a6a80cf14d2a76db168a11064ad8530d Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Sat, 13 Feb 2021 09:13:36 -0600
Subject: [PATCH 1643/3458] containerd: update to 1.4.3.

containerd 1.3 will reach EOL on February 17, 2021 according to https://github.com/containerd/containerd/blob/master/RELEASES.md#support-horizon
---
 srcpkgs/containerd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index fd8d1b101959..33f3d27a0613 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
-version=1.3.9
-revision=2
+version=1.4.3
+revision=1
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd
@@ -20,7 +20,7 @@ maintainer="Paul Knopf <pauldotknopf@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/containerd/containerd"
 distfiles="https://github.com/containerd/containerd/archive/v${version}.tar.gz"
-checksum=9244212589c84b12262769dca6fb985c0c680cb5259c8904b29c511d81fd62d0
+checksum=@6069273fb93a162a2a11e29ef3b631c92ed1b4942be461f781a2aabbaed97701
 make_dirs="/var/lib/containerd 0755 root root"
 
 post_build() {

From 9dda51bdc5121e9fc4789ea5abd9dac294b9d6d4 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 21:48:23 +0100
Subject: [PATCH 1644/3458] fetchmail: update to 6.4.16.

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

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 3bf834fe8f72..a6362c04e121 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.15
+version=6.4.16
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=735b217474937e13cfcdea2d42a346bf68487e0d61efebe4d0d9eddcb3a26b96
+checksum=044b9a0ac03afbae7744979defe3e2e32e39141bca68fd0c8deda2ed40884fb9
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From 83a01982c4a98d26ae04158ee612e12d3bf304ee Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 15 Feb 2021 19:55:52 +0100
Subject: [PATCH 1645/3458] lxappearance: fix crash on wayland

---
 .../lxappearance/patches/fix-wayland.patch    | 21 +++++++++++++++++++
 srcpkgs/lxappearance/template                 |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lxappearance/patches/fix-wayland.patch

diff --git a/srcpkgs/lxappearance/patches/fix-wayland.patch b/srcpkgs/lxappearance/patches/fix-wayland.patch
new file mode 100644
index 000000000000..0c31d935a2b7
--- /dev/null
+++ b/srcpkgs/lxappearance/patches/fix-wayland.patch
@@ -0,0 +1,21 @@
+commit df82dc59c7b3ef5fa65898cbdd459d1fb8f3c9bf
+Author: q66 <daniel@octaforge.org>
+Date:   Mon Feb 15 19:45:23 2021 +0100
+
+    fix segfault under wayland
+
+diff --git src/lxappearance.c src/lxappearance.c
+index a4b7db3..b6441ae 100644
+--- src/lxappearance.c
++++ src/lxappearance.c
+@@ -86,6 +86,10 @@ static gboolean check_lxde_dbus()
+ 
+ static void check_lxsession()
+ {
++    /* on wayland, avoid touching X bits */
++    if (g_getenv("WAYLAND_DISPLAY"))
++        return;
++
+     lxsession_atom = XInternAtom( GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), "_LXSESSION", True );
+     if( lxsession_atom != None )
+     {
diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33d768aeb94d..7fcaad225f8d 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"

From 7171a302d0d40c6c7dfec5215fb6a8ba5aa19d99 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 14 Feb 2021 21:39:38 +0000
Subject: [PATCH 1646/3458] apparmor: load profiles in parallel

---
 srcpkgs/apparmor/template               |  2 +-
 srcpkgs/runit-void/files/09-apparmor.sh | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 6e7300cff1ed..dfbd3ef472fa 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
 version=3.0.1
-revision=2
+revision=3
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
diff --git a/srcpkgs/runit-void/files/09-apparmor.sh b/srcpkgs/runit-void/files/09-apparmor.sh
index 7d8d09ee80f1..1d24b4e349cd 100644
--- a/srcpkgs/runit-void/files/09-apparmor.sh
+++ b/srcpkgs/runit-void/files/09-apparmor.sh
@@ -18,15 +18,7 @@ if [ -n "$APPARMOR" ]; then
 	[ "$APPARMOR" = "complain" ] && AACOMPLAIN="-C"
 
 	if [ -d /etc/apparmor.d -a -x /usr/bin/apparmor_parser ]; then
-		for profile in /etc/apparmor.d/*; do
-		case "$profile" in
-			*.new-*_*) continue ;;
-		esac
-		if [ -f "$profile" ]; then
-			printf '* Load profile %s: %s\n' "($APPARMOR)" "$profile"
-			apparmor_parser -a $AACOMPLAIN "$profile"
-		fi
-		done
+		apparmor_parser -a $AACOMPLAIN $(find /etc/apparmor.d -maxdepth 1 -type f ! -name '*.new-*_*')
 	else
 		printf '! AppArmor installation problem - ensure you have installed apparmor package\n'
 	fi

From d4d679a9af5bfcd0be2294a57b830635a6e8ad7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 15 Feb 2021 22:28:48 -0300
Subject: [PATCH 1647/3458] xfce4-taskmanager: fix homepage and ignore
 development releases.

---
 srcpkgs/xfce4-taskmanager/template | 2 +-
 srcpkgs/xfce4-taskmanager/update   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-taskmanager/update

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index cdf36c3cddc6..b9c8f95f50a2 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -10,6 +10,6 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="XFCE task manager plugin"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
+homepage="https://docs.xfce.org/apps/xfce4-taskmanager/start"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=cd122240e1c195e4e6f159da1bb86b38c41ba27892399ad85a18c37ea20e48f9
diff --git a/srcpkgs/xfce4-taskmanager/update b/srcpkgs/xfce4-taskmanager/update
new file mode 100644
index 000000000000..5636324afbce
--- /dev/null
+++ b/srcpkgs/xfce4-taskmanager/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"

From 5db222e387d7ee56a7bbbba2c00eba8dd95f241e Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Fri, 12 Feb 2021 15:06:19 +0000
Subject: [PATCH 1648/3458] lxterminal: update to 0.4.0.

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

diff --git a/srcpkgs/lxterminal/template b/srcpkgs/lxterminal/template
index 1a71138ce1f1..22cf17c65436 100644
--- a/srcpkgs/lxterminal/template
+++ b/srcpkgs/lxterminal/template
@@ -1,6 +1,6 @@
 # Template file for 'lxterminal'
 pkgname=lxterminal
-version=0.3.2
+version=0.4.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-gtk3"
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel vte3-devel"
 depends="desktop-file-utils"
 short_desc="LXDE Terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
-checksum=3166b18493a8e55811b02aa0de825cbbea65e2b628e69006c1a65b98e1bb4484
+checksum=9db8748923b3fa09a82ae2210ed1fa4cdb4c45312009da9caed103d48f8e9be7

From b33d4c4faa42f172dc92a3005d3a77520216fedf Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 15 Feb 2021 12:33:06 +0100
Subject: [PATCH 1649/3458] compsize: update to 1.5.

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

diff --git a/srcpkgs/compsize/template b/srcpkgs/compsize/template
index 9a37a59f8c89..1133e845957b 100644
--- a/srcpkgs/compsize/template
+++ b/srcpkgs/compsize/template
@@ -1,6 +1,6 @@
 # Template file for 'compsize'
 pkgname=compsize
-version=1.4
+version=1.5
 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=4c6dd5812c8809cbe645b815ceefbd81a1a9c2c6da383d827b4d6457ecbb2c03
+checksum=8b15b528f6cf95ff99d2ddfd7bce87271fd1356c875e5f5895ed83caf6952535
 
 do_install() {
 	vbin compsize

From 72cd12c55b684e681804be03defd1a0c5f735cf7 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 12 Feb 2021 17:17:49 +0100
Subject: [PATCH 1650/3458] util-linux-libs: update to 2.36.2.

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

diff --git a/srcpkgs/util-linux-libs/template b/srcpkgs/util-linux-libs/template
index ebca35ccb745..ad8c4512a35c 100644
--- a/srcpkgs/util-linux-libs/template
+++ b/srcpkgs/util-linux-libs/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux-libs'
 # Keep this package sync with util-linux
 pkgname=util-linux-libs
-version=2.36.1
-revision=2
+version=2.36.2
+revision=1
 wrksrc="util-linux-$version"
 build_style=meta
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
@@ -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=09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed
+checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
 
 pre_configure() {
 	local _cfgdir="$XBPS_COMMONDIR/environment/configure"

From 831ef050b2e85f70268fd12852ae412ceae2dfae Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Fri, 12 Feb 2021 17:18:15 +0100
Subject: [PATCH 1651/3458] util-linux: update to 2.36.2.

---
 ...se-symfollow-for-helpers-on-user-mou.patch | 40 -------------------
 srcpkgs/util-linux/template                   |  6 +--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch

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
deleted file mode 100644
index d0c0ca4047de..000000000000
--- a/srcpkgs/util-linux/patches/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index fddaff9c8c43..4fb8292531ba 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-libs
 pkgname=util-linux
-version=2.36.1
-revision=2
+version=2.36.2
+revision=1
 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz"
 makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
  eudev-libudev-devel"
@@ -13,7 +13,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=09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed
+checksum=f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 9fb7d6bc1eac17b6b84038d38778af9416b783a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:24:35 -0300
Subject: [PATCH 1652/3458] argp-standalone: update to 1.4.1.

Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --help"
segfaults for some applications.

Forking and switching upstream has been done because the project isn't
active and no one has forked it themselves yet, at least that I could
find.
---
 .../patches/fix-no_use_inline.patch           | 32 -------------------
 srcpkgs/argp-standalone/template              | 20 +++++++-----
 2 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/argp-standalone/patches/fix-no_use_inline.patch

diff --git a/srcpkgs/argp-standalone/patches/fix-no_use_inline.patch b/srcpkgs/argp-standalone/patches/fix-no_use_inline.patch
deleted file mode 100644
index a76bba8000fa..000000000000
--- a/srcpkgs/argp-standalone/patches/fix-no_use_inline.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Effectively disable inlining of functions which are defined
-in argp-fmtstream.c because of name space conflicts when
-including argp-namefrob.h
-
---- argp-fmtstream.h	2003-12-11 09:37:05.000000000 +0100
-+++ argp-fmtstream.h	2016-09-27 09:19:48.891000000 +0200
-@@ -192,6 +192,7 @@
- extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
- extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
- \f
-+#ifdef ARGP_USE_INLINE
- #ifdef __OPTIMIZE__
- /* Inline versions of above routines.  */
- 
-@@ -208,7 +209,7 @@
- #endif
- 
- #ifndef ARGP_FS_EI
--#define ARGP_FS_EI extern inline
-+#define ARGP_FS_EI static inline
- #endif
- 
- ARGP_FS_EI size_t
-@@ -306,6 +307,8 @@
- 
- #endif /* __OPTIMIZE__ */
- 
-+#endif /* ARGP_USE_INLINE */
-+
- #endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
- 
- #endif /* argp-fmtstream.h */
diff --git a/srcpkgs/argp-standalone/template b/srcpkgs/argp-standalone/template
index 061fbf5330f2..55983b8b3d05 100644
--- a/srcpkgs/argp-standalone/template
+++ b/srcpkgs/argp-standalone/template
@@ -1,20 +1,24 @@
 # Template file for 'argp-standalone'
 pkgname=argp-standalone
-version=1.3
-revision=2
+version=1.4.1
+revision=1
 archs="*-musl"
 build_style=gnu-configure
+hostmakedepends="autoconf automake"
 short_desc="Implementation of ARGP"
-maintainer="John Regan <john@jrjrtech.com>"
-homepage="https://www.freshports.org/devel/argp-standalone/"
-license="Public Domain"
-distfiles="http://www.lysator.liu.se/~nisse/misc/argp-standalone-${version}.tar.gz"
-checksum=dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/ericonr/argp-standalone"
+distfiles="https://github.com/ericonr/argp-standalone/archive/${version}.tar.gz"
+checksum=879d76374424dce051b812f16f43c6d16de8dbaddd76002f83fd1b6e57d39e0b
 
 CFLAGS="-fPIC"
 
+pre_configure() {
+	autoreconf -fi
+}
+
 do_install() {
 	vinstall ${wrksrc}/libargp.a 644 usr/lib
 	vinstall ${wrksrc}/argp.h 644 usr/include
 }
-

From cf4b4ff5d8957d6e3f8b3678d1b3677f022e7fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 18:33:44 -0300
Subject: [PATCH 1653/3458] elfutils: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 86e47a3e339e..ee2bb254040a 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'elfutils'
 pkgname=elfutils
 version=0.183
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
 hostmakedepends="automake libtool pkg-config"

From 2d1353287b055d0725b6167f38f88b82888d20e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:38 -0300
Subject: [PATCH 1654/3458] pahole: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index a2fc8f2023e6..184b67b95286 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,7 +1,7 @@
 # Template file for 'pahole'
 pkgname=pahole
 version=1.20
-revision=1
+revision=2
 wrksrc="dwarves-${version}"
 build_style=cmake
 configure_args="-D__LIB=lib"

From 91661b385684d97371c6f025ee3f3d1446043def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:38 -0300
Subject: [PATCH 1655/3458] yoshimi: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 1c4bcb519495..0096f7f05710 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,7 +1,7 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
 version=1.7.4
-revision=1
+revision=2
 build_wrksrc=src
 build_style=cmake
 hostmakedepends="pkg-config fltk"

From 02ffd3515b3b54261d9dd928f1450e5599d84203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:38 -0300
Subject: [PATCH 1656/3458] libavc1394: revbump for new argp-standalone
 version.

Also xlint.
---
 srcpkgs/libavc1394/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libavc1394/template b/srcpkgs/libavc1394/template
index b4cd911e9171..1a81842b9a8d 100644
--- a/srcpkgs/libavc1394/template
+++ b/srcpkgs/libavc1394/template
@@ -1,13 +1,13 @@
 # Template file for 'libavc1394'
 pkgname=libavc1394
 version=0.5.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libraw1394-devel"
-short_desc="A library to control A/V devices using the 1394ta AV/C commands"
+short_desc="Library to control A/V devices using the 1394ta AV/C commands"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://sourceforge.net/projects/libavc1394/"
 distfiles="${SOURCEFORGE_SITE}/libavc1394/${pkgname}-${version}.tar.gz"
 checksum=7cb1ff09506ae911ca9860bef4af08c2403f3e131f6c913a2cbd6ddca4215b53

From a514c4bf45e48dd54882ddede6e1dfd3ffe729a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:38 -0300
Subject: [PATCH 1657/3458] qv4l2: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template
index 30929bd2c60e..292be169c208 100644
--- a/srcpkgs/qv4l2/template
+++ b/srcpkgs/qv4l2/template
@@ -1,7 +1,7 @@
 # Template file for 'qv4l2'
 pkgname=qv4l2
 version=1.18.0
-revision=1
+revision=2
 wrksrc="v4l-utils-${version}"
 build_style=gnu-configure
 configure_args="--enable-qv4l2 --with-udevdir=/usr/lib/udev"

From 070fc8c8960e6889a67f828b057d71d06eee08c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 1658/3458] libffado: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template
index 2783042b4925..cadd335b30e3 100644
--- a/srcpkgs/libffado/template
+++ b/srcpkgs/libffado/template
@@ -1,7 +1,7 @@
 # Template file for 'libffado'
 pkgname=libffado
 version=2.4.4
-revision=2
+revision=3
 build_style=scons
 make_build_args="PREFIX=/usr MANDIR=/usr/share/man
  UDEVDIR=/usr/lib/udev/rules.d CUSTOM_ENV=1 BUILD_TESTS=0

From 7be9d9bd188d59f8981aefda5aab7ad9d17b6237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 1659/3458] iucode-tool: revbump for new argp-standalone
 version.

Also xlint.
---
 srcpkgs/iucode-tool/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iucode-tool/template b/srcpkgs/iucode-tool/template
index 277773a1e067..d28c10461053 100644
--- a/srcpkgs/iucode-tool/template
+++ b/srcpkgs/iucode-tool/template
@@ -1,16 +1,16 @@
 # Template file for 'iucode-tool'
 pkgname=iucode-tool
 version=2.3.1
-revision=1
+revision=2
 archs="i686* x86_64*"
 build_style=gnu-configure
 short_desc="Program to manipulate microcode update collections for Intel"
 maintainer="Vintodrimmer <vintodrimmer@protonmail.ch>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://gitlab.com/iucode-tool/iucode-tool/wikis/home"
 distfiles="https://gitlab.com/iucode-tool/releases/raw/latest/iucode-tool_${version}.tar.xz"
 checksum=12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" argp-standalone" ;;
+	*-musl) makedepends="argp-standalone" ;;
 esac

From 45502128bc73c5cbce84f7b531d45ad6ac6c0594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 1660/3458] rng-tools: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 8f8c9dc47480..4279e97ad640 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.11
-revision=1
+revision=2
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From 63b53f96de470cce10c91f65d9a7cf6fd24e2c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 1661/3458] incron: revbump for new argp-standalone version.

Also xlint.
---
 srcpkgs/incron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/incron/template b/srcpkgs/incron/template
index 4bb9549b0039..19c08b4befaa 100644
--- a/srcpkgs/incron/template
+++ b/srcpkgs/incron/template
@@ -1,8 +1,8 @@
 # Template file for 'incron'
 pkgname=incron
 version=0.5.12
-revision=1
-short_desc="A daemon that executes commands due to inotify events"
+revision=2
+short_desc="Daemon that executes commands due to inotify events"
 maintainer="allan <mail@may.mooo.com>"
 license="X11"
 homepage="https://github.com/ar-/incron"

From 3a9dc1b0e49d13048b45828ba1d931a2912a0b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 1662/3458] crun: revbump for new argp-standalone version.

---
 srcpkgs/crun/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 2dc3f46e47f0..e5415d3ee104 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,7 +1,7 @@
 # Template file for 'crun'
 pkgname=crun
 version=0.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-systemd"
 hostmakedepends="pkg-config libtool python3 $(vopt_if man go-md2man)"
@@ -25,6 +25,13 @@ case "$XBPS_MACHINE" in
 	*) ;;
 esac
 
+do_check() {
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		# most of the tests don't work inside a container
+		make check ${makejobs}
+	fi
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/*.a
 }

From a9d201826471fd220de664aa5853e182c8e946dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 1663/3458] zchunk: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index aca7fe5b7609..876a896bbef0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"

From a7526b600fb7552f5cf69aaf5e3b061f5c356c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 1664/3458] v4l-utils: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template
index 123ea76f1839..6ef76bb1e90d 100644
--- a/srcpkgs/v4l-utils/template
+++ b/srcpkgs/v4l-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'v4l-utils'
 pkgname=v4l-utils
 version=1.20.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-qv4l2 --with-udevdir=/usr/lib/udev"
 hostmakedepends="automake libtool pkg-config gettext-devel"

From 3bd033caaddaffdfbec3b6deb7d69f6c2e9318f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 1665/3458] prelink-cross: revbump for new argp-standalone
 version.

---
 srcpkgs/prelink-cross/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/prelink-cross/template b/srcpkgs/prelink-cross/template
index 163666e8006c..dfa989429aa1 100644
--- a/srcpkgs/prelink-cross/template
+++ b/srcpkgs/prelink-cross/template
@@ -1,7 +1,7 @@
 # Template file for 'prelink-cross'
 pkgname=prelink-cross
 version=20180128
-revision=1
+revision=2
 _githash=ca213abd9ebfd77a04e3a967bf9f7bc1ef832087
 wrksrc="prelink-cross-${_githash}"
 build_style=gnu-configure
@@ -21,6 +21,10 @@ pre_configure() {
 	autoreconf -fi
 }
 
+do_check() {
+	: # multiple test failures, can't find the binaries for the tests
+}
+
 post_install() {
 	# We don't want the tools that are on prelink
 	# just prelink-rltd

From dd285700ceae1a7e3984805a830a567908f3a748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 1666/3458] f3: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/f3/template b/srcpkgs/f3/template
index 7697a1687dd6..cb95e071e453 100644
--- a/srcpkgs/f3/template
+++ b/srcpkgs/f3/template
@@ -1,7 +1,7 @@
 # Template file for 'f3'
 pkgname=f3
 version=7.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_target="all extra"
 make_install_target="install install-extra"

From 4c10d719175643d6f5b1d6717ee73573cee73160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 1667/3458] uftrace: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template
index eb9c7141c90c..1c4d54a5bcb1 100644
--- a/srcpkgs/uftrace/template
+++ b/srcpkgs/uftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'uftrace'
 pkgname=uftrace
 version=0.9.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-configure
 hostmakedepends="pandoc pkg-config"

From 83009bdc6ddd7655d30af7f9a2066527b9c58fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:41 -0300
Subject: [PATCH 1668/3458] tmines: revbump for new argp-standalone version.

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

diff --git a/srcpkgs/tmines/template b/srcpkgs/tmines/template
index 568faea6a46f..7669477aea95 100644
--- a/srcpkgs/tmines/template
+++ b/srcpkgs/tmines/template
@@ -1,7 +1,7 @@
 # Template file for 'tmines'
 pkgname=tmines
 version=1.0
-revision=1
+revision=2
 build_style=cmake
 makedepends="ncurses-devel"
 short_desc="Terminal minesweeper clone"

From 6f17d953810bcfed11a08c82b5b05ea4cefd71bc Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 30 Jan 2021 23:36:38 +0300
Subject: [PATCH 1669/3458] xonsh: update to 0.9.26

By ericonr:
- fix changelog
- disable tests temporarily

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

diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index 2ad7f65b91f4..20abdd5d4435 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,14 +1,17 @@
 # Template file for 'xonsh'
 pkgname=xonsh
-version=0.9.24
+version=0.9.26
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest python3-prompt_toolkit python3-Pygments"
 short_desc="Python-powered, cross-platform, Unix-gazing shell"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://xon.sh/"
-changelog="https://raw.githubusercontent.com/xonsh/xonsh/${version}/CHANGELOG.rst"
+changelog="https://raw.githubusercontent.com/xonsh/xonsh/master/CHANGELOG.rst"
 distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz"
-checksum=ed981f129f2501b3d7354466b7c85ff58d22750f18df0910d66c8dbe94ec9b3b
+checksum=ab2da2d2e07420a9730af0ae69001db7553173f22a213534529394acb98c70f1
 register_shell="/bin/xonsh"
+# FIXME: fails with multiple AttributeErrors
+make_check=extended

From 3843baec08635e2f642119fd68ecb4ec2bcc1c8f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 15 Feb 2021 14:35:08 +0100
Subject: [PATCH 1670/3458] skaffold: update to 1.20.0.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 9af9fc87f7fb..9e0e85486026 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.19.0
+version=1.20.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=ee4ad5cf9c65d0f4827dd7763b96b8750d4e93676b0391bb6b267eb670a9f602
+checksum=d47ee974acf1c4432dab3ecdffeadbe271d2ff8098b811da2e73a04f9d9af957

From 29cb94b1176d3bb00b97919785dc046da4c93090 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 15 Feb 2021 14:36:00 +0100
Subject: [PATCH 1671/3458] sysstat: update to 12.4.3.

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

diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index 86ed2f2d3c16..dd1eda09a7a8 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,6 +1,6 @@
 # Template file for 'sysstat'
 pkgname=sysstat
-version=12.4.2
+version=12.4.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-copy-only --disable-file-attr
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://pagesperso-orange.fr/sebastien.godard/"
 distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=3701b2c1883d50eb384d7b95ce5b6df0a71fdcb3c23f96cb58098d1bcffa018f
+checksum=ae432431f45aacbcabacfbbe129e2505e215cafa9ce996d7550c6091a46f0bfd
 
 post_extract() {
 	vsed -i 's/lib64/lib/' configure

From d6e13793d9e17a83d3796953a8055e8f4f4b5f9b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 16 Feb 2021 10:39:15 +0100
Subject: [PATCH 1672/3458] minify: update to 2.9.13.

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

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 9cb3cd788bf5..be6bcb78b65a 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.12
+version=2.9.13
 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=961dc55415f7115ff2115f82ba3b1eb88f520f2be845c49da6614a1788db2019
+checksum=b9d4553d888e1717c320dcf829741ff929e432dd59451927d474bd2efcc251cf
 
 post_install() {
 	vlicense LICENSE

From 0ee1722070486b8ca33c1caa93f5abaa0d7942a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 16 Feb 2021 10:40:14 +0100
Subject: [PATCH 1673/3458] janet: update to 1.15.2.

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

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 7710d8265a1e..3ad4c7f07c33 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.15.0
+version=1.15.2
 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=e2cf16b330e47c858a675ac79b5a0af83727ff041efcb133a80f36bedfae57c4
+checksum=9d08e24c1beaf01231fde469a097ae04c51673be37ab25ca6fef82324a8f7ee9
 
 post_install() {
 	vlicense LICENSE

From 4154ba97686198e9c1e008e45d7c140562a05b66 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, 16 Feb 2021 22:22:28 +0700
Subject: [PATCH 1674/3458] refind: update to 0.13.0.

---
 .../0001-Fix-GCC-10-compile-problem.patch     | 25 -------------------
 srcpkgs/refind/template                       |  8 +++---
 2 files changed, 4 insertions(+), 29 deletions(-)
 delete 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
deleted file mode 100644
index d93f719b78a0..000000000000
--- a/srcpkgs/refind/patches/0001-Fix-GCC-10-compile-problem.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 85742b0385ab..2cd2bb683ee5 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -1,16 +1,16 @@
 # Template file for 'refind'
 pkgname=refind
-version=0.12.0
-revision=3
+version=0.13.0
+revision=1
 archs="x86_64* i686* aarch64*"
 makedepends="gnu-efi-libs"
 depends="bash dosfstools efibootmgr"
 short_desc="EFI boot manager utility"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
-license="GPL-3.0-only, BSD-3-Clause"
+license="GPL-3.0-only, BSD-3-Clause, BSD-2-Clause, GPL-2.0-only, LGPL-2.1-only"
 homepage="https://sourceforge.net/projects/refind/"
 distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
-checksum=7bb8505bc9ff87a7b6de38bf9a91d46f4d613b30031d5eb088a4d791a31eb7c4
+checksum=c5d888f079f58ba5596782c1259e38100674de3398c3b579b6fc0f1738a33b7e
 python_version=2
 conf_files="/etc/default/refind-kernel-hook.conf"
 

From ef16df4c89b0593e09f9f5b0bdbbbc671e5e881c Mon Sep 17 00:00:00 2001
From: saqfish <saqfish@gmail.com>
Date: Tue, 16 Feb 2021 07:12:29 -0600
Subject: [PATCH 1675/3458] kdenlive: update to 20.12.2

By ericonr:
- fixup check stuff

Closes: #28792 [via git-merge-pr]
---
 srcpkgs/kdenlive/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 0f39d8061bb3..dc0d28372b2b 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=20.12.1
+version=20.12.2
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -12,12 +12,15 @@ makedepends="
  v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel"
 depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols
  qt5-quickcontrols2 vlc"
+checkdepends="$depends"
 short_desc="Non-linear video editor"
 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=9b6e22ad311c33457e7f7147ad873286945fc6c3b610129856fd01cbb51da458
+checksum=3fcb3f4fd7d77d70296fb6bcbbf716cda92acc8e5d6733448787b6a9a064013e
+# FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
+make_check=extended
 
 # needed for mlt to work on musl
 CXXFLAGS="-DHAVE_LOCALE_H=1"
@@ -25,10 +28,3 @@ 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 2260b2eb6ecc9e8c357069aa716fc603a3a42bf8 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 16 Feb 2021 10:23:26 +0000
Subject: [PATCH 1676/3458] gnome-initial-setup: update to 3.38.4.

---
 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 a0fc3e636157..35e323179b97 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.3
+version=3.38.4
 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=7bd2c906c79eaf6a9083dbf8172e193f52f4cd5fdd4a51496a7a21655a399af6
+checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200

From 4a29b45e59efe246b50539a66426ae8d9417b3c9 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Tue, 16 Feb 2021 08:46:03 +0100
Subject: [PATCH 1677/3458] vscode: update to 1.53.2.

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

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index fc31bf3ddaa6..47a0307f30be 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.53.1
+version=1.53.2
 revision=1
 _electronver=9.4.1
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -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=e64d6962389cb1e1f09558fa231f1e0eece87a059b09d6ba55a894e994997a39
+checksum=d83ec31b76815aaccb52ed10eb26a134563871f413ed21e8fe456ed89de500aa
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 66a37b74e02a8964c03b8812669a2a4d0af31deb Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 15 Feb 2021 12:57:18 +0100
Subject: [PATCH 1678/3458] openldap: update to 2.4.57.

- enable meta backend module
---
 srcpkgs/openldap/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index c3524b1ee7ff..850a60b132c5 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,6 +1,6 @@
 # Template file for 'openldap'
 pkgname=openldap
-version=2.4.56
+version=2.4.57
 revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr
@@ -8,10 +8,10 @@ configure_args="--prefix=/usr
  --sysconfdir=/etc
  --localstatedir=/var/lib/openldap
  --sbindir=/usr/bin
- --enable-dynamic --enable-proctitle --with-tls
+ --enable-dynamic --enable-proctitle --with-tls --enable-ldap
  --enable-ipv6 --enable-local --with-cyrus-sasl --with-threads
  --enable-syslog --enable-slapd --enable-crypt --enable-spasswd
- --enable-bdb --enable-hdb --enable-overlays=mod
+ --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
 makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
@@ -22,7 +22,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="OLDAP-2.0"
 homepage="http://www.openldap.org"
 distfiles="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${version}.tgz"
-checksum=25520e0363c93f3bcb89802a4aa3db33046206039436e0c7c9262db5a61115e0
+checksum=c7ba47e1e6ecb5b436f3d43281df57abeffa99262141aec822628bc220f6b45a
 
 system_accounts="ldap"
 ldap_homedir="/var/lib/openldap"

From cc6d810ef79e5157b62170784793888a9846cceb Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 16 Feb 2021 09:37:11 +0000
Subject: [PATCH 1679/3458] dconf-editor: update to 3.38.2.

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

diff --git a/srcpkgs/dconf-editor/template b/srcpkgs/dconf-editor/template
index 23252b9f74e0..ab352b216d52 100644
--- a/srcpkgs/dconf-editor/template
+++ b/srcpkgs/dconf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf-editor'
 pkgname=dconf-editor
-version=3.38.0
+version=3.38.2
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala gettext"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6d89249a379082de6a8e95a2a202d0ca5fe1c9776bc0d5d3ef065567d8183eb4
+checksum=1253dad87e6213fbf313ff9ec9dc4358aa1b10261f28072c1dc0e0997b92f835

From 8b9cb8123b8399046f788d4aacfc4845327a21f5 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 16 Feb 2021 14:57:37 +0300
Subject: [PATCH 1680/3458] element-desktop: update to 1.7.21

---
 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 0a5204e7a6ca..a33a6153c902 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.19
+version=1.7.21
 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="ab2543cf87614d82f3d070249c9890ac57b02a5ae1d7ed8140fcc56d1c1f8bd6
- f2817b02b80106b8fee307cc7f0ecff1c735111407acd4fb92363a8457d5ea80"
+checksum="84e9df1a4a05c901136d0ca1d3d4ec426e7b878d8cdf448daf941c29c94b339d
+ 3771d62952b0db81d74fb8c2a0e19afa90b63a559dc2dc15eca3c3da1ba34b86"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 50fb8fd361a52fba3ba284ac84e3cc35aceccded Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 16 Feb 2021 10:33:38 +0000
Subject: [PATCH 1681/3458] seahorse: update to 3.38.1.

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

diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 9cf5c354d693..0635012496cf 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,6 +1,6 @@
 # Template file for 'seahorse'
 pkgname=seahorse
-version=3.38.0.1
+version=3.38.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Seahorse"
 _series=${version%.${version#*.*.}}
 distfiles="${GNOME_SITE}/${pkgname}/${_series}/${pkgname}-${version}.tar.xz"
-checksum=c745dd1de6e1a20f19a2b07a438b8ef7cca235a6aa73410db7f137b021e9b2a2
+checksum=242b1e7e5971dd5727ccd25d51537102f5bad143f2366a82437bf0bbda9ebcef

From c9e0648573fdca52909cee9ec0092981a7015148 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, 16 Feb 2021 23:23:10 +0700
Subject: [PATCH 1682/3458] hostapd: fix patch_args

Broken from c6fda28441, (wpa_supplicant: add security patches.,
2021-02-03)
---
 srcpkgs/hostapd/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index 3c7af9d02748..b8de7c3c9cef 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -12,6 +12,7 @@ license="BSD-3-Clause"
 homepage="http://w1.fi/hostapd/"
 distfiles="http://w1.fi/releases/${pkgname}-${version}.tar.gz"
 checksum=881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9db2bd7
+patch_args=-Np1
 
 do_configure() {
 	cp -f ${FILESDIR}/config .config

From ab942c613ac97340622b302c8f22ad0b40c87c19 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 13:16:51 +0100
Subject: [PATCH 1683/3458] tar: update to 1.34.

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

diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template
index 08ad615bc0c5..2ac475c035a2 100644
--- a/srcpkgs/tar/template
+++ b/srcpkgs/tar/template
@@ -1,7 +1,7 @@
 # Template file for 'tar'
 pkgname=tar
-version=1.32
-revision=3
+version=1.34
+revision=1
 build_style=gnu-configure
 configure_args="gl_cv_struct_dirent_d_ino=yes"
 makedepends="acl-devel"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/tar/"
 distfiles="${GNU_SITE}/tar/${pkgname}-${version}.tar.xz"
-checksum=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8
+checksum=63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28
 
 pre_configure() {
 	# chroot-style=ethereal

From 0c911d27f6f4aedb853e9c4ac8a97b4e7c1d19dc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 16 Feb 2021 17:26:31 +0100
Subject: [PATCH 1684/3458] iputils: update to 20210202.

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

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d7701c5080e7..d0a6a92f3583 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,8 +1,7 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20200821
+version=20210202
 revision=1
-wrksrc="${pkgname}-s${version}"
 build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
@@ -13,8 +12,8 @@ short_desc="Useful utilities for Linux networking (including ping)"
 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=f265da0d02dd2259efd8c57a9c2e0c8bb3361abb14639fcffb26707be5783a5b
+distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
+checksum=3f557ecfd2ace873801231d2c1f42de73ced9fbc1ef3a438d847688b5fb0e8ab
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping

From efb5b8d2d966a9770cd04dff82687973821dce60 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 16 Feb 2021 17:39:22 +0100
Subject: [PATCH 1685/3458] procps-ng: update to 3.3.17.

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

diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template
index 1ea3b6e30791..db9e34b2bfac 100644
--- a/srcpkgs/procps-ng/template
+++ b/srcpkgs/procps-ng/template
@@ -1,7 +1,8 @@
 # Template file for 'procps-ng'
 pkgname=procps-ng
-version=3.3.16
+version=3.3.17
 revision=1
+wrksrc="procps-${version}"
 build_style=gnu-configure
 configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/bin
  --libdir=/usr/lib --disable-kill --enable-watch8bit
@@ -15,12 +16,14 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.com/procps-ng/procps"
 changelog="https://gitlab.com/procps-ng/procps/raw/master/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Production/${pkgname}-${version}.tar.xz"
-checksum=925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af
+checksum=4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4
 
 conf_files="/etc/sysctl.conf"
 
 post_extract() {
 	sed -i 's,ncursesw/ncurses.h,ncurses.h,g' watch.c
+	sed -i '1i#include <utmp.h>' w.c
+	sed -i '1i#include <langinfo.h>' proc/escape.c
 }
 
 pre_configure() {

From ae7d6ca8288318f8ffed218f563a95c4d5fb427b Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 16:53:15 +0100
Subject: [PATCH 1686/3458] nbd: update to 3.21.

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

diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template
index d06b95b41497..bfb4ea62b8e6 100644
--- a/srcpkgs/nbd/template
+++ b/srcpkgs/nbd/template
@@ -1,6 +1,6 @@
 # Template file for 'nbd'
 pkgname=nbd
-version=3.20
+version=3.21
 revision=1
 build_style=gnu-configure
 configure_args="--enable-syslog"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://nbd.sourceforge.io/"
 distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz"
-checksum=b6a82acbc9b1085534820dbc0d23ddbc39b7970e587e6930aec97e262feb222b
+checksum=2c7866be37e63756c00ce54a0655e7a00cc76d256f9cf1c995d1dbe8879c5ae1
 
 system_accounts="nbd"
 nbd_homedir="/var/chroot"

From 6e9aa06fa6fd4683182b8bb5d14ad1fb59b6085a Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 15 Feb 2021 13:28:17 +0100
Subject: [PATCH 1687/3458] iptables: update to 1.8.7.

---
 ...tions-add-check-to-the-phony-targets.patch | 30 +++++++++++++++++++
 srcpkgs/iptables/template                     |  6 ++--
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch

diff --git a/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch b/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch
new file mode 100644
index 000000000000..aa37afc39884
--- /dev/null
+++ b/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch
@@ -0,0 +1,30 @@
+From 35ddfd15b4742f73fd677ea6fb1a6bfa5fa709a9 Mon Sep 17 00:00:00 2001
+From: Anthony Iliopoulos <ailiop@altatus.com>
+Date: Mon, 15 Feb 2021 13:24:04 +0100
+Subject: [PATCH] extentions makefile: add check to the phony targets
+
+check-recurse from the top level makefile errors out when descenting
+into the extentions directory, since the makefile there doesn't include
+a check target.
+
+Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
+---
+ extensions/GNUmakefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git extensions/GNUmakefile.in extensions/GNUmakefile.in
+index 956ccb3..78ce2ee 100644
+--- extensions/GNUmakefile.in
++++ extensions/GNUmakefile.in
+@@ -79,7 +79,7 @@ targets_install :=
+ 
+ .SECONDARY:
+ 
+-.PHONY: all install uninstall clean distclean FORCE
++.PHONY: all install uninstall check clean distclean FORCE
+ 
+ all: ${targets}
+ 
+-- 
+2.30.1
+
diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template
index dae427f2633b..0d0ed43206db 100644
--- a/srcpkgs/iptables/template
+++ b/srcpkgs/iptables/template
@@ -1,7 +1,7 @@
 # Template file for 'iptables'
 pkgname=iptables
-version=1.8.6
-revision=2
+version=1.8.7
+revision=1
 build_style=gnu-configure
 configure_args="--enable-libipq --enable-shared --enable-devel --enable-bpf-compiler"
 hostmakedepends="pkg-config flex"
@@ -12,7 +12,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.netfilter.org/"
 distfiles="https://www.netfilter.org/projects/iptables/files/iptables-${version}.tar.bz2"
-checksum=a0f4fe0c3eb8faa5bd9c8376d132f340b9558e750c91deb2d5028aa3d0047767
+checksum=c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0
 alternatives="
  iptables:ip6tables:/usr/bin/xtables-legacy-multi
  iptables:ip6tables-restore:/usr/bin/xtables-legacy-multi

From b01b5b5370763b5cf79c7d83f557622c4f260e9a Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:30:21 +0100
Subject: [PATCH 1688/3458] gdbm: update to 1.19.

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

diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template
index 2327fab19e12..687a561ff534 100644
--- a/srcpkgs/gdbm/template
+++ b/srcpkgs/gdbm/template
@@ -1,6 +1,6 @@
 # Template file for 'gdbm'
 pkgname=gdbm
-version=1.18.1
+version=1.19
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libgdbm-compat --disable-rpath"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org.ua/software/gdbm/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc
+checksum=37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="libtool automake gettext-devel"

From 776a64279121345315da81bf48e1b013780f84fa Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 16 Feb 2021 17:51:35 +0100
Subject: [PATCH 1689/3458] tudu: update to 0.10.4.

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

diff --git a/srcpkgs/tudu/template b/srcpkgs/tudu/template
index 2d9b744a4f3b..460d364e3891 100644
--- a/srcpkgs/tudu/template
+++ b/srcpkgs/tudu/template
@@ -1,6 +1,6 @@
 # Template file for 'tudu'
 pkgname=tudu
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=gnu-configure
 conf_files="/etc/tudurc"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://code.meskio.net/tudu/"
 distfiles="http://code.meskio.net/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5e58b48aa182a4bc881e0f548451920781351af42825cdb52fa0b15308bf8004
+checksum=5eebc5299330037be429355321aa4ab53650f4ff8575b349d623466492c55993

From b3ce960adde5d237ce2a8784c5ea49095762ad3b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 30 Jan 2021 21:29:13 +0300
Subject: [PATCH 1690/3458] nushell: update to 0.27.0

Also enable extra features for x86_64* and i686*
---
 srcpkgs/nushell/template | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 843eda01b710..f42cd9776eea 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,22 +1,26 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.21.0
+version=0.27.0
 revision=1
-# raw-cpuid does not support other archs
-# https://github.com/nushell/nushell/issues/485
-# remove when the issue is fixed (should fix all archs)
-archs="x86_64* i686*"
-wrksrc="nu-${version}"
 build_style=cargo
-hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+hostmakedepends="pkg-config libgit2-devel"
+makedepends="libressl-devel libgit2-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://www.nushell.sh/"
 changelog="https://www.nushell.sh/blog/"
-distfiles="https://static.crates.io/crates/nu/nu-${version}.crate"
-checksum=44b0dc4127433373d6ce1b5ba50c56780f23b861654fce3b48d5b599758e772c
+distfiles="https://github.com/nushell/nushell/archive/${version}.tar.gz"
+checksum=0d086c660af2e6e286fcac0d0063607bd302961ba542a087145f6a3948fd7130
+register_shell="/usr/bin/nu"
+# all tests fail with argument --target
+make_check=no
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*)
+		configure_args="--features=extra"
+		makedepends+=" libX11-devel libxcb-devel" ;;
+esac
 
 post_install() {
 	vlicense LICENSE

From 213f59671078896ff362183671cc51bf1e8a3041 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 11:17:45 -0500
Subject: [PATCH 1691/3458] maturin: update to 0.9.1.

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

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 268d12ffd7ad..60ba6329812c 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
@@ -16,7 +16,7 @@ homepage="https://github.com/PyO3/maturin"
 # 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
+checksum="e3e13ab6e7626698fe6e73f639ff899e71d485f4e5964381db9bc0ae03c9c2dd
  2524984c2ef547bb54515828e4afad0e781a439d74cf0197cf168ec6c818594c"
 
 post_extract() {

From 8a9a292198ba7161fe3c7e1187032855d438b3cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 11:21:23 -0500
Subject: [PATCH 1692/3458] pam-gnupg: update to 0.3.

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

diff --git a/srcpkgs/pam-gnupg/template b/srcpkgs/pam-gnupg/template
index e1efffe4d24b..ce21d75e80f4 100644
--- a/srcpkgs/pam-gnupg/template
+++ b/srcpkgs/pam-gnupg/template
@@ -1,6 +1,6 @@
 # Template file for 'pam-gnupg'
 pkgname=pam-gnupg
-version=0.2
+version=0.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/security"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/cruegge/pam-gnupg"
 distfiles="https://github.com/cruegge/pam-gnupg/archive/v${version}.tar.gz"
-checksum=397334c45ed48499a466c0cb2acb21a7405edc4c0ab9c63cc6b2f3d159d60e5f
+checksum=d179c355ffc7bc79c3503c2422f181626229ca9491cfbb44668146e6fd55a303
 
 pre_configure() {
 	sh autogen.sh

From f955ece5985e6b56754a989e2a51cef4c8e3d51d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 11:25:42 -0500
Subject: [PATCH 1693/3458] python3-Pygments: update to 2.8.0.

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

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index 84603bdf79a1..e45d3ac0b523 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.7.4
+version=2.8.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -11,8 +11,9 @@ short_desc="Generic syntax highlighter written in Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://pygments.org"
+changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337
+checksum=37a13ba168a02ac54cc5891a42b1caec333e59b66addb7fa633ea8a6d73445c0
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {

From bb2966fa163ea69eeae2785f56cb2a374fd0f67e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 11:46:59 -0500
Subject: [PATCH 1694/3458] python3-uvloop: update to 0.15.1.

---
 srcpkgs/python3-uvloop/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 3f62151b2e4d..33f683a9f368 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,19 +1,23 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.0
+version=0.15.1
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-Cython"
 makedepends="libuv-devel python3-devel"
-checkdepends="flake8 python3-openssl python3-psutil"
+checkdepends="flake8 python3-pytest python3-openssl python3-psutil"
 depends="python3"
 short_desc="Fast replacement for Python asyncio event loop"
 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=2586ff9a081c4cbcc2e016e01d2ea343d3d510a09ff1975a151530bcc19e0ce3
+checksum=a0aff7b8ca46b07c50f243a408351de05f731413acc37b9c25c560af824b08f5
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -k 'not Test_UV_TCPSSL'
+}
 
 post_patch() {
 	cat <<-EOF >> setup.cfg

From 1d6154eef0fc4e424404aa983899bbc118a113d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 11:48:08 -0500
Subject: [PATCH 1695/3458] python3-breathe: update to 4.27.0.

---
 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 f5d3bba8c59f..35c19a0b8e67 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.1
+version=4.27.0
 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=68e6a1507e9843049e39de12aea010e714a7072df7d71b6d7dd437952a7f7ee5
+checksum=21fe14b241fe8596f008e799706e2c5f15371bb3325fabdf4b6aab8e60e8c59f
 
 post_install() {
 	vlicense LICENSE

From 5ece18bc09cea0274f8e0404517e60413f0695f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 11:52:54 -0500
Subject: [PATCH 1696/3458] python3-cryptography_vectors: update to 3.4.5.

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

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 362d89acdf84..e8f5f7888783 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=3.4.4
+version=3.4.5
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -10,7 +10,7 @@ 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
+checksum=c921deac9b854e45f01353080ac84d79c8091742aa32923ccd0d68889d775a71
 
 post_install() {
 	vlicense LICENSE

From 11163a4f28bbd24321bf4aed993b18c6d2966010 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 11:52:58 -0500
Subject: [PATCH 1697/3458] python3-cryptography: update to 3.4.5.

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

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index dff0d3b211f7..1234e0987d72 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=3.4.4
+version=3.4.5
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ 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
+checksum=4f6761a82b51fe02cda8f45af1c2f698a10f50003dc9c2572d8a49eda2e6d35b
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 4ea43499761eff5e7af7667061cd5c497fefd0be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 12:03:53 -0500
Subject: [PATCH 1698/3458] python3-hypothesis: update to 6.2.0.

---
 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 7b0ce54a1554..b77896dc4b83 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.1.1
+version=6.2.0
 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=37aa07c70037df7509bae54b19265c65129c2b61caf923a54d2155c7b12a086a
+checksum=c2d37b04f509cdfc9234050800d06c969f7a7752f47c90232b85f30c5d0f4f75
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From a1d39387eb17e04f8c4ef48da043e22eedba96d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 12:42:25 -0500
Subject: [PATCH 1699/3458] python3-josepy: update to 1.7.0.

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

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index 228f0a40502f..dc4c6602ac97 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.6.0
+version=1.7.0
 revision=1
 wrksrc="josepy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ 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=0aab1c3ceffe045e7fd5bcfe7685e27e9d2758518d9ba7116b5de34087e70bf5
+checksum=d265414fa16d7a8b7a1d1833b4ebb19a22bd0deae5d44413cf9040fd8491d85a
 
 pre_check() {
 	vsed -e '/addopts/d' -i pytest.ini

From b7ac05cc6b12ef2126f066d9411e47273fc49dea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 12:40:38 -0500
Subject: [PATCH 1700/3458] certbot-nginx: update to 1.12.0.

---
 srcpkgs/certbot-nginx/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template
index 23f7dd5435c4..0210edcf90ac 100644
--- a/srcpkgs/certbot-nginx/template
+++ b/srcpkgs/certbot-nginx/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-nginx'
 pkgname=certbot-nginx
-version=1.11.0
+version=1.12.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,8 +11,4 @@ maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-nginx/certbot-nginx-${version}.tar.gz"
-checksum=9afe611f99a78b8898941b8ad7bdcf7f3c2b6e0fce27125268f7c713e64b34ee
-
-do_check() {
-	python3 -m pytest
-}
+checksum=3fb6a55290d37ad466681a89a85ceca4c4026fdd8702f3010b87a74266a6fe7b

From f41b3f197bc6495397c770c2c8e9005bd07223f6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 12:40:41 -0500
Subject: [PATCH 1701/3458] certbot-apache: update to 1.12.0.

---
 srcpkgs/certbot-apache/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template
index 9ee797aa5f8f..95d03bda96ba 100644
--- a/srcpkgs/certbot-apache/template
+++ b/srcpkgs/certbot-apache/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-apache'
 pkgname=certbot-apache
-version=1.11.0
+version=1.12.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,8 +11,4 @@ maintainer="Kartik S. <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-apache/certbot-apache-${version}.tar.gz"
-checksum=3ed001427ec0b49324f2b9af7170fa6e6e88948fa51c3678b07bf17f8138863d
-
-do_check() {
-	python3 -m pytest
-}
+checksum=e5679b40d99bd241f4fcd9fe44b73e6e25ccc969a617131ff6ebc90d562a49f2

From 4f96470d0a728bf3dd16bc9eadff493858f4ced2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 12:40:45 -0500
Subject: [PATCH 1702/3458] python3-acme: update to 1.12.0.

---
 srcpkgs/python3-acme/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 8424db282cfb..0ee9596cc13d 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
-version=1.11.0
+version=1.12.0
 revision=1
 wrksrc="acme-${version}"
 build_style=python3-module
@@ -14,8 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/certbot"
 distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz"
-checksum=092eb09a074a935da4c10f66cb8634ffb2cc2d2cc1035d2998d608996efab924
-
-do_check() {
-	python3 -m pytest
-}
+checksum=aa363474d50e9fdda27acb8b1aa7efb26fecc5650e02039a0de3a3f0e696c2f2

From 69083e3dfd5d122cfdc85dd09d3227656ed20cdb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 12:45:53 -0500
Subject: [PATCH 1703/3458] python3-virtualenv: update to 20.4.2.

---
 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 c1b3db57952a..44a63a2f74e3 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.4.0
+version=20.4.2
 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=219ee956e38b08e32d5639289aaa5bd190cfbe7dafcb8fa65407fca08e808f9c
+checksum=147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From 57f50976ae72220c29a6a65ba9365d5cac605fab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 12:48:19 -0500
Subject: [PATCH 1704/3458] tox: update to 3.22.0.

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

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 294f9bf437b6..8e6a6daa8efb 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,12 +1,12 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.21.2
+version=3.22.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-filelock python3-packaging
  python3-pluggy python3-pytest python3-toml python3-virtualenv"
-checkdepends="${depends} python3-pytest-mock
+checkdepends="${depends} python3-pip python3-pytest-mock
  python3-flaky python3-pathlib2 python3-freezegun"
 short_desc="Generic virtualenv management and test command line tool"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -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=f501808381c01c6d7827c2f17328be59c0a715046e94605ddca15fb91e65827d
+checksum=ed1e650cf6368bcbc4a071eeeba363c480920e0ed8a9ad1793c7caaa5ad33d49
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script

From b4d55c5af37013661e40c2a4cc0d1de89c8d63c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 16 Feb 2021 13:40:37 -0500
Subject: [PATCH 1705/3458] python-cffi: update to 1.14.5.

---
 srcpkgs/python-cffi/template | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index 25c1dbdf7cc1..b25bc18300b5 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -1,27 +1,34 @@
 # Template file for 'python-cffi'
 pkgname=python-cffi
-version=1.14.4
+version=1.14.5
 revision=1
 wrksrc="cffi-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools libffi-devel"
 makedepends="python-devel python3-devel libffi-devel"
 depends="python-pycparser"
-checkdepends="python-pytest python3-pytest python-pycparser
- python3-pycparser"
+checkdepends="python-pytest python3-pytest python-pycparser python3-pycparser"
 short_desc="C foreign function interface for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://cffi.readthedocs.io/"
 changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
 distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c
+checksum=fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c
 
 do_check() {
-	python2 setup.py build_ext -i
-	python2 -m pytest c/ testing/
-	python3 setup.py build_ext -i
-	python3 -m pytest c/ testing/
+	# glibc libm.so is a GNU ld script that isn't properly handled
+	# on dlopen; libm symbols required in these tests are missing
+	local excludes='not sin'
+	excludes+=' and not test_dlopen'
+	excludes+=' and not test_function_typedef'
+	excludes+=' and not test_wraps_from_stdlib'
+	excludes+=' and not test_stdcall_only_on_windows'
+
+	PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
+		python2 -m pytest c/ testing/ -x -k "$excludes"
+	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
+		python3 -m pytest c/ testing/ -x -k "$excludes"
 }
 
 post_install() {

From 5bad627365d84c2b3a355b23b8667461c19c3b8f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 16 Feb 2021 20:16:53 +0100
Subject: [PATCH 1706/3458] rtkit: drop runtime polkit dependency

while it's usually required, rtkit is only really needed by
pulseaudio and this introduces a needless build-time dependency
chain (rtkit -> polkit -> mozjs -> rust -> ...)

so drop it for now, usually this is not a problem anyway since
affected installations nearly always have polkit already installed
and this just introduces trouble for installations that explicitly
do not want it (such as chroots/multilib)
---
 srcpkgs/rtkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template
index da011f844cb1..22d3ad2369bb 100644
--- a/srcpkgs/rtkit/template
+++ b/srcpkgs/rtkit/template
@@ -1,11 +1,11 @@
 # Template file for 'rtkit'
 pkgname=rtkit
 version=0.13
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="dbus-devel libcap-devel"
-depends="dbus polkit"
+depends="dbus"
 short_desc="Realtime Policy and Watchdog Daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, GPL-3.0-or-later"

From 4f1e04e1632b24fc2f8f8b03153a3871efc0ef69 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 16 Feb 2021 20:11:30 +0100
Subject: [PATCH 1707/3458] webkit2gtk: update to 2.30.5

---
 .../webkit2gtk/patches/bwrap-libdir32.patch   | 49 +++++--------------
 srcpkgs/webkit2gtk/patches/ppc-llint.patch    | 38 ++++----------
 srcpkgs/webkit2gtk/template                   |  6 +--
 3 files changed, 26 insertions(+), 67 deletions(-)

diff --git a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
index 32d540a84e14..c136a64d9392 100644
--- a/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
+++ b/srcpkgs/webkit2gtk/patches/bwrap-libdir32.patch
@@ -1,45 +1,22 @@
-From a558bfcedf9d87d12f158a6917383d228da7ca75 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Mon, 4 Jan 2021 17:17:28 +0100
-Subject: [PATCH] fix bubblewrap libdir mounts for 32-bit systems
+https://bugs.webkit.org/show_bug.cgi?id=221709
 
-an upstream fix should be better than this, but this is good
-enough for void, since we strictly build with gcc anyway. and
-having a small patch is more important than portable patch
----
- .../UIProcess/Launcher/glib/BubblewrapLauncher.cpp   | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-index 889388a..a7a75a8 100644
+diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
+index 69b4dc6a6a0b..dc660f399257 100644
 --- Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
 +++ Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-@@ -733,6 +733,12 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
-     if (launchOptions.processType == ProcessLauncher::ProcessType::Network)
-         return adoptGRef(g_subprocess_launcher_spawnv(launcher, argv, error));
- 
-+#if __UINTPTR_MAX__ > 0xFFFFFFFF
-+#  define LIB_DIR_WS "64"
-+#else
-+#  define LIB_DIR_WS "32"
-+#endif
-+
-     Vector<CString> sandboxArgs = {
-         "--die-with-parent",
-         "--unshare-pid",
-@@ -765,9 +771,9 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
+@@ -758,9 +758,15 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
          "--ro-bind-try", "/usr/lib", "/usr/lib",
          "--ro-bind-try", "/usr/local/lib", "/usr/local/lib",
          "--ro-bind-try", LIBDIR, LIBDIR,
--        "--ro-bind-try", "/lib64", "/lib64",
--        "--ro-bind-try", "/usr/lib64", "/usr/lib64",
--        "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
-+        "--ro-bind-try", "/lib" LIB_DIR_WS, "/lib" LIB_DIR_WS,
-+        "--ro-bind-try", "/usr/lib" LIB_DIR_WS, "/usr/lib" LIB_DIR_WS,
-+        "--ro-bind-try", "/usr/local/lib" LIB_DIR_WS, "/usr/local/lib" LIB_DIR_WS,
++#if CPU(ADDRESS64)
+         "--ro-bind-try", "/lib64", "/lib64",
+         "--ro-bind-try", "/usr/lib64", "/usr/lib64",
+         "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
++#else
++        "--ro-bind-try", "/lib32", "/lib32",
++        "--ro-bind-try", "/usr/lib32", "/usr/lib32",
++        "--ro-bind-try", "/usr/local/lib32", "/usr/local/lib32",
++#endif
  
          "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
      };
--- 
-2.30.0
-
diff --git a/srcpkgs/webkit2gtk/patches/ppc-llint.patch b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
index d716c81a6746..80448614717a 100644
--- a/srcpkgs/webkit2gtk/patches/ppc-llint.patch
+++ b/srcpkgs/webkit2gtk/patches/ppc-llint.patch
@@ -1,58 +1,40 @@
-This fixes JavaScriptCore on 32-bit big endian systems (mainly ppc).
-
-Without the patch, attempting to run any JS results in a crash.
-
-Upstream status: https://bugs.webkit.org/show_bug.cgi?id=211592
+https://bugs.webkit.org/show_bug.cgi?id=221710
 
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+index 66571beb5c60..e273c6dd28a8 100644
 --- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
 +++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-@@ -1480,13 +1480,21 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
+@@ -1579,13 +1579,13 @@ llintOpWithMetadata(op_put_by_id, OpPutById, macro (size, get, dispatch, metadat
      loadp StructureChain::m_vector[t3], t3
      assert(macro (ok) btpnz t3, ok end)
  
 -    loadp Structure::m_prototype[t2], t2
-+    if JSVALUE64
-+        loadp Structure::m_prototype[t2], t2
-+    else
-+        loadp Structure::m_prototype + PayloadOffset[t2], t2
-+    end
++    loadp Structure::m_prototype + PayloadOffset[t2], t2
      btpz t2, .opPutByIdTransitionChainDone
  .opPutByIdTransitionChainLoop:
      loadp [t3], t1
      bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
      addp 4, t3
 -    loadp Structure::m_prototype[t1], t2
-+    if JSVALUE64
-+        loadp Structure::m_prototype[t1], t2
-+    else
-+        loadp Structure::m_prototype + PayloadOffset[t1], t2
-+    end
++    loadp Structure::m_prototype + PayloadOffset[t1], t2
      btpnz t2, .opPutByIdTransitionChainLoop
  
  .opPutByIdTransitionChainDone:
-@@ -2068,7 +2076,11 @@ end)
+@@ -2251,7 +2251,7 @@ end)
  
  
  op(llint_throw_from_slow_path_trampoline, macro()
 -    loadp Callee[cfr], t1
-+    if JSVALUE64
-+        loadp Callee[cfr], t1
-+    else
-+        loadp Callee + PayloadOffset[cfr], t1
-+    end
++    loadp Callee + PayloadOffset[cfr], t1
      convertCalleeToVM(t1)
      copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(t1, t2)
  
-@@ -2077,7 +2089,11 @@ op(llint_throw_from_slow_path_trampoline, macro()
+@@ -2260,7 +2260,7 @@ op(llint_throw_from_slow_path_trampoline, macro()
      # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
      # the throw target is not necessarily interpreted code, we come to here.
      # This essentially emulates the JIT's throwing protocol.
 -    loadp Callee[cfr], t1
-+    if JSVALUE64
-+        loadp Callee[cfr], t1
-+    else
-+        loadp Callee + PayloadOffset[cfr], t1
-+    end
++    loadp Callee + PayloadOffset[cfr], t1
      convertCalleeToVM(t1)
      jmp VM::targetMachinePCForThrow[t1]
  end)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 9a6dae73f5a1..904ecd1b69b8 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,8 +1,8 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.30.4
-revision=5
+version=2.30.5
+revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -42,7 +42,7 @@ 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"
-checksum=d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24
+checksum=7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser"
 build_options_default="gir wayland x11 bubblewrap minibrowser"

From 67bd56ea1768b16ccee0e3bd6c56f3d2a6d6e34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 14 Feb 2021 23:21:17 -0300
Subject: [PATCH 1708/3458] pulseaudio: update to 14.2.

Add comments about elogind and unit tests.

Closes: #27973 [via git-merge-pr]

Co-authored-by: UsernameRandomlyGenerated <coredavid@tutanota.com>
---
 common/shlibs               |  4 ++--
 srcpkgs/pulseaudio/template | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fda9284996c4..8d32c3af15c2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -731,8 +731,8 @@ libasyncns.so.0 libasyncns-0.8_1
 libpulse.so.0 libpulseaudio-1.0_1
 libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
 libpulse-simple.so.0 libpulseaudio-1.0_1
-libpulsecommon-14.0.so libpulseaudio-14.0_1
-libpulsecore-14.0.so libpulseaudio-14.0_1
+libpulsecommon-14.2.so libpulseaudio-14.2_1
+libpulsecore-14.2.so libpulseaudio-14.2_1
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index d54b9c5ba690..6819c2c1b700 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,8 +1,9 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
-version=14.0
-revision=3
+version=14.2
+revision=1
 build_style=meson
+# XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
  -Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
  -Dbluez5=true -Dbluez5-ofono-headset=false -Dbluez5-native-headset=true
@@ -21,8 +22,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.freedesktop.org/wiki/Software/PulseAudio"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
-checksum=a834775d9382b055504e5ee7625dc50768daac29329531deb6597bf05e06c261
+checksum=75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1
 python_version=3
+# FIXME: core-util-test fails
+make_check=yes
+
 system_groups="pulse-access"
 system_accounts="pulse"
 pulse_groups="audio"

From b838eece9831fc221ed4f7f32207e8b0d2cf7e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 15 Feb 2021 01:47:15 -0300
Subject: [PATCH 1709/3458] pulseaudio-module-sndio: revbump for pulseaudio.

---
 srcpkgs/pulseaudio-module-sndio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pulseaudio-module-sndio/template b/srcpkgs/pulseaudio-module-sndio/template
index b43a0b40b4d0..7b261e7ae069 100644
--- a/srcpkgs/pulseaudio-module-sndio/template
+++ b/srcpkgs/pulseaudio-module-sndio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio-module-sndio'
 pkgname=pulseaudio-module-sndio
 version=13.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pulseaudio pkg-config"

From 8ba809bf716060ffc1c4e15b7bbda073cd2a4bf1 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:28:53 +0100
Subject: [PATCH 1710/3458] memcached: update to 1.6.9.

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

diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template
index a4f9bb53c9f8..fd5b10dc71d7 100644
--- a/srcpkgs/memcached/template
+++ b/srcpkgs/memcached/template
@@ -1,6 +1,6 @@
 # Template file for 'memcached'
 pkgname=memcached
-version=1.6.8
+version=1.6.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-seccomp"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="http://www.memcached.org"
 changelog="https://github.com/memcached/memcached/wiki/ReleaseNotes${version//./}"
 distfiles="http://memcached.org/files/${pkgname}-${version}.tar.gz"
-checksum=e23b3a11f6ff52ac04ae5ea2e287052ce58fd1eadd394622eb65c3598fcd7939
+checksum=d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1
 
 # Rebuild configure script, due to patching configure.ac
 pre_configure() {

From 80a197fd55d4bf50107585833d8aa685b1f2acf7 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 16 Feb 2021 19:17:44 +0100
Subject: [PATCH 1711/3458] clamz: remove package

---
 srcpkgs/clamz/template            | 13 -------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 srcpkgs/clamz/template

diff --git a/srcpkgs/clamz/template b/srcpkgs/clamz/template
deleted file mode 100644
index 6739e40d7128..000000000000
--- a/srcpkgs/clamz/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'clamz'
-pkgname=clamz
-version=0.5
-revision=4
-build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="expat-devel libcurl-devel libgcrypt-devel"
-short_desc="Downloads MP3 files from Amazon.com's music store"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://code.google.com/archive/p/clamz"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/clamz/clamz-${version}.tar.gz"
-checksum=5a63f23f15dfa6c2af00ff9531ae9bfcca0facfe5b1aa82790964f050a09832b
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6be7dcd6f18e..b32a3d4f7558 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -24,6 +24,7 @@ replaces="
  bzrtools<=2.6.0_4
  caja-gksu<=1.20.2_2
  california<=0.4.0_4
+ clamz<=0.5_4
  couchdb<=1.7.1_2
  ctpp2<=2.8.3_7
  ctpp2-devel<=2.8.3_7

From 0040667949685c0ab19bb75fa75c88ea99472f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 16 Feb 2021 17:40:27 -0300
Subject: [PATCH 1712/3458] gimp: ignore development releases.

---
 srcpkgs/gimp/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/gimp/update

diff --git a/srcpkgs/gimp/update b/srcpkgs/gimp/update
new file mode 100644
index 000000000000..46d9a90b36a1
--- /dev/null
+++ b/srcpkgs/gimp/update
@@ -0,0 +1 @@
+ignore="*.99.*"

From 391864d1f72550096739bebd0145bda67386c8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 16 Feb 2021 18:12:05 -0300
Subject: [PATCH 1713/3458] hostapd: don't use patches symlinked from
 wpa_supplicant.

Avoid requiring fixes like e054a3cf3a14d4508ce71fdcbdf61be79d91c79b,
since these are separate packages which happened to have a source file
in common.
---
 .../patches/patch-src_utils_eloop_c.diff        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 srcpkgs/hostapd/patches/patch-src_utils_eloop_c.diff

diff --git a/srcpkgs/hostapd/patches/patch-src_utils_eloop_c.diff b/srcpkgs/hostapd/patches/patch-src_utils_eloop_c.diff
deleted file mode 120000
index acda6abf67fc..000000000000
--- a/srcpkgs/hostapd/patches/patch-src_utils_eloop_c.diff
+++ /dev/null
@@ -1 +0,0 @@
-../../wpa_supplicant/patches/patch-src_utils_eloop_c.diff
\ No newline at end of file
diff --git a/srcpkgs/hostapd/patches/patch-src_utils_eloop_c.diff b/srcpkgs/hostapd/patches/patch-src_utils_eloop_c.diff
new file mode 100644
index 000000000000..bab2cee4e590
--- /dev/null
+++ b/srcpkgs/hostapd/patches/patch-src_utils_eloop_c.diff
@@ -0,0 +1,16 @@
+$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
+
+--- 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;
+ 
++	if (eloop.timeout.prev == NULL)
++		return;
++
+ 	os_get_reltime(&now);
+ 	dl_list_for_each_safe(timeout, prev, &eloop.timeout,
+ 			      struct eloop_timeout, list) {

From c3fdf7c9c7326e167acec54243327b26e5cebdf0 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 16 Feb 2021 22:14:35 +0100
Subject: [PATCH 1714/3458] radare2: orphan package

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

diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 1f4601b46a27..39818e99e7f2 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -8,7 +8,7 @@ configure_args="-Duse_sys_capstone=true -Denable_tests=false"
 hostmakedepends="pkg-config"
 makedepends="capstone-devel"
 short_desc="Advanced command line debugger and hexadecimal editor"
-maintainer="Johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
 homepage="http://www.radare.org"
 distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz"

From da211c1051efe562c8ad307f58652a4ffd657601 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 16 Feb 2021 22:14:48 +0100
Subject: [PATCH 1715/3458] cutter: orphan package

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

diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index 646d7b64bab0..ed82d82ac9c7 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -10,7 +10,7 @@ hostmakedepends="pkg-config qt5-declarative-devel qt5-location-devel
 makedepends="capstone-devel python3-devel qt5-declarative-devel
  qt5-location-devel qt5-svg-devel radare2"
 short_desc="GUI for radare2 written in C++ and QT"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/radareorg/cutter"
 distfiles="https://github.com/radareorg/${pkgname}/archive/v${version}.tar.gz"

From 48288c882e2481296c219b3621beb080eae948d9 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 17:01:01 +0700
Subject: [PATCH 1716/3458] perl-Gtk2-Notify: remove package

---
 .../perl-Gtk2-Notify/patches/libnotify.patch  | 114 ------------------
 srcpkgs/perl-Gtk2-Notify/template             |  15 ---
 srcpkgs/removed-packages/template             |   1 +
 3 files changed, 1 insertion(+), 129 deletions(-)
 delete mode 100644 srcpkgs/perl-Gtk2-Notify/patches/libnotify.patch
 delete mode 100644 srcpkgs/perl-Gtk2-Notify/template

diff --git a/srcpkgs/perl-Gtk2-Notify/patches/libnotify.patch b/srcpkgs/perl-Gtk2-Notify/patches/libnotify.patch
deleted file mode 100644
index 1e1ce9c094d3..000000000000
--- a/srcpkgs/perl-Gtk2-Notify/patches/libnotify.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-http://bugs.gentoo.org/398699
-http://rt.cpan.org/Public/Bug/Display.html?id=67297
-http://pkgs.fedoraproject.org/gitweb/?p=perl-Gtk2-Notify.git;a=blob_plain;f=libnotify.patch;hb=HEAD
-
---- t/notification.t
-+++ t/notification.t
-@@ -2,20 +2,18 @@
- 
- use strict;
- use warnings;
--use Gtk2::TestHelper tests => 35;
-+use Gtk2::TestHelper tests => 32;
- use Test::Exception;
- use Gtk2::Notify -init, $0;
- 
- ginterfaces_ok('Gtk2::Notify');
- 
--my $w = Gtk2::Window->new;
--my $n = Gtk2::Notify->new('foo', 'bar', '', $w);
-+my $n = Gtk2::Notify->new('foo', 'bar', '');
- 
- isa_ok($n, 'Gtk2::Notify');
- 
- my @methods = qw(
-         add_action
--        attach_to_widget
-         clear_actions
-         clear_hints
-         close
-@@ -46,16 +44,6 @@ lives_ok(sub {
-         }, 42);
- }, 'add_action');
- 
--{
--    my $nw = Gtk2::Window->new;
--    lives_ok(sub {
--            $n->attach_to_widget($nw);
--    }, 'attach_to_widget');
--    lives_ok(sub {
--            $n->attach_to_widget($w);
--    }, 'attach_to_widget');
--}
--
- lives_ok(sub {
-         $n->clear_actions;
- }, 'clear_actions with existing actions');
-@@ -99,8 +87,6 @@ lives_ok(sub {
-         $n->close;
- }, 'close before show');
- 
--$w->show_all;
--
- lives_ok(sub {
-         $n->show;
- }, 'show');
---- xs/Notify.xs
-+++ xs/Notify.xs
-@@ -86,26 +86,12 @@ notify_get_server_info (class, OUTLIST c
- MODULE = Gtk2::Notify	PACKAGE = Gtk2::Notify	PREFIX = notify_notification_
- 
- NotifyNotification *
--notify_notification_new (class, summary, body=NULL, icon=NULL, attach=NULL)
-+notify_notification_new (class, summary, body=NULL, icon=NULL)
- 		const gchar *summary
- 		const gchar *body
- 		const gchar *icon
--		GtkWidget_ornull *attach
- 	C_ARGS:
--		summary, body, icon, attach
--
--#if GTK_CHECK_VERSION (2, 9, 2)
--
--NotifyNotification *
--notify_notification_new_with_status_icon (class, summary, body=NULL, icon=NULL, status_icon=NULL)
--		const gchar *summary
--		const gchar *body
--		const gchar *icon
--		GtkStatusIcon *status_icon
--	C_ARGS:
--		summary, body, icon, status_icon
--
--#endif
-+		summary, body, icon
- 
- gboolean
- notify_notification_update (notification, summary, message=NULL, icon=NULL)
-@@ -114,27 +100,6 @@ notify_notification_update (notification
- 		const gchar *message
- 		const gchar *icon
- 
--void
--notify_notification_attach_to_widget (notification, attach)
--		NotifyNotification *notification
--		GtkWidget *attach
--
--#if GTK_CHECK_VERSION (2, 9, 2)
--
--void
--notify_notification_attach_to_status_icon (notification, status_icon)
--		NotifyNotification *notification
--		GtkStatusIcon *status_icon
--
--#endif
--
--void
--notify_notification_set_geometry_hints (notification, screen, x, y)
--		NotifyNotification *notification
--		GdkScreen *screen
--		gint x
--		gint y
--
- NO_OUTPUT gboolean
- notify_notification_show (notification)
- 		NotifyNotification *notification
diff --git a/srcpkgs/perl-Gtk2-Notify/template b/srcpkgs/perl-Gtk2-Notify/template
deleted file mode 100644
index d49a8f5308cb..000000000000
--- a/srcpkgs/perl-Gtk2-Notify/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template build file for 'perl-Gtk2-Notify'
-pkgname=perl-Gtk2-Notify
-version=0.05
-revision=7
-build_style=perl-module
-hostmakedepends="perl perl-Gtk2 gtk+-devel libnotify-devel perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
-makedepends="${hostmakedepends}"
-short_desc="Gtk2::Notify - Perl interface to libnotify"
-maintainer="chinarulezzz <s.alex08@mail.ru>"
-homepage="https://metacpan.org/release/Gtk2-Notify"
-license="LGPL-2"
-distfiles="${CPAN_SITE}/Gtk2/Gtk2-Notify-${version}.tar.gz"
-checksum=88189ae68dfbd54615ad133df07e2ec8048d06d8b9586add1227d74eb2ebb047
-wrksrc="Gtk2-Notify-${version}"
-nocross=yes
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index b32a3d4f7558..983ca91bfea9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -177,6 +177,7 @@ replaces="
  orage<=4.12.1_7
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
+ perl-Gtk2-Notify<=0.05_7
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
  polkit-qt<=0.112.0_5

From 633dde529027cb401d0c7e7c56c5bb01f758cd3e 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 17:02:29 +0700
Subject: [PATCH 1717/3458] perl-Gtk2-ImageView: remove package

---
 srcpkgs/perl-Gtk2-ImageView/template | 16 ----------------
 srcpkgs/removed-packages/template    |  1 +
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 srcpkgs/perl-Gtk2-ImageView/template

diff --git a/srcpkgs/perl-Gtk2-ImageView/template b/srcpkgs/perl-Gtk2-ImageView/template
deleted file mode 100644
index a0fa329876c6..000000000000
--- a/srcpkgs/perl-Gtk2-ImageView/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template build file for 'perl-Gtk2-ImageView'
-pkgname=perl-Gtk2-ImageView
-version=0.05
-revision=7
-wrksrc="Gtk2-ImageView-$version"
-build_style=perl-module
-hostmakedepends="perl perl-ExtUtils-Depends perl-ExtUtils-PkgConfig"
-makedepends="perl perl-Gtk2 gtkimageview-devel gtk+-devel"
-depends="perl perl-Gtk2"
-short_desc="Gtk2::ImageView - Perl bindings to the GtkImageView widget"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://metacpan.org/release/Gtk2-ImageView"
-license="LGPL-3"
-distfiles="${CPAN_SITE}/Gtk2/Gtk2-ImageView-${version}.tar.gz"
-checksum=087186c3693acf196451cf59cc8b7f5cf9a7b05abe20d32dcbcba0822953fb80
-nocross=yes
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 983ca91bfea9..402c0290a8ef 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -177,6 +177,7 @@ replaces="
  orage<=4.12.1_7
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
+ perl-Gtk2-ImageView<=0.05_7
  perl-Gtk2-Notify<=0.05_7
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3

From 214c218a50be527116fe546a36434d59b4e1fef5 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 17:03:27 +0700
Subject: [PATCH 1718/3458] perl-Gtk2-Ex-Simple-List: remove package

---
 srcpkgs/perl-Gtk2-Ex-Simple-List/template | 15 ---------------
 srcpkgs/removed-packages/template         |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 srcpkgs/perl-Gtk2-Ex-Simple-List/template

diff --git a/srcpkgs/perl-Gtk2-Ex-Simple-List/template b/srcpkgs/perl-Gtk2-Ex-Simple-List/template
deleted file mode 100644
index b356222ce1cf..000000000000
--- a/srcpkgs/perl-Gtk2-Ex-Simple-List/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'perl-Gtk2-Ex-Simple-List'
-pkgname=perl-Gtk2-Ex-Simple-List
-version=0.50
-revision=4
-wrksrc="Gtk2-Ex-Simple-List-$version"
-build_style=perl-module
-hostmakedepends="perl-Gtk2 perl-Glib"
-makedepends="perl-Gtk2 perl-Glib"
-depends="perl-Gtk2 perl-Glib"
-short_desc="Gtk2::Ex::Simple::List - A simple interface to Gtk2's MVC list widget"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://metacpan.org/release/Gtk2-Ex-Simple-List"
-distfiles="${CPAN_SITE}/Gtk2/Gtk2-Ex-Simple-List-${version}.tar.gz"
-checksum=62df53d0da396aba8e96aee06d869a77b8cf54af2ebd9df885b7aef2d5a207b5
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 402c0290a8ef..4869282733c3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -177,6 +177,7 @@ replaces="
  orage<=4.12.1_7
  oce<=0.18.3_1
  oce-devel<=0.18.3_1
+ perl-Gtk2-Ex-Simple-List<=0.50_4
  perl-Gtk2-ImageView<=0.05_7
  perl-Gtk2-Notify<=0.05_7
  phonon-backend-gstreamer<=4.9.0_2

From 53e804e935621ec7ff28498befd0ac1ebca86efc 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, 17 Feb 2021 08:51:54 +0700
Subject: [PATCH 1719/3458] fswatch: link -latomic when required

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

diff --git a/srcpkgs/fswatch/template b/srcpkgs/fswatch/template
index 48a53b119777..c8ff2fa83bea 100644
--- a/srcpkgs/fswatch/template
+++ b/srcpkgs/fswatch/template
@@ -14,6 +14,7 @@ checksum=44d5707adc0e46d901ba95a5dc35c5cc282bd6f331fcf9dbf9fad4af0ed5b29d
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	export LIBS=-latomic
 fi
 
 post_install() {

From f093402732adb88a25f0deccb6d977f8a74c8ee0 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, 17 Feb 2021 09:09:53 +0700
Subject: [PATCH 1720/3458] dq: mark nocross

dq was never cross-compiled, the build system run target binaries to
determine features.
---
 srcpkgs/dq/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dq/template b/srcpkgs/dq/template
index a5ef2cd30996..632384197cf6 100644
--- a/srcpkgs/dq/template
+++ b/srcpkgs/dq/template
@@ -17,6 +17,7 @@ license="Public Domain"
 homepage="https://mojzis.com/software/dq/"
 distfiles="https://github.com/janmojzis/dq/archive/${version##*.}.tar.gz"
 checksum=b1797538dd7dfe8e6d9c2964eee0b569589b448c8a2e636bbee4cf2a19bc7ea4
+nocross="build run target"
 
 system_accounts="_dqcache"
 

From 7d1734117d1f53d891c9264a7c70f8f83a0ae849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 16 Feb 2021 17:47:26 -0300
Subject: [PATCH 1721/3458] yelp-xsl: update to 3.38.3.

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

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index b6191a67efbf..88899d2ed720 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
@@ -12,4 +12,4 @@ 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=2c8472dc6c470145e8a01e5e7c8ceffe81eb2bd318f7282fdede9a3f975fb47b
+checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03

From 01820645dbdccfdfb69abbbccd5545405a29ca51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 16 Feb 2021 17:47:44 -0300
Subject: [PATCH 1722/3458] yelp: update to 3.38.3.

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 8d5856499f28..0fa0bae4f07e 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ 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=9ba88b59a7c087fea56970549265ca8eb0a83a72ee2800aed03c455101d28c8b
+checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From e23af1467a5999203e47209e349919b67374ee19 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivlim@pm.me>
Date: Fri, 12 Feb 2021 23:08:21 -0800
Subject: [PATCH 1723/3458] protonmail-bridge: update to 1.5.6

Correcting the license which has been GPL 3.0.

Licensing information taken from
https://github.com/ProtonMail/proton-bridge/blob/565c0b6ddf0f920c7a3a8fe9ba674fc91bcf0561/COPYING_NOTES.md

Closes: #28717 [via git-merge-pr]
---
 srcpkgs/protonmail-bridge/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index 017297acd96e..e0bc8d92fc4e 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,24 +1,23 @@
 # Template file for 'protonmail-bridge'
 pkgname=protonmail-bridge
-version=1.4.4
+version=1.5.6
 revision=1
 archs="x86_64"
 build_style=fetch
 depends="desktop-file-utils"
 short_desc="ProtonMail Bridge for use with E-mail software"
 maintainer="Rich G <rich@richgannon.net>"
-license="custom:Commercial"
+license="GPL-3.0-or-later"
 homepage="https://protonmail.com/bridge"
 distfiles="https://protonmail.com/download/beta/protonmail-bridge_${version}-1_amd64.deb"
-checksum=70938512bde6d6d072147ba593e40c67b70bc0e85fa976e656d6174309a80d22
+checksum=3c18833c7b21ab97c9ba0a5e1267a620de3c8eece02bed49ff3d12961932b74c
 
 restricted=yes
 noverifyrdeps=yes
 nopie=yes
 
 do_install() {
-	ar x protonmail-bridge_${version}-1_amd64.deb data.tar.xz
-	bsdtar xpvf data.tar.xz
+	ar x protonmail-bridge_${version}-1_amd64.deb data.tar.gz
+	bsdtar xpvf data.tar.gz
 	cp -r usr ${DESTDIR}
-	vlicense usr/lib/protonmail/bridge/LICENSE
 }

From 8128fcdad2ca1e6b39ce33e50a34458454dec9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 17 Feb 2021 12:26:16 +0100
Subject: [PATCH 1724/3458] pidgin-sipe: fix for musl-1.2.2 (time64)

---
 srcpkgs/pidgin-sipe/patches/time64.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/pidgin-sipe/patches/time64.patch

diff --git a/srcpkgs/pidgin-sipe/patches/time64.patch b/srcpkgs/pidgin-sipe/patches/time64.patch
new file mode 100644
index 000000000000..e4397c65d927
--- /dev/null
+++ b/srcpkgs/pidgin-sipe/patches/time64.patch
@@ -0,0 +1,22 @@
+--- src/core/sipe-utils.c	2019-10-11 17:28:48.000000000 +0200
++++ src/core/sipe-utils.c	2021-02-17 12:21:58.906079796 +0100
+@@ -25,6 +25,8 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <time.h>
++#include <stdint.h>
++#include <inttypes.h>
+ 
+ #include <glib.h>
+ 
+@@ -414,8 +415,8 @@
+ 	if (result)
+ 		return(result);
+ 
+-	SIPE_DEBUG_ERROR("sipe_utils_time_to_str: failed to convert %lu to ISO8601 string",
+-			 timestamp);
++	SIPE_DEBUG_ERROR("sipe_utils_time_to_str: failed to convert %" PRIu64 " to ISO8601 string",
++			 (uint64_t) timestamp);
+ 	return(g_strdup(""));
+ }
+ 

From 8a5bd62d05c0c6bf79acbaf2b8d8db67ed332825 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, 17 Feb 2021 18:38:35 +0700
Subject: [PATCH 1725/3458] drumstick: fix cross, move *.so files

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

diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template
index bbc8f5638977..3a6b0264925f 100644
--- a/srcpkgs/drumstick/template
+++ b/srcpkgs/drumstick/template
@@ -1,10 +1,10 @@
 # Template file for 'drumstick'
 pkgname=drumstick
 version=1.1.3
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DLIB_SUFFIX="
-hostmakedepends="pkg-config doxygen libxslt docbook-xsl"
+configure_args="-DLIB_SUFFIX= -DUPDATE_MIME_DATABASE_EXECUTABLE=true"
+hostmakedepends="pkg-config doxygen libxslt docbook-xsl qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel"
 short_desc="Set of MIDI libraries using C++/Qt5 idioms and style"
 maintainer="Mohammad Amin Sameti <mamins1376@gmail.com>"
@@ -13,10 +13,6 @@ homepage="http://drumstick.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2"
 checksum=75aca4281da25fe0186b44c07772c5f0b4d1f2bba875c4667e7e6e9fcedb3cd9
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools"
-fi
-
 post_install() {
 	for doc in TODO NEWS ChangeLog AUTHORS; do
 		vdoc $doc
@@ -29,5 +25,6 @@ drumstick-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

From a44edab939eb582ce40dba3bc77223454acfaae9 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, 17 Feb 2021 18:42:45 +0700
Subject: [PATCH 1726/3458] pinfo: move gettext-devel to hostmakedepends

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

diff --git a/srcpkgs/pinfo/template b/srcpkgs/pinfo/template
index d33478747fd6..7f6cd17f9003 100644
--- a/srcpkgs/pinfo/template
+++ b/srcpkgs/pinfo/template
@@ -3,8 +3,8 @@ pkgname=pinfo
 version=0.6.13
 revision=2
 build_style=gnu-configure
-hostmakedepends="automake gettext tar texinfo"
-makedepends="gettext-devel ncurses-devel"
+hostmakedepends="automake gettext gettext-devel tar texinfo"
+makedepends="ncurses-devel"
 short_desc="Lynx-style info and man reader"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From d8644d6f8174510875f058a80c009af31c3f1d14 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, 17 Feb 2021 18:46:39 +0700
Subject: [PATCH 1727/3458] bamf: remove post_install()

The work should be done by common/hooks/pre-install/98-fixup-gir-path.sh
---
 srcpkgs/bamf/template | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/srcpkgs/bamf/template b/srcpkgs/bamf/template
index 763a0d2d1c3f..e71e50d826f2 100644
--- a/srcpkgs/bamf/template
+++ b/srcpkgs/bamf/template
@@ -24,16 +24,6 @@ pre_configure() {
 	sed -i configure -e '/CFLAGS=/s/ \-Werror / /'
 }
 
-post_install() {
-	if [ "$build_option_gir" -a "$CROSS_BUILD" ]; then
-		mv ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/share/gir-1.0 \
-		   ${DESTDIR}/usr/share
-
-		mv ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/lib/girepository-1.0 \
-		   ${DESTDIR}/usr/lib
-	fi
-}
-
 bamf-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 0a3ae8096433f1913701afcd21ba8f5cf7fa8ade Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 00:36:23 +0100
Subject: [PATCH 1728/3458] options.description: describe gtk

clean description up from templates
---
 common/options.description         | 1 +
 srcpkgs/audacious-plugins/template | 1 -
 srcpkgs/audacious/template         | 1 -
 srcpkgs/baresip/template           | 1 -
 srcpkgs/cegui/template             | 1 -
 srcpkgs/profanity/template         | 1 -
 6 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/options.description b/common/options.description
index 51d3261abf6b..b6f538d5be1d 100644
--- a/common/options.description
+++ b/common/options.description
@@ -30,6 +30,7 @@ desc_option_gmic="Enable support for image processing with G'MIC"
 desc_option_gnutls="Enable support for SSL with gnutls"
 desc_option_gssapi="Enable support for GSSAPI"
 desc_option_gstreamer="Enable support for GStreamer"
+desc_option_gtk="Enable support for the GTK+2 GUI toolkit"
 desc_option_gtk3="Enable support for the GTK+3 GUI toolkit"
 desc_option_guile="Enable support for Guile lang"
 desc_option_ffmpeg="Enable support for FFmpeg"
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index 84bcfd2113f3..8c8d4d58954f 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -21,7 +21,6 @@ checksum=dad6fc625055349d589e36e8e5c8ae7dfafcddfe96894806509696d82bb61d4c
 
 build_options="gtk qt"
 build_options_default="qt"
-desc_option_gtk="Enable support for the GTK+2 GUI toolkit"
 vopt_conflict gtk qt
 
 post_install() {
diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template
index df154bf52f2f..ebeca48a6171 100644
--- a/srcpkgs/audacious/template
+++ b/srcpkgs/audacious/template
@@ -18,7 +18,6 @@ checksum=1f58858f9789e867c513b5272987f13bdfb09332b03c2814ad4c6e29f525e35c
 
 build_options="gtk qt"
 build_options_default="qt"
-desc_option_gtk="Enable support for the GTK+2 GUI toolkit"
 vopt_conflict gtk qt
 
 post_install() {
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index a731d5530907..d6020b6dfcc4 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -30,7 +30,6 @@ checksum=7b008c0a5b4fccfa0a4003f86dc4aaafeaabbdd259ece4757898e9cb5f04fdcf
 # Package build options
 build_options="gtk video"
 build_options_default="gtk video"
-desc_option_gtk="Enable support for GTK+2 frontend and related modules"
 desc_option_video="Enable support for video calling"
 
 case $XBPS_TARGET_MACHINE in
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index 00890008598a..e2a4be0f9a49 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -25,7 +25,6 @@ checksum=70156257313b81d068d6592887157dd16b91d7bc0dfdcba02a96ed371d329e64
 replaces="cegui-data>=0 cegui-sample>=0"
 
 build_options="gtk irrlicht ogre python"
-desc_option_gtk="Enable support for GTK2"
 desc_option_irrlicht="Enable support for Irrlicht"
 desc_option_ogre="Enable support for Ogre"
 build_options_default="gtk python"
diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index 338e3092a675..af02da7008e9 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -34,6 +34,5 @@ build_options_default="notify otr pgp gtk omemo python cplugins plugins xscreens
 desc_option_otr="Enable support for OTR encryption"
 desc_option_pgp="Enable support for OpenPGP encryption"
 desc_option_omemo="Enable support for OMEMO encryption"
-desc_option_gtk="Enable support for the GTK GUI toolkit"
 desc_option_plugins="Enable support for plugins"
 desc_option_cplugins="Enable support for c-plugins"

From d559414570036991045b2e1c9cbf817e77251e5a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Wed, 17 Feb 2021 12:35:27 +0100
Subject: [PATCH 1729/3458] dbeaver: update to 7.3.5.

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

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 553904369bee..bf26a79cd7f0 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=7.3.4
+version=7.3.5
 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=1adc7989776955d52afb5f6ff7cf4d027f2a8d7b0522ebacdaf8ece1f51db228
+checksum=64ea39b57f106d0d37b1df8fce63d4c8f73cfe588eb6ffe9d2a215fb77e82d44
 nopie=true
 
 do_build() {

From e3193b09b2c73a49780ee77278661ab2daf2c41b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 16 Feb 2021 17:51:04 -0300
Subject: [PATCH 1730/3458] Komikku: update to 0.26.1.

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index fd8ecd8b7a4a..ece40f3ed604 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.25.1
+version=0.26.1
 revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -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=5aba25a8f13dc99f1f8bfeb9d347a8b44cfae7c6fb35d801f21af6ad846036c1
+checksum=3f21d17414d33e9a33d831e4eeb297d62c27920b7e63de0abe755cb0983b3652

From 5239de6714dd3c0fa11ddfc3544885f2979e14c7 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 17 Feb 2021 09:55:29 +0100
Subject: [PATCH 1731/3458] google-chrome: update to 88.0.4324.182

---
 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 d16b1b8d13ae..1342f756d196 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=88.0.4324.150
+_chromeVersion=88.0.4324.182
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=404f13af1288a824898674e83c42bcdffba098178ff96d266525cd7e2fdcd077
+checksum=ab00e9412f5f20e30c7db5dc987473248f4adf9ebf2c3f928ef62e1ffb104fe6
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From ce8eb7201922db62d438f9d4f7cd0dd765d6d6b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 17 Feb 2021 20:24:28 +0700
Subject: [PATCH 1732/3458] python3-grpcio: build against system LibreSSL and
 re2

H/T: @sgn

Closes: #28816 [via git-merge-pr]
---
 srcpkgs/python3-grpcio/template | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 76b88b3c8c46..eb7f99b77bd0 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.35.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
@@ -25,6 +25,8 @@ fi
 
 export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
 export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+export GRPC_PYTHON_BUILD_SYSTEM_RE2=1
+export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
 
 post_patch() {
 	if [ "${CROSS_BUILD}" ]; then
@@ -33,19 +35,4 @@ post_patch() {
 		vsed -e "s@['\"]cc['\"]@'${CC}'@g" \
 			-i src/python/grpcio/commands.py
 	fi
-
-	# set boringssl asm target
-	local asm_key
-	case "${XBPS_TARGET_MACHINE}" in
-		x86_64*) asm_key=crypto_linux_x86_64;;
-		i686*) asm_key=crypto_linux_x86;;
-		aarch64*) asm_key=crypto_linux_aarch64;;
-		armv6l*|armv7l*) asm_key=crypto_linux_arm;;
-		ppc64le*) asm_key=crypto_linux_ppc64le;;
-		*) ;;
-	esac
-
-	vsed -i setup.py \
-		-e "s/asm_key = .*/asm_key = '${asm_key}'/" \
-		-e "s/if BUILD_WITH_BORING_SSL_ASM:/if False:/"
 }

From 69fcfcf34aa1258885c89ed53b9c7ac2899d630c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 17 Feb 2021 02:24:07 +0100
Subject: [PATCH 1733/3458] nushell: enable extra features always

---
 srcpkgs/nushell/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index f42cd9776eea..9a14dc1771e8 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,10 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.0
-revision=1
+revision=2
 build_style=cargo
-hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+configure_args="--features=extra"
+hostmakedepends="pkg-config python3 libgit2-devel"
+makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
@@ -16,11 +17,17 @@ register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*)
-		configure_args="--features=extra"
-		makedepends+=" libX11-devel libxcb-devel" ;;
-esac
+post_patch() {
+	# pull in updates for https://github.com/alkis/decimal
+	# the latest release (2.0.4) is missing fixes needed for
+	# platforms with unsigned char type; pin it to a specific
+	# revision until a new release is made
+	#
+	# remove this post_patch once that has happened
+	echo '[patch.crates-io.decimal]' >> Cargo.toml
+	echo 'git = "https://github.com/alkis/decimal"' >> Cargo.toml
+	echo 'rev = "c27d9a165afc55ec98fb4db79b12841df578387e"' >> Cargo.toml
+}
 
 post_install() {
 	vlicense LICENSE

From 067309d3a2b0e359c90f3e4dde6e5e88e25d5101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 17 Feb 2021 14:47:49 -0300
Subject: [PATCH 1734/3458] removed-packages: remove some mozjs from replaces.

XBPS's self update phase is too eager, and ends up pulling in
removed-packages. This means that a library added to removed-packages,
which should be cleanly replaced during the update phase, since its
dependants will ether be removed or moved to another dependency, will
instead stop the installation due to shlib errors.

Fixes #28779.
---
 srcpkgs/removed-packages/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4869282733c3..fd0328005a52 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=26
+revision=27
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -171,8 +171,6 @@ replaces="
  mdds0<=0.12.1_3
  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
  oce<=0.18.3_1

From 5219b4b181db22ec7318ef31b5be1d6981af7ede Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 17 Feb 2021 22:02:58 +0100
Subject: [PATCH 1735/3458] uftrace: change to configure build-style

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

diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template
index 1c4d54a5bcb1..6759ed80d168 100644
--- a/srcpkgs/uftrace/template
+++ b/srcpkgs/uftrace/template
@@ -3,7 +3,8 @@ pkgname=uftrace
 version=0.9.4
 revision=2
 archs="x86_64* i686* aarch64* arm*"
-build_style=gnu-configure
+build_style=configure
+configure_args="--prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
 hostmakedepends="pandoc pkg-config"
 makedepends="capstone-devel elfutils-devel ncurses-devel"
 short_desc="Function graph tracer for user-space"

From b37b26eaaf79e7c4b9a053d20520b12afac5bf67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 20:22:52 +0100
Subject: [PATCH 1736/3458] environment/configure/gnu-configure-args.sh: do not
 expand exec_prefix

the expansion did at least result in invalid pkgconfig
and cmake files generated in xapian-core
---
 common/environment/configure/gnu-configure-args.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c0a2f4602b91..dafbf5dc110c 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -17,7 +17,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
 # Always use wordsize-specific libdir even though the real path is lib
 # This is to make sure 32-bit and 64-bit libs can coexist when looking
 # up things (the opposite-libdir is always symlinked as libNN)
-export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 

From e3e1be171866a15ff4a5203191edf9b78caa0e52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 17 Feb 2021 20:39:49 +0100
Subject: [PATCH 1737/3458] pev: update to 0.81.

---
 ...001-Fix-buffer-underwrite-in-imphash.patch | 26 ----------
 ...ve-const-qualifier-from-parent_scope.patch | 27 ----------
 ...ff-by-one-buffer-overflow-in-imphash.patch | 26 ----------
 ...phash_string-buffer-size-calculation.patch | 26 ----------
 ...005-Fix-misuse-of-sprintf-in-imphash.patch | 27 ----------
 ...0006-Fixes-116.-Thanks-to-Jakub-Wilk.patch | 51 -------------------
 ...x-memory-leak-related-to-scope-stack.patch | 25 ---------
 ...caused-during-digital-signature-vali.patch | 28 ----------
 ...y-leak-during-output-scope-unwinding.patch | 47 -----------------
 .../pev/patches/0010-fix-readdir-bug.patch    | 33 ------------
 ...-ignore-DT_REG-if-for-instance-Linux.patch | 29 -----------
 ...unitialized-memory-issues.-Fixes-122.patch | 32 ------------
 srcpkgs/pev/template                          | 13 ++---
 13 files changed, 4 insertions(+), 386 deletions(-)
 delete mode 100644 srcpkgs/pev/patches/0001-Fix-buffer-underwrite-in-imphash.patch
 delete mode 100644 srcpkgs/pev/patches/0002-Remove-const-qualifier-from-parent_scope.patch
 delete mode 100644 srcpkgs/pev/patches/0003-Fix-off-by-one-buffer-overflow-in-imphash.patch
 delete mode 100644 srcpkgs/pev/patches/0004-Fix-imphash_string-buffer-size-calculation.patch
 delete mode 100644 srcpkgs/pev/patches/0005-Fix-misuse-of-sprintf-in-imphash.patch
 delete mode 100644 srcpkgs/pev/patches/0006-Fixes-116.-Thanks-to-Jakub-Wilk.patch
 delete mode 100644 srcpkgs/pev/patches/0007-Fix-memory-leak-related-to-scope-stack.patch
 delete mode 100644 srcpkgs/pev/patches/0008-Fix-memory-leak-caused-during-digital-signature-vali.patch
 delete mode 100644 srcpkgs/pev/patches/0009-Fix-memory-leak-during-output-scope-unwinding.patch
 delete mode 100644 srcpkgs/pev/patches/0010-fix-readdir-bug.patch
 delete mode 100644 srcpkgs/pev/patches/0011-We-don-t-want-to-ignore-DT_REG-if-for-instance-Linux.patch
 delete mode 100644 srcpkgs/pev/patches/0012-peres-Fix-unitialized-memory-issues.-Fixes-122.patch

diff --git a/srcpkgs/pev/patches/0001-Fix-buffer-underwrite-in-imphash.patch b/srcpkgs/pev/patches/0001-Fix-buffer-underwrite-in-imphash.patch
deleted file mode 100644
index f37d3ff110d1..000000000000
--- a/srcpkgs/pev/patches/0001-Fix-buffer-underwrite-in-imphash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d27d76f7a52c154f809847d2b7d30cab2d7d31ed Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 17 Jul 2017 12:10:31 +0200
-Subject: [PATCH 01/12] Fix buffer underwrite in imphash()
-
----
- src/pehash.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git src/pehash.c src/pehash.c
-index e03a0a9..ffb4fdd 100644
---- src/pehash.c
-+++ src/pehash.c
-@@ -483,7 +483,8 @@ static void imphash(pe_ctx_t *ctx, int flavor)
- 	free(elt);
- 
- 	imphash_string_size = strlen(imphash_string);
--	imphash_string[imphash_string_size-1] = '\0'; // remove the last comma sign
-+	if (imphash_string_size)
-+		imphash_string[imphash_string_size-1] = '\0'; // remove the last comma sign
- 
- 	//puts(imphash_string); // DEBUG
- 
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0002-Remove-const-qualifier-from-parent_scope.patch b/srcpkgs/pev/patches/0002-Remove-const-qualifier-from-parent_scope.patch
deleted file mode 100644
index cc3b2e56fe2a..000000000000
--- a/srcpkgs/pev/patches/0002-Remove-const-qualifier-from-parent_scope.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 061612666eaa831feed897f52125f7c7812a51d0 Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Sun, 16 Jul 2017 20:25:04 +0200
-Subject: [PATCH 02/12] Remove const qualifier from parent_scope
-
-If parent_scope is declared as const, the compiler may emit code that
-assumes the value doesn't change, i.e. dereferencing the null pointer.
----
- src/output.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/output.c src/output.c
-index b825ca2..ed2e48e 100644
---- src/output.c
-+++ src/output.c
-@@ -288,7 +288,7 @@ void output_open_scope(const char *scope_name, output_scope_type_e scope_type) {
- 	scope->depth = scope_depth + 1;
- 
- 	if (scope_depth > 0) {
--		output_scope_t * const parent_scope = NULL;
-+		output_scope_t * parent_scope = NULL;
- 		STACK_PEEK(g_scope_stack, (void *)&parent_scope);
- 		scope->parent_type = parent_scope->type;
- 	}
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0003-Fix-off-by-one-buffer-overflow-in-imphash.patch b/srcpkgs/pev/patches/0003-Fix-off-by-one-buffer-overflow-in-imphash.patch
deleted file mode 100644
index a3afeb8036ac..000000000000
--- a/srcpkgs/pev/patches/0003-Fix-off-by-one-buffer-overflow-in-imphash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ee0ec66ac2da159c0d215c9dbbe0ccc8333f51cc Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 17 Jul 2017 11:04:25 +0200
-Subject: [PATCH 03/12] Fix off-by-one buffer overflow in imphash()
-
-The extra byte is needed for the terminating null byte.
----
- src/pehash.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/pehash.c src/pehash.c
-index ffb4fdd..59e15b0 100644
---- src/pehash.c
-+++ src/pehash.c
-@@ -488,7 +488,7 @@ static void imphash(pe_ctx_t *ctx, int flavor)
- 
- 	//puts(imphash_string); // DEBUG
- 
--	char imphash[32];
-+	char imphash[33];
- 	calc_hash("md5", (unsigned char *)imphash_string, strlen(imphash_string), imphash);
- 	free(imphash_string);
- 
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0004-Fix-imphash_string-buffer-size-calculation.patch b/srcpkgs/pev/patches/0004-Fix-imphash_string-buffer-size-calculation.patch
deleted file mode 100644
index 84ecbcf4cbf1..000000000000
--- a/srcpkgs/pev/patches/0004-Fix-imphash_string-buffer-size-calculation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 180db22b5b51ef2a00eae9a25ca94d859d348a93 Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 17 Jul 2017 14:10:42 +0200
-Subject: [PATCH 04/12] Fix imphash_string buffer size calculation
-
-Fixes buffer overflow in imphash().
----
- src/pehash.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/pehash.c src/pehash.c
-index 59e15b0..db1735a 100644
---- src/pehash.c
-+++ src/pehash.c
-@@ -470,7 +470,7 @@ static void imphash(pe_ctx_t *ctx, int flavor)
- 	LL_COUNT(head, elt, count);
- 	//printf("%d number of elements in list outside\n", count);
- 
--	size_t imphash_string_size = sizeof(char) * count * MAX_DLL_NAME + MAX_FUNCTION_NAME;
-+	size_t imphash_string_size = sizeof(char) * count * (MAX_DLL_NAME + MAX_FUNCTION_NAME) + 1;
- 
- 	char *imphash_string = (char *) malloc_s(imphash_string_size);
- 
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0005-Fix-misuse-of-sprintf-in-imphash.patch b/srcpkgs/pev/patches/0005-Fix-misuse-of-sprintf-in-imphash.patch
deleted file mode 100644
index 0c193b724778..000000000000
--- a/srcpkgs/pev/patches/0005-Fix-misuse-of-sprintf-in-imphash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f3f66090a0a8bdcdb98984322169c73be89892b6 Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 17 Jul 2017 11:58:29 +0200
-Subject: [PATCH 05/12] Fix misuse of sprintf() in imphash()
-
-The results are undefined if source and destination buffers overlap when
-calling sprintf().
----
- src/pehash.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/pehash.c src/pehash.c
-index db1735a..e49f0c1 100644
---- src/pehash.c
-+++ src/pehash.c
-@@ -477,7 +477,7 @@ static void imphash(pe_ctx_t *ctx, int flavor)
- 	memset(imphash_string, 0, imphash_string_size);
- 
- 	LL_FOREACH_SAFE(head, elt, tmp) \
--		sprintf(imphash_string, "%s%s.%s,", imphash_string, elt->dll_name, elt->function_name); \
-+		sprintf(imphash_string + strlen(imphash_string), "%s.%s,", elt->dll_name, elt->function_name); \
- 		LL_DELETE(head, elt);
- 
- 	free(elt);
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0006-Fixes-116.-Thanks-to-Jakub-Wilk.patch b/srcpkgs/pev/patches/0006-Fixes-116.-Thanks-to-Jakub-Wilk.patch
deleted file mode 100644
index cfc82e4420cb..000000000000
--- a/srcpkgs/pev/patches/0006-Fixes-116.-Thanks-to-Jakub-Wilk.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 97a05b57c3e86a96ff0ca2c4771cf74ff5b05061 Mon Sep 17 00:00:00 2001
-From: Jardel Weyrich <jweyrich@gmail.com>
-Date: Mon, 17 Jul 2017 11:55:15 -0300
-Subject: [PATCH 06/12] Fixes #116. Thanks to Jakub Wilk!
-
-print_basic_hash() declares the output buffer as:
-
-char hash_value[EVP_MAX_MD_SIZE * 2 + 1];
-
-With the current OpenSSL versions, EVP_MAX_MD_SIZE * 2 + 1 is 129.
-However, fuzzy_hash_buf() requires an output buffer of size
-FUZZY_MAX_RESULT, which is 148.
----
- src/pehash.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git src/pehash.c src/pehash.c
-index e49f0c1..f1e6b4c 100644
---- src/pehash.c
-+++ src/pehash.c
-@@ -229,16 +229,24 @@ static void calc_hash(const char *alg_name, const unsigned char *data, size_t si
- 
- static void print_basic_hash(const unsigned char *data, size_t size)
- {
--	char *basic_hashes[] = { "md5", "sha1", "sha256", "ssdeep" };
--	char hash_value[EVP_MAX_MD_SIZE * 2 + 1];
--
- 	if (!data || !size)
- 		return;
- 
-+	const size_t openssl_hash_maxsize = EVP_MAX_MD_SIZE * 2 + 1;
-+	const size_t ssdeep_hash_maxsize = FUZZY_MAX_RESULT;
-+	// Since standard C lacks max(), we do it manually.
-+	const size_t hash_maxsize = openssl_hash_maxsize > ssdeep_hash_maxsize
-+		? openssl_hash_maxsize
-+		: ssdeep_hash_maxsize;
-+	const char *basic_hashes[] = { "md5", "sha1", "sha256", "ssdeep" };
-+	char *hash_value = malloc_s(hash_maxsize);
-+
- 	for (unsigned i=0; i < sizeof(basic_hashes) / sizeof(char *); i++) {
- 		calc_hash(basic_hashes[i], data, size, hash_value);
- 		output(basic_hashes[i], hash_value);
- 	}
-+
-+	free(hash_value);
- }
- 
- typedef struct element {
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0007-Fix-memory-leak-related-to-scope-stack.patch b/srcpkgs/pev/patches/0007-Fix-memory-leak-related-to-scope-stack.patch
deleted file mode 100644
index c861947322df..000000000000
--- a/srcpkgs/pev/patches/0007-Fix-memory-leak-related-to-scope-stack.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1ba6dba2d88f004587ea9f987bd3218b7079ace Mon Sep 17 00:00:00 2001
-From: Jardel Weyrich <jweyrich@gmail.com>
-Date: Tue, 18 Jul 2017 11:45:41 -0300
-Subject: [PATCH 07/12] Fix memory leak related to scope stack.
-
----
- src/output.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/output.c src/output.c
-index ed2e48e..8c23e92 100644
---- src/output.c
-+++ src/output.c
-@@ -144,7 +144,7 @@ void output_term(void) {
- 
- 	// TODO(jweyrich): Should we loop to pop + close + output every scope?
- 	if (g_scope_stack != NULL)
--		free(g_scope_stack);
-+		STACK_DEALLOC(g_scope_stack);
- 
- 	_unregister_all_formats();
- }
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0008-Fix-memory-leak-caused-during-digital-signature-vali.patch b/srcpkgs/pev/patches/0008-Fix-memory-leak-caused-during-digital-signature-vali.patch
deleted file mode 100644
index 8c5c62255b76..000000000000
--- a/srcpkgs/pev/patches/0008-Fix-memory-leak-caused-during-digital-signature-vali.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ddf689e4543171c066d728a8d1b5ebd26c7dfdff Mon Sep 17 00:00:00 2001
-From: Jardel Weyrich <jweyrich@gmail.com>
-Date: Tue, 18 Jul 2017 11:46:15 -0300
-Subject: [PATCH 08/12] Fix memory leak caused during digital signature
- validation.
-
----
- src/pesec.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git src/pesec.c src/pesec.c
-index 470af17..c36c5e0 100644
---- src/pesec.c
-+++ src/pesec.c
-@@ -274,7 +274,9 @@ static int parse_pkcs7_data(const options_t *options, const CRYPT_DATA_BLOB *blo
- 	if (numcerts > 0) {
- 		X509 *subject = sk_X509_value(certs, 0);
- 		X509 *issuer = sk_X509_value(certs, numcerts - 1);
--		int valid_sig = X509_verify(subject, X509_get_pubkey(issuer));
-+		EVP_PKEY *issuer_pubkey = X509_get_pubkey(issuer);
-+		int valid_sig = X509_verify(subject, issuer_pubkey);
-+		EVP_PKEY_free(issuer_pubkey);
- 		output("Signature", valid_sig == 1 ? "valid" : "invalid");
- 	}
- 
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0009-Fix-memory-leak-during-output-scope-unwinding.patch b/srcpkgs/pev/patches/0009-Fix-memory-leak-during-output-scope-unwinding.patch
deleted file mode 100644
index fd8b883e0e82..000000000000
--- a/srcpkgs/pev/patches/0009-Fix-memory-leak-during-output-scope-unwinding.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 72c95ff9a6aadf787d798deb47ec125e6a2ed8cc Mon Sep 17 00:00:00 2001
-From: Jardel Weyrich <jweyrich@gmail.com>
-Date: Tue, 18 Jul 2017 15:23:24 -0300
-Subject: [PATCH 09/12] Fix memory leak during output scope unwinding.
-
----
- include/output.h | 2 +-
- src/output.c     | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git include/output.h include/output.h
-index 48e843e..7877454 100644
---- include/output.h
-+++ include/output.h
-@@ -59,7 +59,7 @@ typedef enum {
- } output_scope_type_e;
- 
- typedef struct {
--	const char *name;
-+	char *name;
- 	output_scope_type_e type;
- 	uint16_t depth;
- 	output_scope_type_e parent_type;
-diff --git src/output.c src/output.c
-index 8c23e92..8ac837f 100644
---- src/output.c
-+++ src/output.c
-@@ -305,7 +305,7 @@ void output_open_scope(const char *scope_name, output_scope_type_e scope_type) {
- void output_close_scope(void) {
- 	assert(g_format != NULL);
- 
--	output_scope_t * const scope = NULL;
-+	output_scope_t *scope = NULL;
- 	int ret = STACK_POP(g_scope_stack, (void *)&scope);
- 	if (ret < 0) {
- 		fprintf(stderr, "output: cannot close a scope that has not been opened.\n");
-@@ -320,6 +320,7 @@ void output_close_scope(void) {
- 	if (g_format != NULL)
- 		g_format->output_fn(g_format, type, scope, key, value);
- 
-+	free(scope->name);
- 	free(scope);
- }
- 
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0010-fix-readdir-bug.patch b/srcpkgs/pev/patches/0010-fix-readdir-bug.patch
deleted file mode 100644
index 1b98f8c5deec..000000000000
--- a/srcpkgs/pev/patches/0010-fix-readdir-bug.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9173ec91ab3c82833ad2ac691e7421607c5edbc3 Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Fri, 11 Aug 2017 18:13:07 +0800
-Subject: [PATCH 10/12] fix readdir bug
-
----
- src/plugins.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git src/plugins.c src/plugins.c
-index 7488043..3885e01 100644
---- src/plugins.c
-+++ src/plugins.c
-@@ -159,10 +159,16 @@ int plugins_load_all_from_directory(const char *path) {
- 	// MORE: http://womble.decadent.org.uk/readdir_r-advisory.html
- 	// NOTE: readdir is not thread-safe.
- 	while ((dir_entry = readdir(dir)) != NULL) {
-+
- 		switch (dir_entry->d_type) {
- 			default: // Unhandled
- 				break;
-+
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+			case DT_UNKNOWN:
-+#else
- 			case DT_REG: // Regular file
-+#endif
- 			{
- 				const char *filename = dir_entry->d_name;
- 
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0011-We-don-t-want-to-ignore-DT_REG-if-for-instance-Linux.patch b/srcpkgs/pev/patches/0011-We-don-t-want-to-ignore-DT_REG-if-for-instance-Linux.patch
deleted file mode 100644
index a4b0d7ea57a8..000000000000
--- a/srcpkgs/pev/patches/0011-We-don-t-want-to-ignore-DT_REG-if-for-instance-Linux.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c4974983f1a6b6590a91a961b8e1a38d6622ef38 Mon Sep 17 00:00:00 2001
-From: Jardel Weyrich <jweyrich@users.noreply.github.com>
-Date: Thu, 14 Dec 2017 11:24:51 -0200
-Subject: [PATCH 11/12] We don't want to ignore DT_REG if, for instance, Linux
- reports it.
-
-See https://github.com/merces/pev/pull/121#issuecomment-323853185
----
- src/plugins.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git src/plugins.c src/plugins.c
-index 3885e01..646b4af 100644
---- src/plugins.c
-+++ src/plugins.c
-@@ -166,9 +166,8 @@ int plugins_load_all_from_directory(const char *path) {
- 
- #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- 			case DT_UNKNOWN:
--#else
--			case DT_REG: // Regular file
- #endif
-+			case DT_REG: // Regular file
- 			{
- 				const char *filename = dir_entry->d_name;
- 
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/patches/0012-peres-Fix-unitialized-memory-issues.-Fixes-122.patch b/srcpkgs/pev/patches/0012-peres-Fix-unitialized-memory-issues.-Fixes-122.patch
deleted file mode 100644
index 1fb9c3b86dee..000000000000
--- a/srcpkgs/pev/patches/0012-peres-Fix-unitialized-memory-issues.-Fixes-122.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From be991e88c2605fb6013cd24d876acbacf37f6c33 Mon Sep 17 00:00:00 2001
-From: Jardel Weyrich <jweyrich@gmail.com>
-Date: Tue, 30 Jul 2019 16:01:57 -0300
-Subject: [PATCH 12/12] peres: Fix unitialized memory issues. Fixes #122.
-
----
- src/peres.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git src/peres.c src/peres.c
-index 47fdaf4..249521c 100644
---- src/peres.c
-+++ src/peres.c
-@@ -315,6 +315,7 @@ static NODE_PERES * createNode(NODE_PERES *currentNode, NODE_TYPE_PERES typeOfNe
- {
- 	assert(currentNode != NULL);
- 	NODE_PERES *newNode = malloc_s(sizeof(NODE_PERES));
-+	memset(newNode, 0, sizeof(*newNode));
- 	newNode->lastNode = currentNode;
- 	newNode->nextNode = NULL;
- 	newNode->nodeType = typeOfNextNode;
-@@ -634,6 +635,7 @@ static NODE_PERES * discoveryNodesPeres(pe_ctx_t *ctx)
- 	}
- 
- 	NODE_PERES *node = malloc_s(sizeof(NODE_PERES));
-+	memset(node, 0, sizeof(*node));
- 	node->lastNode = NULL; // root
- 	node->nodeType = RDT_RESOURCE_DIRECTORY;
- 	node->nodeLevel = RDT_LEVEL1;
--- 
-2.26.2.672.g232c24e857
-
diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 541387349453..14c40aa13edc 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,8 +1,7 @@
 # Template file for 'pev'
 pkgname=pev
-version=0.80
-revision=9
-wrksrc=${pkgname}
+version=0.81
+revision=1
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
@@ -14,10 +13,8 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 # executable is GPL-2.0-or-later, libpe is LGPL-3.0-or-later
 license="GPL-2.0-or-later, MIT, LGPL-3.0-or-later, BSD-2-Clause"
 homepage="http://pev.sourceforge.net/"
-#distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-# Temporarily use a Debian mirror
-distfiles="http://http.debian.net/debian/pool/main/p/pev/pev_${version}.orig.tar.gz"
-checksum=f68c8596f16d221d9a742812f6f728bcc739be90957bc1b00fbaa5943ffc5cfa
+distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
+checksum=4192691c57eec760e752d3d9eca2a1322bfe8003cfc210e5a6b52fca94d5172b
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-legacy-compat"
@@ -30,8 +27,6 @@ post_patch() {
 	# include/stack.h and src/dylib.c is MIT by same author.
 	sed -ne '/The MIT License/,/THE SOFTWARE[.]$/s/[[:space:]]*//p; /[*]\//q' \
 		include/stack.h >stack-dylib.LICENSE
-	vsed -i -e 's,/usr/local/lib/pev/plugins,/usr/lib/pev/plugins,' \
-		src/config.c
 }
 
 _real_check() {

From 4520c14f807c8c86c606d8e2634bc1a42356ac79 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 17 Feb 2021 11:52:18 +0100
Subject: [PATCH 1738/3458] linux5.10: update to 5.10.17.

---
 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 84871cfb37d6..a2bdd1c36dc2 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.16
+version=5.10.17
 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=536fe3ea273bfcc72b3571d3b3a7ff0a5bcdc16068efd22e42c4f9d03c200a37
+checksum=e84e623ce8bb2446ec026b62eafa3b18480aa6fb6ae9c86cd8f18651324d4814
 python_version=3
 patch_args="-Np1"
 

From 9dd0614b63cb8ef8bd51f205ac207861ec6379f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 17 Feb 2021 23:11:23 +0100
Subject: [PATCH 1739/3458] synergy: update to 1.13.0.

---
 srcpkgs/synergy/files/synergy.desktop |   9 ----
 srcpkgs/synergy/files/synergy.png     | Bin 25433 -> 0 bytes
 srcpkgs/synergy/patches/cmake.patch   |  22 ++++++++++
 srcpkgs/synergy/template              |  60 ++++++++------------------
 4 files changed, 40 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/synergy/files/synergy.desktop
 delete mode 100644 srcpkgs/synergy/files/synergy.png
 create mode 100644 srcpkgs/synergy/patches/cmake.patch

diff --git a/srcpkgs/synergy/files/synergy.desktop b/srcpkgs/synergy/files/synergy.desktop
deleted file mode 100644
index e7bf87b9ee03..000000000000
--- a/srcpkgs/synergy/files/synergy.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Synergy
-Comment=The Synergy GUI is based on QSynergy by Volker Lanz.
-Exec=synergy
-Icon=synergy
-Terminal=false
-Type=Application
-Categories=Utility;DesktopUtility;Qt
diff --git a/srcpkgs/synergy/files/synergy.png b/srcpkgs/synergy/files/synergy.png
deleted file mode 100644
index 5534f0fdf520d71ebf512a6d9545e105dfef384e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25433
zcmdpd^-~<*6Yb*e?(R<b;2s=;yKAuE?jGDV!QCAK!4}ux8gzl+vPiJNvTwhy>irXM
zs<vkKx0!qUo<4p0biAgzA{IJ1IsgE`QdW}F1_0n-k8l7~WZ2Erv*t7GhUg`$tcwb}
zf>CYbVE@tFm5jUq08Ag)PaO_#I_MJsKnqZolhO4rxa>DdvO5U@J-z0%Z+AYPpEvDx
ztG0=!iR&|ylPMgGDyPNr2JljTKtLQ)l1_`IOGEhtLS1yHb-2UF6h^(HN0GTJf#XLN
z|IUeXI4Fa>CTufR!MH4tPoIBT+0*k_*IRgHa(7c0RA2Wyi#2{n-lx#w5Tw5oRNpfY
zH1`q)h2UWQe|_1<3SUT->>t{Uy!zs7B8wWyU`%M|c&r-htBqOfEwN*8=O_FpzJICe
zUR0E{N1<QU^SLo(JP2nPR8Y>#G)`Kkl+K8z%<*piomon$%vP1<wj!GmJmC=>WYz%;
zTDx$2{_Ti3NHDA*@~kcBVNgFEEH;lRe?8frP}ZUw!^p$=jMxV+pzV;AfX6PYqP!WF
zSXVdM#!2~-Hf1}^N})rDv}+QLd#aSdh*qc`8w#A?-llBSPZTK(4r<y7Ww`Pgpc%W}
z%H2%tn)~;`@%c;u9+aCF@ia3MY4>42rkoEbIsKeJf(F#fNwX8t)0=fQq!X7FE%<P%
zggb`LMx`B)r7f2(>-=ex%(AhPmH$rMz94zBEy+W&td3pb5Kdl;caAyBE*>EZU8+9I
zx@oy8|3_YavAvJuw@~1dD{$w1?;qqEXsVtA+#<1lYLM#sinD|oZow~ze3YA_@Mcop
z8e+$fPl+{=#2+iq5MAST9>*B3q@$c6P57}HMI|alS|t*RR=U<*caAO^KshIpRNu0u
z{SzN7aj3k2n(`F^ISOv%HgC~k)Locy-pka;@(#Y1@V;NN-#m8gosuNSz_7sNdH4M7
zfTro!!$ALr19CAdIou7JJqU6)6gQtb5$ut5Km0CpyR>MfZln+TPh}indabUsoTXkZ
zUthVP6%sXb!%BpTwiJX*>`trZ|4AhpttuRs8Z0r6LKFUg3}B!fCsoneFDMuITE<HH
zY5Y&XT<TNT#@^nEySuJ4HbFG*ui1xF-`)lb!^872AMPg3kovtdU@N{4uzkZ-Xc&|P
zivX6q<o-L=t*BctC02c|-_zGDeH}7)LHZPez#XI>Dw&MI7{oHv1L4b?xv0+QMr!w6
z5Fe^N-V$B3B71DsK7N`YDn6KN%~*w^AZ%REAAD;JDnKCXz$8M7*uOD!{>@Kzc$=qO
z)CvU7H}-b@-rK9@^qOvyV=yc-v9t?KS&d;TG6r_|*||W#P2R`AW$+WlJt)Zm_F{4W
zi<XRfSg3difZQ%G@0Q*N7-skzIx8GinmNuosCIsoZ{1bYesun{pXpv6nCgWMzM!Cp
z$Ax#}+zmpcjh0r4*M?`KgYWqM%Qw`SE1N4yqeKu+#Vtw!L<vxjH?~2A&i7p&_Q%S7
z;P$+}a`WINZ}}i<85ESi1EESNE2&fIaZF6)m}#)+o*Yvp>F)06d2%y-S-B$%xjgx<
z00@>P^#}HO84h#<h2EnI`y=~D5*A7OzyuR~_xD_zE~ihlpJ=sdLt>r|OENO&LJhiy
zqBI7#XmROlBXwFrCHhVbVel(_QscB0c8<VmN;VuZhq$keLB{Y_3vISBF?6O|6lSZ*
z`q+j4mD$G2D>JG*<VRQ6&#<se_L=lKeAU_W7`vusi+!QBB8Wb4FYNGOEOF0OAaX*H
z0Wg;rv}-|u?SH!_*i215JQPtrJt1t6;WT6l962zRtw%ynLo^9Zm{=79qCfTlu2MA`
z?m;1tsPN_xc;iT7T0%K|dX+l%>I`BAOon`&jU*LB8BqU3F0vcdCdxj25+cjZZsu7D
z9q9Zt5`7Vl78TQ8gcN&2a>K?eC{b+dNrVzh(?brpSG@yv-ycSj^t*Cw;%W>zaSFQy
zH~aNAON{GyaKqw{tc~xccypKH{X|T0YDTDwo;ee3JnOF*8*B;xxh$}6*JvZdg(E}{
z1yO{?qq6_ZYP{)xa^OiDj?M2F*r$3Z7bXUvO9yticXSk@g(oD){8!pS#xz7&Q-{uu
zF-L$G16^jX3R9qt0V0qHM4uh5FrNMG(cMkoN@(ERAfs&i**>;28$?M>eL(bUcJ_Ar
z4r%Qq$KUD-A9(k7HSA<_vr{Ti-2N~a1|A<Q8J>zaw+^L#Z|^%l`A%TQk_BktP4M-*
zsx+^cE=S0%?u%lq#fW`+b}x^i5UaV7MeXB;OIu!#QB*<eJO>BkqH0Gd&}TE@W7AQ^
z6L{;&>gi=oYl_a)kf-M-EaihR1&-ME;MdmGhi_bB(B1+2>7Bpn3Y($CGIqlkvKVoM
zvdUk7N55{FTwY$b{QNnzxQM5MrcaXF9UM?t&11H|dGudXb7L6fPWCD6G;v(uxqHzb
zf>IzPi2Sbe<f`#L)0<!3yuDXXnvG0He|&s=_OSW4$10Xvl{Fb<e?d4}oEV_35{(lt
zJRmq$Unh$y!&p7{vm~(BIK;qsy|)!-GyJc=c-tdNbpEUVL=n|)OpUbBS~E&E4MiWc
z$(O&UmMt=BdJb`LMfsHO4+$Z1HKJ(BLi%SHm*lZA`Qww<?Y@A_{(h>*r>Cj=q>)##
zFFPj3r{_A&c^W`mEaWHy3h3a3YB`)Z^J72IH!K$Vca6Atd)NDtTCJuop@L}n%GdBJ
zpaYw|myf#Po5)3h*J;h;@jRu!jHbT_<w>*9+qXI}rLLqnas)0X@|gr*ic%mxUD}e2
zIJ!qDrHzTFp&IG;$auDISxA%r#+ygNmEyBJbI|e#nU(?yKA;}DuOZ7=azy($uzemt
z1e^yWXyDrV&+P6}clmX72Y|6(f5)j;k4!JYlaS=RtX^o`|Gt>NyBvFf-WXRy3qMGF
z)4)wezRBwj^1C@oeqCMP1r~eos@%|5E}t!2k9Qbbb#bf4`p{vLD9aGaf1u+%`ZFt4
z`Pi?OzdMvDg>~|B(_1Z6>`olRG@kAtqZ+efnV!Tqo+dU@@@s<%M|g4qGcif4D4pn~
zRvb|KpRscptE}^^N(Me!{91;b6Mf^NN{k%iSxo|^jjU%nF1*G9X8}%Cf_^0Iodes{
zD+gWNGVI92#Kd$*&@d-9%K1L?K39WxfY2o!XJ_a$rurcP3^u6gD0aIP#exICX(Z4C
zu2AO-RBQzzEyBg?kDKsBK@GUJN4jPyHxB$Lm0GAo{0~kfgKGBo57=&KLhrW0eTOC-
zyyl?(;aX7|X=XaT4KZyvE~XpSEP~SwhBwkgOZt5!_8*m&ib_9XK!AD8ZdzTH#7B5K
zu4y=x61=|+3^@tHDUOP0SHfjfEFGQ9#0dfknp&7^pyb9+*pc&tq;f>VNp;z6foJSL
zcC4H^Y)M>Gyr!K}%YU``2-qHiKwHrBM={{*8ArW^>l-|fG#TI@P1uV941pE}KFn3w
zI15>62KKEmqA@D_YZxJ)n4Q0U@hiA)8Tv|MNYVE^7vW=>RN9tOS65>?xjo_scQZX#
z;G#t+!<g=as)@S5sts2gsr!*#W&-}(SK&}5dS;bHPb3#OuCuAW%0X&pdgjaBA8n*=
z>2o@EBHv3ISy9L}I1<j7(5_hNlIf2{%|sm|Yd#^dF;OS-U=5>WPN3KHRc~FD`E-l>
z`T2>6i;t#w<*D(O!yP$1m(3K}u<X4w>n~+@QJ(~aWWaJF188^DqBqDe<bEF9o$KnN
zkNLPo_>KM((!FE%OEyB^kZ2+wa{6EU)<CVTE5LY6v!aoE+b1{w3vpSciWMcc_$7CQ
z05om%K3_vSI?v}#bA#|fh8RVTcx`D+v;{wO8wu7~IngCn8UI)kVva$lcsA97dfah3
z_K&uuM<0`=7uBcwC&&_;F$d}f2`7V-JQtQC4Ox2}hfS+hf$No2NNlXp(oPXA)E}mB
z6*A=TY8^(l<&6cc+P7^_vBvxdE$7=5r{Inf#Wwr=8TLY6V!U5y3WsXnE35GUso_zD
zSI{rc&B2aATOTN$5@ge=3f&Lu)5<M=qszhh7&Y-#U;S%~EMuKaV9$D5+ZX4#F#Dn2
zv1p8PQrwgn*n#;1*<6n-@x@osr0&3Vpwr}k<I+a{SuU#&Fcz^!i`P)9tgaMiOIwwf
zS&PTb{abRQMDo6;BrjuwhaWwP0k?$gG9EY`oaCcvM}Yi_;=pt^%C_U0>$*v=jMTb<
zT6(jqLnvR^)NuOrN@_1Gylo{;O=lV-z_h8$dbRj1z{e)&Rb$P-Ab+&9I2}d~lD>R-
zete8}8wiNa-TNKWuO)Mg$)7!1h?zP}i#NVssIY*9r9T`^OPbWE7YuG$v%(Xu*3zbr
zY4CH6i9?cQi*Bla>-gvxtKErK>SS+Hh+9!99S|4IFtn_l#x8@;rmfL(f#<*^J6?K+
zYU43%nN>(deA6mdCKL5Y?)G1HLEuAbKXgC<)fsoqs=Q@nrf!&+scLdDK*rdv!&|L@
z^>`V(zxz`HV=H?WyQ*>>J~2ryYoW~nWo(lrKe?AJM@k3C(okE%8Tz)fGs`2@9()@n
zemDclO@Muy8tmJA1x26l#zUZY$3G6;3p4{F5~8ZNUn8e={ZYsxGRWylSW9_RJgD57
z)$sZbwM#k`ScYaKeUP2FhUd)IAL>OfNya>O{(LOSl2*flo<#v-q|qXXODdWZBN&%Z
zum*!@1mJn3a6>dzR%`p|IBN;zRPgc2u=UmM0gSY_D$&i!(n_(&!FK7=jEwrK!H#)q
z%t<qFqWEgwvO-RaiTM9|K7Fr3r4k^>W`||EmL*UB4pqKyv|py?=CGYimx>5^r=g%(
zF>qt(@w5&U#8>ps!U;yt`C3}9!mcJ1-|mxlVk*U+K44@2SDC2kF*##^-4}z;DvqjK
zsEA_(Cr?*v>y8{qMyD6Kf=?E)fZr^x)sQ}2p8ZkLC!qzo(yox1GcFonv<~0hav0>c
z827t8qv%I8p~lR|10ofD-A&7Ed3MF5N+zlhCPOXwYDAYt(tmN<x>@R4=ut%Qv7^Qj
zZB6R*8P7@#4aoZ~J@6MdJ)_eJD!2l<!m^Cm7Nf#uR-eXO8ic1YI?_7IqeFW?*00j*
z;l(H6sw_GC@ybuhnDeo-Z_~20Cqx9rN~rki-OjFe?e@0x1VWzHWAX~FvTvtg#|}sv
z6=4wyHGiks*_+DoeH4$9k=J`j(~8E-Ct2$;nj3i1%t6xIZ`F(RfIk_W;J$3@acw6;
z%fkNApSJ%ww@!bNs5+&^ITp24>b5Ih^IxnqVk}+fBdxf0U<C+4Eads;;hZcVUu`(P
zqFjyOoggE53{w2z#=ui`sN#YwA$){fd3p)s0Kc#eKsAFAm1y59k$0%{GzrTGFF;0H
z5zqLFv4dNcftZ*Wcd5OrYr>!Mj-(^~OTEi(c1BU0xohGx^MWvP7<w|`8ENBYAmnN1
z64>3&_r7V7luP!h#5O6Vw4QQFnH9iTd1@Vjsi9AtH4eul%Z!RtSVKha?GUq48e%{g
zp?<D!?xRRkiPeh8gr&X8-kZhBazRh4$Y|@&=>5Ei+L6P$zW}ejAD>;$M2k;kEL=fi
z$fL<!L8e-L=079;oe3;V`<d}Sg0rbC`!aS<9@f5ce4?5j!NF)m#^}KrT3klzLkaCy
z(M+xVbW#&*R0(u^qS&Viyg6fj9d}#I>8y@l(dtBt>3H`$)UbNmJcwGy|1nk(^BzB+
zIBS)z+$?GtAMeayZ+DwiD$Jw*7VQlY7Oh_Vq|ZmaLha4lKZBmKlatY6Ill%6pQN$t
z&KRkhh0%P0Ob3j+sySjQeIguN!3xk+DPf37sH%gshTu#%4j5l(PS?x1uT0fuYT)5@
ze64XsBIZkmtOIqFI>P0o871(Fl!OV1mCeK}kX&l{Jfff2rn}PhVwzNp1)tgZPsnma
zY!37C*!?f@O7m(k3!@7<eIz2J4HXGHZ?cE7B;|0eWg5KW+_SzKMh7C82yuT?07O3s
zUyvp%_>);BX59L#6;#2hxh?%aicC>Mw2b&zEZ(Z81dH{fG+(~B^mT?>^*b89)4{ZZ
z6U(rJ=KjtRA-69b=KpRXCwZhb<3!p{S?H}-@zLn4SbvCgJCix(5|u<cBIN?{_2?=_
zCiu7eT4@s)+4(x#c}Abg8KWWe;P^sXpNty#BMC=FC0zwZO2hbZJeCY!*x8LhEA%(b
zPPenc{%X?}9675>Df2OnzvH^?hpdW`A|0pfP%wuT-O?nZY^QMvk-9WDJHJI*z|56g
zd#(~T%h&kWk!fv1jRun>1+q<lM06&C0$*MJ>S1j;T2Z{;j4^7~91*-JqY8A&li8@0
zOgW{Un7^XCSx-qn0(UBjI*l$-Q^q5mXh|#3z!`kH`IO4Dyz$UKYyJx>IKil}=oZ-!
z*$ndV;|V=GRpO`in`~QdHlauv_GiD~RUiDdTXcM{;q@<s3b@{G7Dhh3Y>a3Tu8kV-
z#e#z={=ZRddO9Tm)@H{sbTYPJJ#9jpwtc)cB1?4SD2BURyr3Yl%P+32?Y*;q9F(-O
zQ7<&>YL>k|Uhb~GAZwK^Hb!SBI{)J0Y4g6NzY4|SK~nH9W2JX_64A8uiB_V=$63;)
z#GKGY&R~>Lj=d)uUhVBw`}iI;I}F0BgaOGQUGzsZl5>iJx~=a_mXSHQ$AtdT4~(L+
zwP}&2dUW>m^Hj01vD-wE@<i=<j8JbI`;+Ahj!)yDDA>N+{~7-Q6$9_poA>+dwFIz|
z<!a`kQz;Jd9S<4RIK{4YkSeakNGQb`loH@rDWI^Xs+%qVI^=3CfgIAkad~M}q{<o%
zbVNBDxuqqFvh+wha%Fs|h~;-_V&HAiEYQEO*UwGoh~OXx9jK#BPZwWd>)4vS7Lui%
zWoN#AuhIYF!(N6Ce*xMhHlcW$gkJhE>qU@6W@i%>z5c~81wL|Ge7BJOm-kv})jlnf
z_Wi12Hifm@O|@-BOIeZa<2R2#NV3kxO)(=NIc)R}45s;AJ*!38m}wcjOSaM|oz}Y)
zE5WK7q;Oqw1AW3dD~?#QRNOUOwojWX4t|@^D@)#IPaXAOnAY%y`Gqnm^lI&RE>TR3
zC^j~7ig7H@LBI4wV#BdKsfP{uK)8yU+>>>M(_HG|TC5{S$)^EMjpMyau?82Dt$(H0
zyP2p5Sswp-@8^WY`;Cw5ZeP3)(k{i<*xoEVWsXnE#^2QomM(n0U3e=mcg)dahFMU?
zHrH;2nNVn_+_P7+qB9$fcmE>O@Lb}z&p4r^qPmTuc?+j->sPHKI6lrX40>nNFADpr
z&M}mNk|#dWD~U1|-PZBPs6UE?X!q-B#2WbpQ8(`F;MT%KNeZJ9c!)o!Im5DGO#kcl
zhA{$aZrc;J4QHjF?XH)*`(S_2Q}^mwzc5S2dN?qwie!-`3C23)1exDeg@m4Cr3Pq1
z_IJ%kcMaVQN!i^N*sB`0-1C?CT{0OeW$Sya6hd@VkyJ3Ef8eUdA<823pznrNDreC$
z_Z0wI!*>gYDKz9{s*(D2!zDlvnmy2t&^x*dmyqkWrOhF><9AO-ml*rCS58h-D=VuA
zf%v$?JpFni>kALm`cE;^@?4YW<J4{3Vw`tqMmhThHsaJDC_jC^2Vi4kZ|q3fij#lX
z7?7u)s2On?y}~lSzYo6NB+9#J=cD$lPNVdnFVdxSm>ms3ujSjcYLE}YFl^{}*pAfP
zyTtP+Dky5I;T_-ao4_N_L_br`s;D{lk0d13vFaaDb<f26vR9qJ$ed#SGSqKUIB(YT
z=r@1L|8H~=H9U24cW58j)nyNC=`!Fa_hFksbRLO0Wy)i(xY?|eUGr_K=>pe&Em>K~
z#4)ZnqO`b3+pqTNUeKdj$Dtdzp|+u2j5Ozv+27dQ1nm~m+#3j)pG-*oQx!FC@9X<T
z0(_Q-<=<03lfNgMFiFv&)0nYUfdi7vsLZTYv7376V4%`p-MO*cBPKZRUFAF*(X@8B
z?=BpF*jaBU^3yuW#X!%ek@G6pD5tQD9VkkP{aZ}fnwOOK_s;%1<n{9E>h@6#T)ycd
zc`pR@X$pQcfGv6AeF(kI0W(3}6lw91rU>iEHeBO>1A@7q6AjRt#fJm>a@#+%g6w~y
zhi*3YVSWd6{$LD#{sj|{Ugs8bBE=f1XLha)gpi}4j{SRXZ*T%s5uxl+LzV&Ummx=2
zy^r}|H<8^vLQ3`FaBLfZ?Bb`-=ZWhEtT-x~TU9<iE`+i{{OE^2y(vWjOszPMovkd|
z3mIvkczJmfS(Y5{tn%eW)La+=>lXvx{Ck3Cz52Oj{9yDd<R&53H#9Rl8jc~_yb`?f
zRRKypy*8Tv3kera*<I@qdl&u!f&{&;vlp9jx80pv3cPJQ2>cUL)Ov{#^Se%?!X&-A
zY!7*&jw(lMRL`GTFW!#{yIP-IjxJYfHzVGjQrMnhzRV(%cdda5Ah!*j!Zsd99Yurt
zcYWMhtm$iqwKvSacuLwPML#H?E(9n|YuZ*u+Ye;7EnM7PZju*={4*N3IkSN5epu&$
z&M_^jF*^x_7Z0}_#6&^L-KZ&blP12mC9$c-w=VB)Q`=Ck@h6%&k2VCHWSzN6N~kL$
z4hBu=QmeAXd&_a?dz&mI!Zgy|w?rW5xYvzOxLZR|v}Ehb^XMFjo0F@3z%$*v`Dr3C
z(F^L<wfds-dnw3qvlqfzV4j#u>;~5r4u*&N2iY91Umu|Wx4;kF8raA@SKGUmcCHau
zjUm@xwvQgKwzfsL?QYMi4FmTBdhWe`v3xJpw~e8Xr;1v<$-38~myKmWkrfUmj7Sr9
zyIotMTQ$aLDN=G&OPlO`)O+Rc8<YFK?>^bIww<iA_L^v6c;#(gF-7<VaZtl12p2Lp
z{=?o&%Ibpms0Q(3XoaL&VJ%r?1naU8{>&-1Sdopa?ynO|u|9Pptv+}3OND%pMgl!w
zj=2fn-rc0<q%n_tcT&F?OdGoA+6}ni`MtGeRl2_aZDz*Qym$1WKG(?DG|<P&;})8<
zbtT4Ok9%%xW)X(v@4`#U37(^RYfi*a1rCI@Jaz6~a~Eb)KV9$GxVh!N?n%-1hU8uV
z{~5h+>KFv{>>P%gyQe15R40s}dpGdO@{w!QRLK9JH`Rhe-=|U!&%y5-{k>qVh92R8
z9Y3hYT_J~|sU1Z~c|_Di(E8t$7D~`x@PJ11dVtTNC9Fgxne#*QU;u=|3xW5-ZjW~$
zxhM$oS{1t4<D?N@PHQbTPF?6m;8S;NcpRTT;N0H&uP-5NA9n`U=rNBMB6IXd`LgWh
zbVyFVQBu3#Pq^L8Q8ar&-(8H;|D079AD`9d{%rX%eD}80rJr;1UVOcM05mlff35B9
z{Bc`2WO=jmbL=O$xuM~0IZ>6vbRhWK>r>aykPB*xtu0E(O{_SRM7@U8*zhns%E-rm
z^h0GAw}&FyDhI;jCcI73s_|*~rLq(sOf@SR@%gR-jbD+g{zH>dMNKuzN%x<yEP)}I
zb-C1hrSFp;WPIGjIs~#!jP)Np=;MYkDP(i@)BDBj$Bn{{4H{(ykvw+BnK;M&#C3lb
zSr05L5OSOPVm5Xul59YQwol%COjFo!ntvQ#2VO_Ny}Gis{b?uX?`!0)y>~b_$jv+{
zwQK7@+hFGdhv`qxn954MK*;-gQ2!CsCIph%74`56*}(!s9Xci6yqCaX16>_|uR^Qm
zm)_u2yTENfe@+#GLsF-X&6>o0lII&6@lz+hbP_ze%$Xx8qN8)L_REaoHvq11xsf@C
zMJou}^{v&r7tXgM{=%QhGU@Bh^TBF$QX{z>0;<c!ot}v|Q*eD_^%g~ejZO(3fM(c%
z|0Q{UA=F9$-<Isp&#F4xNto#V4W;+t>x9j#`I<)%8>E3_enqnIU9INUK*=iJ<`c_e
z-a*{@`{jK1)2_wAr>TdF^`Gx6L`{trR(3u|7mfNS8Zu#iAt4V0y<V%8-EJ_!cBfP~
zte<8K*xJ+f@9)9E-3%nOn5I80^JzCIbvw&cGxBF530pm}f<M1Su9AJJoH1L>Uv6EJ
zwPF_YgY$Wf$-^DVg0D7Mpl;d4`C|%OBf%M*?v27%69M>=eMYd$>t2xGOn;Au?QcrG
zOKfd^hFVhzv)nX3p_$8(vVK|g_`y}1pOo5Y(fp`b>=~?FvZog0_-BreimLK|D{a_j
zPvh`Ea0lF@KxxFl!1xA*;PaPy(?0+7nTv}(BV*&|J(I#1a8XPl^j<q3sdv!1w@Wb8
zq~3v)X=+`!dMtGhIA!S<`!o<XY99tk<n-<}jnftl9EQlYH11DEXE~h=O<CH!IQr`;
zyQ9}5>Ki7Z=!tY>521l1mI64bDVz%)46WiC>^Sn%F25|B6+nmcpWL8A#YVk>+yv3E
z;te+?g}GQvls!+4(eA94J;v+y<DS^gm`313buZLgG2_mA7UC_?wT3Gnsl+B)h>h~p
z^}L7^Hdy$yXKmLytHWb@QtM38-8b<5Fm}`leaW;ufzoqYm_W;6r!263>vh1j>s@`@
z5wh0XwQFbN7Q1d9lsr@Xj}XIvyA7Z1t8|9U0n#`jXy-OLj9y-QtuVEq*vYcGv#r(w
zxvHIn{mzt+Jb9xtWi~XmF<Z6SUHt<h1)Sy~<o&<4%Wqv~9skb@a2JH4Is<l@YQDzO
z@tw$ExR{D589nHe^_R^cmwE868%9(7!%%@+`jCSv@lbIWrxfX1`i%uUS`kCJtb~hU
z6Mqw5LCnqlb)4c$-zzdn?n%JoxBB4YpZ36=;tNQ9b#d5Zyp~pV%J5b4m6&SdZkW54
z-@yAoAS~1%27k5(1Lk8eX7XH%r;U>Cl@M$UqCeB~dn<XG?^jMJ$JC3Fh@A{Y51_R^
z`B!Vgix*9cWo3|Z2n!$;YBRL<`L)cB1^M}(6#9jNf7=&J_>Cx#!?{N`{AyBHICRrs
zPT*WtW9Bo`w^9?&A42IoDc-zpC=Sv@$kTuO1jJEhD{DeXlS`*fp-cJ54b5)`jvZfZ
znf7?cpA`Qb@4PSo_IC?FCk%>zzRL-A7@ApxxCGfyIM%)R_Ch=>|EE6PK5n^rRc0<(
z7+0j)%^RyB)nPuM4Y-DRYg6DB>^{)Qq2j?<`@W~pcyygCm<$v7i;D|ipF6}2kPHxR
zMs4-K7=L^on{BleOa0A8q=?Pm?6kE<7wizr6(ft@qHSsF0AVuC>)^<OKWkm0?fj^?
zFA`6ioiQqHF--rpQ$OZdP$=~8$#%f24>1Wz!2XM>>Cd*utA~edsH?>2da<GYx`D;k
z@893LecL*Z6Wlg^r+eMrm|mVjM;|N#B4S+g#~6<liumHOzQ+xtdFDo?)v%7UxyPU)
z%ruUnCN8IF2iO+!GQyfuOp;v=j4JYkl^|)>tkt&`R{zg#7e^En;Jsig$UlN|mk`4L
zE&P{)Mh#}(Z=?zIRdoV$FTA?<_DbK2e%G+1X>02hnR9Hs?=&f(jwE-v-s}c}TYGw@
zvpEd910T-2^bHK4Q<<Un8b(G&0nWUn!SyTreB;48DdTi%{wLVEQcvrK4$ezuv}0Du
zg?fmhHYH8Wge-6HEK;v$Z2mXfF$qJsk_9jkQGwydj~^Q*W`Q0yE%)>5uRwA2HH$0-
zz)GJV^ybNR$1g0%&6X^QD>J^lL45oS*QO}&J;dy<RBw;04vy{VBn7&W6CLQk;Q)bX
zWa{bV6r_G)C8^`x#;)J~U}D3G)p~<~>z^m){r<NHQhnZMOFW(JVEf8PjJJN8{@W^J
zl`V_*?ES|_W=PPJVRvA>z1Y3d#m|wnkFrMIbc|mQ-OoGFYHzMf;Rj>d8a1s9t0{Bs
zrfm7Ggeg5$!7V+V5EC!eL@3|Q)7+mZVFYqG%@5?M7Ni<)+C@PL^uwev^_j}Uv%zn>
zygQHG`p`f3?c1Rq+vR@ewXU7Awk4~P<^2q<+uafPkr(UDUJvK1QsyQmuNHG#vtbz*
z20TD=RU;z#+v!QdJ{ZVzcG7QR%=}WFcXcJrnIQP8aaY2OTXd+a56W^39n>Y5ycb_V
zzr1b>^S=S(z^M3pp8$5c6ogAd62`<|Xq};rQGFxbUow9SR$f^4kBj-2G@%GDHW0)T
zVl(>h;||AO_d8^*%L!H;3Dh>8)+YS)j-CX!cR>);d{Z$nVC8pU;lsm2n78@LJ5Ko?
z82q@jhQniK4js3bdZ3K&O4<v}ecz{>N1gSlH5$tNhhO^zwKXvQrj&s{npsu{<!UOQ
zT3rm)We4e}XVI|X<Ch`GVt5b=ibb~xHt<e(JtRi}9+0PoEh$B&Q8d+-RL1(*>$1A;
zph02{LA?7_>ar6TuH@R7VDZZL_xARm-Tt6o^YiULevBV+7+4JWUKuZU;2Vbh+w|+%
zxqfOk@1KUH)Q>`CQ;1**n8c@EP0$0+MpT6%<(?^(gwieuLHjUBO7NNYGug;~8Uzxe
zpr}|JlI8ry=y8oSI6kfr6!r(`pVzrDZ$O%3*4C!z_}?6RRrv?|x(Z=QMq(z)gaw2>
zI*(y(Hw8KUG<Ysc?jM}vWWLYDQH|>kQwU8KMJJm_od(5V^Vg^k#_uc{jLPp0j#lq8
z#RKn{^Jd*j7ofPcUFuxMhA#Sl#u-jB4NiLIG3wHEI3ItZw^1|Nx+eU4i^lt0<*8d~
z2V~#i6M6co_=Sq9zk_e%b;-v3@tgZKl63v5F<at6c3s`)D6ZkAu(zUEd4QyfE=X>e
z+>!jd!R|mvKIcq#@C&~|lj+N2OlKlgu0e>QLA`BYK=SM<7YfeKUUd_P{9VS3{n*CI
zkU$SBqdX|*jlT_zv_aMFktDsH7UPRO=F(3@0*XG6VhRfjTMAG^jt>nljJ#m$G)EhB
zYq??#G`2LYNUA3eAhY^73G`*80s_?$3+UYA9BCxj(zF>G<S`t^7VsBRDJ4Y8L<5U&
zA5DI-e7ztcF*H(gGdHww`l>G;JvKIGQa_^_)-5Om?LXnRU}95An8ng3m>u(#)d-@e
z5(S9t-<ZSlCl-%HDGx1iwQSb-{t!kVMsv($a#>r7Df^E$v{(7DUH@Nepc^;0=j2DS
zFwE2fFD`&!pId&JX~8Ds$Mv6At;=Z?wBBEiLCZfaq1CmcA`|1|$SQ35`ucgr#noNB
zPdt*>|4Aq}G&KPQrGU?2jg5_Tl?4Hp%Yp1^+UE$puYWIMXT=Ndc*DZ^s*2dsK2WEA
zQ)8ZQAqY8NY`VD=S%(k5y1XAz3xim0+Za~bW|wsEW#<}3DvCruV8O={;D{m+E!Fdy
zn>?qnIY_7|W!=bGtBJ8WvLLl>9$VhK91{$6sycJd&O+XoGF*M3#lvq)Z&D`x{^?^c
z@}jczDaZ}zvq(hCBpHUrD^tA5I6IN*o+>3XAQWjOarl!VQ4L24n+q~xq~0h7Uz}7@
zqTj&Ryqti~1<r7q-|w7?V$%(WP^25-3PSf{1D-YbcV0$P@Qap>3FPtCzB+bktK{V5
zbh}$UP<ZY945J%;xstor`qu1UzXuL`f#Lt(K#97#@1M9+%1*O*Kvur*BX>yDqpu4b
zmftA_s8eA{GfAPmy2$$jXd68o3%oVL|L<4#xn{TIx8xde(&mfjJMTZfH3%h=pGh<&
zQp7F=@l8)FdBjms$Uk!YsJNw*_e~t>_cOF`@j4ooCqBu2Zvn1gHoURMJv=D8c^rvx
zIM+9GJ{+III_>&xAjTP$MXijLUR)?iFylQJ>Q~(TTXRqd>7u!aq9av+5#KLn%==4@
z%Zqube|kk!C;EWVk^NQrd7wTa(%R-G%3v+k8zYSxy9i`c8Ow4LN7^|V*ZM~}Cl611
zclS;5OM+LX^Sj3a_{mRf=Q=qQ2&?Nxj1$+s`}Tf<nF=fhvrsa_ska|A1|(PUt3=@J
zjI?u(evzb|j1gR+2zS9-3iI(KF%$h}q-#%D@~<P<m(rriKtD5^e6GKE(Kvu~C~8J~
zOWIbl#dW}YRuo&#3PN1RWPys!?SCQn+tGI?l|+6P7I_x`*2c!{M8B2WTdF&0)5T?r
zww6Qx=0pDy;77po@QrKf5gF<67s2!u1=!cVBqy`1V+!ZO556Y*>JhEqiAzz-Y1zL?
zaK`+Vp*}`PyYsh4GYk7>mmdH&GBGJ%KI_{wKmD%`IzKc$J#FIU1rdVL6Z_(OkNL5~
z;PA|VcO6Mia`(GVNBw;Pa^6{N&bzmI4@!%Wj(Rb%xk>;aFX^cMQ2c1}iEK;0jvq;Y
z+Wq;^V_Oh8KirY-3&y^!JIabAV1I~W%J38EIeaY=e^dYlNw#h939_p7=or%MTbrmj
zk34f~q`uqxd}ht;!7zN`@Zt<Qx7>mjQoN@ne}^}#)sP82IDM|PPs;Z_)-kH|^GE*z
zfqi#)M*>fxRvsj=bes8{%M_F>yMQ&-FxvuEI9|%f&1EyFf9^5D59rAGl+>3GB91!h
z_V0z;l|4J$jvPPlQFFXpPdkl;{{7!lk{SklWpFwc7&n?&pg&$X)GT|41tZ2{6k7T@
zM;(HHVkQPQCPse}0_*~A0&G-NPI#q{nbyP#c!jn0?IK8s%yayW_U(}B;O)-AG{Fsn
zF#$a)ur@h@v{ht+N(N)u7I;xvEcqTxQUc4Jb3TD#qU#p~9LdBPO-XTtsCaLHvL@^-
zNe9nekDhRwz!kM}3GHc3o$wKn#6}f#9ZgvCCo}B$7cnGGBp1G<=GQ6=^vMU6T|m{h
znZ9XfPs=Z1YsN5HddGFysgw3IIGyXfVBx%T*R^YFFQLqV*ilQRFaa@mMQtv2)<?J&
zP0jhEn%;lvgDf$daNUx8n(=W7(daRL<Y4+6zDPtFOi5YyV9>*5K(PN`^{CVZW|{ox
z$%r)MDZFe6T4j~v6XT8p#4F?9M$ORN!v8_{j<08P=4eL+qi@kDfkGXIRN`8&rf{OD
zHNl-=v=r5X#~i3&C{Xc;GyA`+s<IlDgtl%_@q*IePXd6^nsF`r{j_(+<(V1C|NHzI
zHV{^m1sl?Y9~NWHli9%ZN%LmK@1tS;tJA*J5cJ~U4A%Z-*RBy;ORzop;M9ER^i<Ly
zN-9neRZ2TT6td-jC++C8jm4=AXuA_}CZcXZml^Z5Mh*i!j2-zjX>=GSvL&K!q0`x}
z@lS^&T`ogZhMi7}AdA%I5-<L-V@YuC!4+fC?Ep%H;Fz&{-D%=oL4R8muxf3Rtel13
zj!+<tZWQ}S?MnQN5)*^-QGp&wdmX44Ui%+B#mm~E>EYqQHX6X?%Y|)japng|1z|e|
z^WRj$_Q}E9PR};7(^hv}${=X<<7tPVS;MMos=d!iRQGyd@A6q1BbpW-Oiy*tF6+c@
zM{p7|XN#%Fh>--5pk7g@`UMLW9u1;&0Gzo7{=^Hw%@qPjv1hhk<o4NPa;$tU@F@Z%
zqr<A$`qzvB6)QNV;?-h{>Og(DQEbupGKv!=A$q+W-%a`2wPfaZ=xu2y^@PV=vSD4b
zBZ>=E=6RfN!%eoLBLA}&0N=?fOjPfAV-(}W1oyDu<3uE*)+oEe3~Jh+0A=&fJOB;T
z`Ef56Kw!UlP$rx#Dm@jR*r)GK;-7P{1b6yBQbPCP0qR>&<Iz#<14BG{rcLL*wPjMD
zLkN`g?CG@^yxrXjGi`cME+;T-URg5_7JB*nQ4+PR(c5j@rQZLijsXCBFOcIaY0H1F
zYB!Dg7w8}m&I0#=pUMphO@v;wq8xijnx3BB46a}aKuwAC-h!Kn3(uxPZ?t&P;h>0o
zg^X&W?DLlj9CG;fnis!x-Kbmb?Tu0Bbi8FI#};QwxYTnC(u+e|soI$Gs;&|Xqe4#`
zAX@4sP$g9DxysUClAS^YBaKha88tp=dA=it3#saeX`#vxIvyB;OugBw-(=u!GI4zv
zrVXbobJ-(&@%U5XGoK+3RnI3jiq5|FM7fSC^>($>?nMP&hG5*&Zvg+aT0mZozw;s*
zUd#sWScW<aoict!mX4G(1E2`8z(aKyN7E@u{j0Zk{0)Ki>b|YRO*v|~4xOBY9GiUC
zGLw8MdsGWi>s@SWsNP9BYbHDWBATS@V(Nd4c$>}z*?GnQ{~<OnfL1EOy^mY0F|M2>
zdcLf6ytRx_vcm*d2V&poLHP%>Yli;?rtmJL`qri~s$Vih(mzV$6@hxZme;cI8*`=H
z3LR7Bf5wRi9!=Nce2qvqT5=gmODp>^`DlPXbeBO5)Nsf2+=3Xd5wIv5z#FkqUyZz4
zZdbiIhK1k$_zex9#f@Q6GA5~l9rp)Mf#zVD?z99>ZFPW+rc%yuT2Q;=rYx#DS=S{i
zC4Gq{)m!3(l#NL;$+3xr&#1x=WOqt%O5|@gkBBM7V9Eum-YGQomr*5>?Ijf`iPz#+
z_=dhOz8l!t+PWCJ^y}w63qXA|ek@94?_qQ!vmXxB0eE)zDv?8%ue8Z(jvM{rc{Q>c
z`_&@v_a9~(UWK{2Qa|<%$Rpi=RO7Vx*#ePupt>_qhKiZcM<?&>KTyF)OmJ#5929h^
z|LP#@2R}I8xb<zx_D2PikWv{~OV_6FlZ=s?1nwZ3`|f^K<3J5hUhQv-z4hf_&vaYX
zN?uRA%JtIjgva$Xz0GF;HJpd(r#i;51?Db{ONyC|F~X*r#9k+YPlztpBl*!^pBxK8
z1q}L;D<T=%I_J^YNdB?jIp)pl$mCd{+``QE{i<)~%Tv<r)Nnpg%1^jlfah?)jie%*
zd?|*CL0Qtbl!{RL{t5f!rw)yjm$~}{ah|+KfA6NEY0f{j4f8naSl>lME>adyE1ou3
zg(JC$Swh=ho@RcD5CW>MTKz4o%t%qSe}7a#HpEl!o;VbrxV4pa5n<_>ldRcz<(G{Y
z4B%utrH5d1{hrtuhxaGc4R6%(nb4c7!A(k_1r&G*UpU*lD&5>h;yA#u=!Dt1LoMy%
zFbUPI8morsJ4PAKuwpe<u5nJZ0f^Kq@aj$oxZF*d@PkF9lKcH(Ekdla>?MyZN(AG2
zXsKbcBZ~Iw^3H+p|8sz^G$f`zy+;FT=0Ch=0fbZjBEo@!{pUzqd<w&#s4bucga;J%
zy&%Pr7Xkpgz=h^8eG4k4cFrIo9cLVf@$YbKns&(Ed@w-Vma)@-RUDfYPxlT`UV@)!
zs3o4hU*66<V%{jOYo4K(GK_)F!e;v1O*Mo@D$u!rcJoJyCwPZUn*M@Krd4zQ&8vsg
zP$gb-S~7m8V7?HrAgiJ7oBHh<@kY9frph9=SgeUXNXh4SL*#;`+>M+Gr@ClEXCn(=
zu=iS4fJeyY;?FwHHSKxdmTFI-&qDmwp8!&`2zmVm1-!STx7#u&&Mc*&^!FljJJ*a%
zLFvNgKSs;q&bg&nQW3!iJvwPkz?9Z@2DDfgE3>3qY<m{n&`2w3Hf+`hGxV<($@E31
z`}nC8z}Ce%_ScnBLj_{y?CJ*b>|0WdH8gSblcU>+;Zj~D%!zplME&RqZRG+&;UifS
zA-jd=5<aIN^MO05kudb8eV4YHkBx~7rB-*sYv*pC<Ae+YyRF7s)}0N;gYC$Fep7G@
z)wY;O^>o!RM`01eTqP^gs6h6+Rts<AbgNd*6~5q|qHL3h#Yez*8Oot`rU`GxosO!b
z2vSoFL)fif__)mx9c;-+l(UT$C$Cnkm~^?NRyVeX_<jmwG0|2@XSVvhw;6nVHsV#D
zO10@rhgDwWcyVXc2KE5$AV^FdjhzcNySx?qzy9cyA99A;l?%K0&NAc^LUX>Wsb9Tn
z;KH-+D3+;g*!QdPp|%#l*oTy$w9H<}-@I#;<@dYn+Q8JHWDS0!9J3;IpHTOwFwJ_g
zmj{h=1mVIz!EMVof1lVYaXsGToB${4fQIH~4g8&NN?XIZToq;tuafB*aw=tv4|Hkp
z0^Eez=uxBP(Kzk!{U3$J#0ahaCXH!Z<vnLCo!H(9iU?UyV<OMk_dl}4K>FUU`jv-d
zu0`A<TjSl=4qO&i7!OwH#8D}={j+du2&@JjIfS`rGvKeV;{SG3D(aDaPtsK>T8T`7
zZ3$pW{bV+i38)hv)>eNx;v0|iIX$Ff;Lgs7|JPTIOYd(JQ}6HZonQC^xM%niL~rdk
z(NHB#bzWIdd_=8SmGR411&9}oGa1p0YgyVVUtb6TJ^dVK)-%{kzcTAE<OY&`8-JI6
ziS%X5AXQFs#~U6~DvoZB*Z762bhG;vLGcJHJK~p}ntyI<Sd_BJzgY#0=P@$Tr?-+e
zp5z8wTc+41`D^*f?NNO4;Ac%_PTCH4G4%t_VVLr(dXoXd(4=GPE*GfH`NhOn>&~jP
zpqG)8)7;U<(q8!rW6kj2#%?_XEJZD@>5BGno)JPf;U=<em&v2V=cn#3^VhJ8H`v-!
z6K{oIA7BDoI~2wMHQ3ifd0)YQ)>-CnS8#AA_|}Z4+ZYq*v$U_3)!-w&*a1uCC%)C~
zH;q4x$Fp5bi3psP8<>m(I_~6#>9RjgyE~jM)X7b<tG(kPvvJ@u#o^<ftGf?dwHj8l
znkhJ9v%ZO8#-jXrITh-o;S7S>s(%Yu`GSdDEJ}$9y@K_Gqqce3sSZ`rf@)fxp}>B>
z#MTSZ`?t`GHl7pXYIQTi2738~3cKkp*QXAYGeKmT3oB}VoH-q2t#Gu+jX_Il1yo+%
zv<SGdI6j=v1oAw@Az>x+@w30GibHBFI}%rb9T$zjFGd-5s)S==0SUG{^C5d{#sP+}
zS*-sZ{pjV=qF={hrKBcK)Uz+%-22xAo&SxZ4_##edZUgZq|#;yOTHB52y?|}!6fFd
z_ySqs?236Am5g+Yo;OMs&#{vPj({Gs)^#VpCKhGSFK0B{d`~TzP^;_+Bycl4=K*xA
z=!J78PrcgK=vKSvgbwqWLi^~YdLnbmD|0GZ9vd`7l?vYb{oL{dwxZspzi;mRTq@9a
ziUji`bQq_Cwbxme0F;zpijB^{7y7o3cvq)xLsQenM66fkRTC>@70tD^NtJZf7*(T9
zFXIiQF_b*e8@@9fVOAb%HkNFQD%k$9mcz44noV>37fbn_hVOgQ0O#o8nR@6(l5Yaf
zE{zDX9gOX_URXyb@#*91!8;=1$H?tRkD|q=TV@X`Md=Z<V5yT=;IiW3{U&vx|6W$Y
zfb%<v?i<x&p2lwnK`jr&!a1AY2mp;5xYH*gH)btQXOB&>laxl_+P~*4!(i&r*1EyS
zF}A-YEG;+iRrhDVQ~y0kVpD#hDIn8O2y=ruO^WB)5+cVq2cwKrz)uU*mzP1%i8AO%
zHhIbkn2)Y}QMd>_xhzgN!6G=C=k?=ByZ`{;vE4^?#;lcPoh-NML%&M5HnYn`$Ye}L
z&n0bKpvhXQC0kbU5j~NRm<e;qvBH_&1!V<s1(D^mVQyx=NISp%FjvZSJ!Q7k>-g^J
zc^IU|0?Lw{AMn0sI+b|hN<<{4&)aIrp{PryjiR&{+Y0JNDG>zdgB}nnrCHH>axk;7
zD-mm31S-pk(5BA_O|oFG*`7Y|F6`zLXpIG644T!yuk`Ir=KCr>k0(nR1Q%u&3qm<U
zq`pKk^oLFPX%ZsczZBg1|MC|OJ=W?!*Pt(7ba-$O4u%Qd{NL0j+b*B~poCrr-M&9v
zL%@f!M1kp$Ty5B(17P-Z=I8rcALu?>0g~aumG6@)Ruj~&TEf;}pi)@vv<~aQkl=zL
ziQ-iOSFKT;gH=8{2RX5_4A5sD?jG*QP=N4r1D;t%E(`Uz$<lC#A%RP)(!uup!cQ@m
zr}$Fx9w<JndJ}IcK;HQN$NfFl?UM@kQBJ<zXkW*#M0lMDek5%b_AABU{!OrTe{b;<
z$-}4AM;cjYsVf$lF<ixrhp(R{(&g+@e3@nis<zaC@)_bks-?sisR059&#MaMx1M@>
zwno0&FApUoH<sKWD;l7Zxn-$wrX3mVEWj)ce;nRk6d!t|lqreFNN{j)fF1uc$BIkN
zy-AV20)Z$XE2H<=06^kpSjIDKr=7o!&}pj#_QTAjuZpSduQ(draE2yZJu9wU5aCb8
zX~oiiC|KJS=-1=*2)Gz3B9+KHl9Zxpb0U>U>5a<x<lyNAWJROBYkJOpB`O;y5$HD2
z6CmmMO)i*yZhk`x8VmE^pW6?6UN2<<op@b2+)Wr@SDSu2p|t(p@I`wAHHjGyPbEqh
zn_*BzYyBA#yMkXz#2T-KZ)^6Ji_Jwx{8i3)v##udpZtgAkD%Nf{043x^J~uLP^cF0
z9Vee<69DiQZ43kU^}QA8SmBXy>snE-5!}e=M1fEIO&Yx>R>OaP8HbHSp~Rxh@9i}Y
zyx{@=Xke~4<GkMoJzaZ%cO|Np&sq<_QMb_7=GT$kauhESa5JKumK>q{1O#f70~_PI
zQh)87fc%ZM1ULwY=B}>`0V{XVpInW8*&^}nRZtZ(ESg#4l@`)#WymR8GsRcX;^!#k
zj4lNs$sQ}|mDncc5#zB<t3-PlR`W7j>9Z@Wrj-UI7M{;{i@o?=W{2HQl%HQgAGIuE
zQz?Y}a0c#1USIbhQ-usaK9Fh<y_i~`lz7DmB*3O@zsQrlV9CgGL=$V;KgAGB9;Y(O
zDp%;swaOlzGH0al{$-d@I5_Q2`aLJuFKpepRl4p9-7OzLra{u^gCWbS&~k@I`Rd(_
z%*p+W#~TjiL_CdmTd*eNMJ5_I%udiU9RoHaYJc($(IgHI-`UwojJkp~obBynVZ*Gp
z`~e#4G~(hT(3VsbiExxo+Cr}i#{}&J_3Do~cCfj#1*cAjt}UtU&CS3sy-?~u@s04}
zO7*J&K9#)#z#unAyS93VN-FwVWwUrZByA&hv3r&FwF^WgwDAZ6Y?!y4*cmYo@q$yU
zKVur?K4&d|X}>xe7e9+vHT;di)Hg2w*PO*(*h84%Sus@KK>XeHWZs5%D(sLYs^4I@
zTj=nrJW}i@eZELtK>P=!o;y{UMtt)<4b?2&$(U;(BHfWS7cDnD9-4Q<MKt&5+Ja}w
zs?u@}(Zy<3uwWT!>V~l2*N3Ac=*$0hA%SHV0kE-Y4D|>LcnNb7%%5OM$;!~L_t_?U
zZn<tPUT0|mL8|ed>jtgWEybz5{QW22cXu%kAv?|DQ_4d_ga7$~!O)SbE0^n?-U)Z%
z3f2Uiq!*gLHE<Y@WX-*XO29UlW`Yma>M1X0s9OHtEXn)b-OSbF9WaQI1cZkx9{#<u
z@-bCEM~IB-h|*=kTMTKIX;y8oy2dxYVnjGGbDAfkL$dxd>!YDeZS;Dnfrw!g!Cd{^
zW)Dsw8m;@BCc5fp3{$cQQV`?lJ-P^F+wZjCeePF3WS*kn&ENp-4jK99YjS;5{~pl$
z3G}wwpXB#Bp*&!O1EQa8@JN!v&K7c}!QQZdN?)NlaBQLRhQ^j=46=@hW71v?fICSW
zUQAEOmTTh%>2i{8?|mNVoq4%GITJ9E+TFg~3tm}2ET<<8|E^E~bW#3)UI2y=mynRF
zqo}B;<|LL_HRcZoKS~!JG(RyJKdag~RV#CShI$BNXd7z|*UzqR*~!os{_Q=YuF>OR
zN2p}`mM_v)&|+~_K224j60aW!m92tE0g6Zw+}(n1QeC$<B*X5nxr53h&pOIjDaX<4
zrkgKAHJa?S3bh_Czup~5H-^N~5~4y!rJDPB*f^Cb)2kBX>TSlD*_iV4^E-@_*J-Y@
zpB>PUORDzv`T`C&xAwNSyPvb`4Vv4+pv3IHe~XQ)Sp8ThWl)P3{b<i;`RB-@@mcX0
zT4+C`TD4X_UeuWOmmANvsDP60UXe^OC`pABH^e5b<MP0kkHuAW3Jp(*VIrR8Vb9$s
zhzjM4=R1XkCt>dQ#~4!m!1+h_IjvG*c7bfTWcc!$Ka^}-@?TPHLfEXW>(ichLo53S
ziW8)r(9(y;@#$;;8H{wkL|3}Y`Wa0vNzHqVY#3|mZmk1LK?7ZVZyW3HG>m@$)U+;D
zZjDV1!5@_IVfbGDf2zC6zbM|f3(^P*NQcxSyQGA$v{DkXNT;MAh$4+3vLGOhbS^Ai
z(%s!DwR8(eD_y($oA2{qJTK-mZ|DBZHTQMybDeW$;!lI@-HT<vW9;q2Ark3Vm9|2>
z77-F<WCuq_!t`Wwi;G{&nB_2%-#qJ%@8TQ`%3Iua##k;cE({CNd`;-b`a5t#Y%ftS
z=3(1IXJ!Dk+owL>@o-#ii*$|BDS*ZFMb;w&7q9{N57%(T#K!Ih6L@D0G(Vh4G_>?}
zE(ZoM@iV4B>hTV?^djIFvF&BI&mIhijKS>1tlmPN!d@E(Ij3s-=~d|$QQApDH>2JA
zC9R_3NKJdDyI!#f#kop)D?$q5bH0rHmV!Hfxd<*17w~zOe_l*sBIi3j`^TWOqjB45
zNUpiA8apc2^fh3gs6x)v2H~Ev?MmwKYseBj_%T$Crb{I{bsEg74=LX_cqW`14;o^^
zEig$2_ZH$qK%~L3G#XmJ1cmjj`bn57Q^e@a8ed3>BcvPUJ?*c9s4_w(R|D|z{>mmM
zE|iy*mHB=-w>aNll)9W-dF--2PfK_#pQ!gDHD4Dcr?#c(1o=8#MBvnQU)#uE`(Ahl
z%DEk<Q0Cq-!_{%~A8JG@#KS}7S!iXo7>9$%vEu6d0rHmTuOYqPI{Kg7mz|^KPi8<_
zSipnP-H<7xU_SA9y-*tFPd2g_`H$~hSx$3kU|)W)6|;tNyruRJ^O@I_asy@Z*omdp
z=ybX?4?67tV|2f`*2hdtOf`##a=uiT;)KAXqfjUTK%9lO7L`Sxw=Op?wO0=>7^mf(
z>l7+F>9$6qz7?nD<j}tiEMn85GI^;R+hl5k%i|O_$%qW8LVaSP?fS$TyFw2wDr9~g
zDI~yIelalmKw@?d`B9j1+-K+FH}($J?tWyVp^sUM`$N7Y4Q>~PO5YX8wFrMcI$8d*
zB$4VA{qC)Zs_b}cM3WO+-s}b5@9dP|OR<a3O6CMjVx(HFBO?FK;aO@F-&7<P=x-`F
z0%=QlRYe(`KRMy)*qmu1t+%H843P1C$je7$9o>yJb!``;Kn1pbK1V$OgxYJ>XuZ_Z
z_=X5bBve0&pq%GJU=Q1`b1;v*1^WB@lJjrWsD+zGrHVf)IlgZ2EunE&;Pco5<quie
zs(&+*!zj1&kBqP!i1%_An4b4Z)nl7I%S^rg^`TiDSt1(cGM<)Zx^d|d=xt%s<Egmu
z!+&AR`>w(#%-YA)|0uN_M+WGfV=gxvAN<n(rDC;V7zYZIN-D1e0N50_CNRl{c{ZLa
za$z2W=>38#YHOb{ksV<NQNUDSZ_VQ3u2pKbVJfuY?*XKVeAwwiXM-4M4#qv;L$Im;
zFT#jkw#>HPyqa^7fL<n&@Jtul;BJ-hYSQXI%<&SiMEYmlPKxZ-wi~ol8>E{PdLD;q
zeB-dzx$*I~&+RwitYUhXKREO;?mV()+;ansGu_2EC+L86xChqm;tu)oxa!MOn;nZW
z%(U>J^)^h0UO|gC^Q+3+eI^DX=+5OWiGN9)2iX5LDIJMoNlc|Yk5Vl$E>%10YZ8U9
z9B!6<ZKr#ks_$ZmtcSjM?h?;I8|58p&qu4yKMSC*l!yt}@a7gI|Dkz5tzJn1RXMI{
zE7fv3W>Vw*6Cu4LH5ho&jQ?C)Z>IV7HzhH9<vC>g{RD*r0ZOe<WN|FiTaAL5il86B
zbj3@g5zbIty(dD|3RNk#v?R*GPmc!$OH0b&MQKl(eIlp~iK^#Qns1xU=NVvTO+pRB
zrMJP%uY~(Vx<RfZyq(hJ$x@M}JD{4f+cTT=<${cEisPRxVC1f6EqiphB(}?mPf|3<
z{4(K5*!NgIPsX`_(M+>tz|hhpE$uAnR`3#a(_TM+_xrPU`+LmAZ3U~f2T@MAr-vhY
zGp*jS_3xB8{CR=gx(;%;!n-Or-gB^cQMb<ldp`jP;}Gr>BzCvpd10Sb@h#iMkP}kc
zt^2ysSbk|Hr%T|%Joq8+T|PUUM{Rvp_nBLq==<3p<O}vmz&NSAap-y*F3)N96`~r4
zS7cnytyoS{c^z|S^<&A-{nfj^$C`)lh_JoOgTI+Pl@*SdH5yvs9Y=O!Efv&_9gLrd
zf40aQMWW2UNoj^%-XXtv4tvWJBg%q|YUHlb!g4`ToJcb26$%jJf-Z>uX0np<B|?R>
z$<Sk^vFBoDAF*V*>5BYv@dbEq?O(P>8k6M09L}7%KI6y**OngTr3HM!iVdIAJqR{2
zZM@zQO;Y}lE)(gRs>n6R#~o$O=c}#J>Fi<7R+(?6vWtKVFhdK27g~tcn9EMYn~P`l
zOop8wwz$(m@>aj;j8;x+4a9!XewsF#Easx-8tQoa`+lq059I|;RY}1STOvVmx!+SC
zqYurNB<SJJKJcC9IOjo&hVk?q&LbH2felU0P&9+8P2TarPaM&E&LwT2yq-Uo?{C%r
zt)$$ioUQcz&E!)^?jI&v2J5)F_I(k^MjNL1qB>^s73Yy@ThB!#(^;wpAoGGcZ}fN~
z&(c`G5&fM7I%KMnWt+?XSmZHgjYy77@Zr_Qrwp5Y`*1xx(l2RU%lDjBj7FWiR%^Tx
z@LsbgkGk+tj`5K4Rw{cx>`b=)VR@80PS8NQ15);*&|)ENZer2Lp*8a45X(*mg{rzM
zGS;dphTB@Fc%0%dqn@;G6Gpxb(mji=`q!Gjch`s-U5q`ON$zXA;))9iP{lAQ*~q@>
znD>e~@2fuX?Ax43dhk+*@Jphl+0&F!dK!Xmuf7qeumd>kX1lJ9otrAG0k)#m-d4oF
zn)cVk$4m`DMM0uVm1A{`$!W#a`X}F^#~zWl$;V_|`POBu&ZMNC@xTlojBL5#Ol;<d
zr7!$G9rxW%L;D^tYFf=7qk$e@Zt39QQ1{j8Z@^K-=_Fm--yph`t9fj{LwW1>@EgRf
z8=fWAkSW`qqsV*m7rcCWdh9`Gr`tgfaVw~FND%)7{JOu8F>c8nGmi}}h^o_~1Joe7
z?$Dh_ktqG&UNF6ccx^2^bq=!mB_WpXn6f!N>sY%Vfn3I;7}vvwOVfpe$*3<q6L;4W
zcJ&jx)b)LvFp;QJJ%?d0z1o6@9^H}3IWvgQ=N8h}w~LF5NT%_3=1il)%5g%QjhD}r
zry}fUY)th>P7y^yufk$SNYvIv?o?wl-419z2g-+fO0m<GAImUCcvCLkGMPOgrQEfS
zd022KX5L6liNHSAfc!#LEPb5(n0v6q;<R(|F_7Zy_A4x1_N%+KHTn{0u^CtYS2g#m
zo28nd^kkTy;=U(+v#Z|w{F4{#<~N5r2uV7TRP(+eCboC+Gl;5GzcHMEN?B3xKFGq1
z1j+QY_PNR-?r%l+qYhLf4iW5H#uLUFD4*F$T0+w>WXa?IH~cTy<gz6`<vp8H#1jrG
z63HkPJ+;*Q+$s&`T2;LtD(<S;vZ1hO4+8GQ%Cd(rczNN5`EZz<O(MiL4^&RweI4<y
z#3FX*)iy!3m#Ut`keU`X!OIQY&Zwa^GDQ_C7EYG_NfXIL!>xqa>f&6A1kdX?f!lAg
z#+1Cql}HOfJTtY~$JulpUvP}SxqSQX#3%7WPQL^?yz7Yf)os9}923%=BZJZ`I~@@j
zcRIRjEYE=N6=n9BK9cq`kFKpf$^*K<W77tw^)K=vJ7(B<Y&UOt%ePnK6>Y$QkFZaV
zdW&p_IR@pIIdmU;UjS{ZmIs3RKdS9#vq>kLmc9M7&x5;Sb3ypryT}2gW`E2Mt}xz+
z_>uBcGR<s(3XxMolTcAuoJ&<Z8I#UQpS4WPwb0|O!s(cql9f$nEm9IQK6-!DEuTSy
zd2>Wa5I>HCn-_fvDa|bTn-vz>5=&*KX9TcjN&_krzl2I_R6(sj1p_;@V-`tum}KMS
z&@_yr%}hRl7fliO@z`p;f8ZLP;ekmezZH`M=#Q^}<od(FO#P}YaA>YQmmQZrB{MNe
z6BJuG<hDg&>DcN0%)i}7%A%Xa%gG(Tc{yglW7Lz(cM{|TuMgWjV^);u8q|L)t9XUf
z=%_XS$j*)Fi_eEqk%m*=v*uS$-F#$D|B2Y`t1EQJN!}{G+w!?x`<1d9zEGieaRuy&
z+8A>=he)3VqH~DUa(hHbMbAr!EIrdbEb$G;3}+mP@xiT(w^+7QY@@1#u#j~Ql!w5G
zi=M_JqR^E}mfb$`*saP&sT#K`aV~0;o-3DbaoU&a__L~-Ud;SA=I}^R+2i?yD#tag
zAvyB~Y>fPLlP~7CXOA|OL~tGLVWvG7+GT7iT`XOZf=<El4LqQ^el@>+Y2&U@2O-;t
z*%)%!zns0%bR0ak1aP$aq$*SSxwnjfS<8T%Z->P#VR<`75*f~+53{>L%f8GZIn92~
z9R_xsuD*xq@eGHEIiOE(dS>Nsb+qQJ$zM1Sj2Rn_P(j;Ii~;CQRm5Sn8)xDChRg8P
z#I@rMsfht|$tfI}hA6(r#i7RV=w+gct)WDJysHam@+f(nedpWk<S{NI2&6Qxn0Xpa
zuB{de<%&uL<J)Uz$7fI20Sx}w=kD+RReV1ZzLM(P6n~Gc{ovV}Zm@e<C?vRtsgu3V
zGb<FkCG{_Ch5)i@Nvp<~s=6g>F^P@6nV(CacUZLZuBHoQdv~V_%#DqVZqc>1wLdh<
zd-{VcaC}wW;46j`8(!%pzLz4WtBUg)N2^WaCN~epeaZ$=Mef>%g`@$rl=36sA%%F_
z^U=*;L)tvy+7FCUB=HMhYg3to7U{O?;PBX2DqG>a<0nL#R0t~<lQCQ~*+R^_1_cC8
z&YgL!SQ()K?gT-jK>XF1T8SOUn@4#}idK;WxlmpJ1Z8XeJOpJj+sjPYafU}B<mMA{
z)AMsx_kKPKlH2`QQdncdr}iY@Vw==fcVyuC`}U`*)4~qI?3APske9LlNu;d&b*+p%
zL{T>hH=&T1IB`y%179P{zK_JAxKk;n8zUwqUgmt8j-(nyxYCVRc^%>JJEV(ujbfd?
z;a+j==9?rTn3kv{Z#2d0uMX!8zqW!&9arvT6Wsm`RC+aO#Pf+D9$S7?rB-6|srw>y
z$C)dL$5T6itLUEa+%o>JV++0|dEHTnNWv$Isy@s8gT|lLyS^tHId22wCn|BD8Zry%
zi|tj&XX-}8@dv7hW(TU2Q8c>;zF~Kz^qR1NXePg6ickkf<P<kQO1M~zi?7D?c~bEx
zP(#W;N1T75IE^q$h?@^<dHOos<7P^xSQAap)hbjGgEh@vIme0Drr;m)$J{trh9W?O
z+B8%4^}D?vhtN_>ZO)ONWo-&V$kXfb^qp#C>(z;N{jISzqzBEa_!I|@7dV%SEBHe>
z=Xg<#mWQXUb8FS|FG?oAnXCQUgcsqxhrj#>|I~$P_%TXD$U`}sOWx?jC(J_@^=vG&
zw2$N^7qdPC{DfECl4VSi)Ve~Rt+ay_Zf(s^O`}hoKS8a!`|eRLYm}B+ObGS*LQl4N
z{lE<qufFWV=mGMYKb%T*>xtl?>?)yZHKB3KL@AfeffK}}m$jbci(Q{!Ya<C43qEF7
z>go?;An_6P7nYnn)CpC@rB23PNoH!%uSvu82=mxfzk;pv6jXvDtW9MI`Irki3L-63
zU%Yo&Fob!ei3TaLu52HrmAhPzifgI;Gik@{n?m9K38*2gw}9yFohk74P5vX@2?IJ=
z<89_E>%7^ctO+m8HxmrZvPAb0604c%HG@NxeKZY|<K)D<)mvi{h1R~1JUPo=`DQbe
z7mh*m!8B)2n=0|nj~*qYpAaE8+3T6d{&Gr1o9Df9KCiWiKG#pZzBa<g)6MUqM;@GF
z+c1o`M=J`Q&5VRbmh?NWRg<wa5-AV}OXgdasoP!_n5u5>{uSm8m$~5So9iY26LPKW
zw#R)7n`Iq__SD~1l+TRGjUz)^)8Evs`UI>e)B{8(LJppBx-$;<^zyo11*x8Jvo3$?
z=8m(#!6X7!4D{!x^r9P38DZrX=y?9YO8X%1>UiZfA=3LoTEpvysz;pRp~Y`X*aI#3
zwZg*UdwHGf3V3=31bng%0{lQIACoSHQNT=M@sZ%u>1ur2C|3vy91&+I+Gmfj%ToNV
z!xe^K#DP$89`d)_cpKUsGtEC_cA%@1>GUL9H|iC*Zy_cjF@=AiIIK%@JI_)qO-PVT
z!Q=}0(h%X|F4OLDn$Wco73`H8zd{cVDv9$`qGsQqf5%Uy4q~sP;^J3Vi^hrMDWD^P
zc{I5tZ2rCYShwmOa9i&<8EHM1Av4??PG@9pj$Iu?NIY`HnEL@+8Ue8AukfdU(b+Zs
zPcMm}Y5Q)2`#x29>jfi?2|~Km&O^s-!7^h!WecTlsP4S<fcLGg<~?r(i#-fHqTAaa
z7ZGQ;bBZ^lYJTAw9-DRX70*4qvbOC}WeppG4Ml0Jr|bNRS>hE)#VzzT4Y7if-VT!@
zx;9F>{#A9XJr@+AkxchpRm?`8o^&6~cYa9`&9`ykc?nj5#JG2j&twc_M;*Ucs2Div
zcULd3O;ov|$}VQETAAZ3&0BV?Sc-^2IiYW81kitIlwW@Nz;}6dS1{(fH(hjGT3(JV
zL*0a?A7gDu(*4@4d~f2^vFK5g`nJkenYE!Ab=~dg({a922l%^iN4fqYnfz;aKF+tI
zolW;%et)ebLu|bwLTzpOhM)q6ROiQiR(M0x)a&W2Z>0)ELrqw-%@6nLLaBv>V-=fT
z<fefp7@cdrdlbYR@u5m|aIF`ulGQJE!UDW{8>pE_-;MCS&Cf07DREU{$jVJxsoIsV
zd`USI=fmh<vNcV|fq+S_4*l$P=A>>}+~Y%Jv1hVB-(etsXQ)9XxllQ=%T^^+zv>gm
zD|ZW-pTO1pn6U;poATPd_O>D;BjF4%jCs@=?p>IX*)G=q^-zuRDBbY;v2!McGQgqm
z**E<@T@v(iglc$rIG%93msv-W`Dl(x(CT#aB?zoxWb~Z<@zVz@IMaFrckhLFbPp-P
zSg)LlCtdoa{?bv48VQy|40##Z%hdeax?Ay+63Pjd$t21twy`F*%3AtdWn**w&JlR=
zVf)1axe*_hhXp6f1m;!U@2)p1&32vCENJ?_QojB|G)A>c9I0TaP(A-PFQy_Dlv`#2
z_e@GlTCuo2te?o==nA^;b1_9XC*63hJ^khe-aU#P2AHDq<kHe}R={eaE`L_4i@e<)
z8X`>+G~XVR@*Mb1ezMN^ZX8)KpPtn#+oe(A^02rW8sqiQ4@j5l%B)zMDfhWwiMLm0
z$qS0Y59WN*trqSsoBN!RRTvylw4F>GI8d4G$dc<%8w+-^tKNunYog^ZqNc#5gsHts
z52RMn<u}@Xi3nQt<HJ|nZY5F9s?gr3c}T!>ee_;X>r&x!5y*VZRDd+L7^KRv@Ic#s
z-mdP?`=>9Zn3tKH4oi{FSd>QMWODUR#zsoPcy(j#^<m!Fq{F_Z97`1%jt6Y06o9!k
z6*%@_o$c*+HBCxUaQjlUaWjqU=|$Sz8qw_h{PF3*&g|TrnqBTk9^2nRbhS_WJTWp2
zN*&`=1D+yS{m00<`=9(IgI}jCBt>t}sYlEE>GivRhUerfR=uEp_ACFzmX#9;X^@bH
z8jT2DSR*yHvIV{@^7VZNJID`mKi4R*_pup%FqYxa%DzC-_gOz-2UD2mEqx6N80(tY
zr!p=?5>BDtlwl6uEw%avefT`EcOr~zbpqI9aijgxmT7aN+jjlBI{6W-I6#g)4E4_S
z_~dkIrt>Rzb@9fSsvKB~O_}-1yPc!xsdqQhr@O8nGB9NFrdc(&b_Nzp#5Ch6W1hd9
zU)U6=7_r;vt?F`(U2D{LNtPr)v(VEPhufTYg!gg~a_36ls;M~nwR@oR&l?3|Ot`23
zY~1l%DCLo&fP7=J8kp1)ViOo5>T1BAUMh9cf*XRyg(bQm=3KQc0>`zWyNm9X1mszi
zeVOX&97XM@No7~bx*8{yIOptT8(HbMmxtmF7Z+(u&A#a>qyiZd!&92b_1}YWh`A*n
zOi=+6v&y<|a%V_E))72{N{N)4XNhq1TwF$8c(*3O5C_g%3;RnA=TC@U)-z~6kf6Vq
zlhmnbN!6xFEOx4eWjqOER^x`=n$4^Q{Va_aTukWm9`{p%KSvv`R%k0hd9{YvL!5-=
z8$(oH0?WA{Swl&ydSHdMq#=o#?v00@;bD=qlbY-6npYq#-7DlGy{mNjr#%<jT#${{
zWQgctZfGH?6<(yWyk<eoa(w>jN^h;h>>L1UOp;b@T^jnQn3xbUU&E>kVAZva{|>jd
zwpi&)6<V;oZ1jFV{QhHuChThH@~%g1FN@&6OkizwljfWMdG(tle~-=*`E1`GzFS_E
zR4+)U;uZ;Hx_29574q!XFrWCDf@(k<gPxwno6u<AU*M=crw(Nt;+DP)j|V%{ZJgjv
zK!-pHvy0czstHvLqZNYX6XPbRC)-D&NFjX19-FSXjjZ-;{aMVvX>0J_y=&Wjc|TW(
zjoJ7Gh)-)vg#sKmB}zap@<b@=TsbK!=sni2?r}_H!2#>RNdfi(n~%_J{Cg&mfgTZ&
zc6SLM9o2v#p#R1VU>SD?nhQ5&4}rEW%duy^kVJG@CY}&o4GuFiG&bHCTl>$NzqvP4
z-_VMdR5QkG?z9c;_#RTH=W1%{zU`eB$3$~hsO0^UJP%j<c+?+Crx(yvQui0%uSs~#
zl~|rMw@^vcfn8%4q<y7j%1<y<Z2ho%_Jm7~v<6>?o099EeJheZ9a^UReAx@U<ebEQ
zMczIN%3|r|gY;_0|I&ff4M5U2U&`H3%3+3CC+(g9PN1rl_6{AB0>dNEIpftU$4~aV
zg3S&Ng28E61NA?6pYZ|9%gn!nzv00|adK@^&^2I0xx`@l4!UCLc`3l_K%UAE{hB|%
z13zST;5P0EY>{T;eE=?2h!)As;6!wWLiAa$-=_W(doy&eFiNQxpYfOBRy4=GL@kf|
z{PiJAQ@S@sYB#<dzw(*KxGqKdeYc=gQJj{^s_I9xELkOr#=%vwJ*o>aoue*1I?*Z`
zC7@86T&VW?AFxLIMCPM@Hx4D)jK3HA<u1FU^@UXoMzZX~!my0FwUHDNzH>>0lxI|J
z0_K#*acO}xwC!Qg8m{y`z(lvwLEeVdJv}oPd2{X3-hLv5P8hpS^wP7@wV*fsaM-ln
zIUpcMz{~4-&X%EBl;NsfWz$M76Yt4MbPHcANA%y#>M@Cm_7)AelYm8*c1toYMHfd;
z^Oh8Zc7GhC=9fr%2tp--oL?z$_Y-D9MAcPCv>CfUJTU45jC%}+OPoxR^KBkMx1Prn
z_Mi{xlAS3c@BX+aLBH;uc{UHHBL$u<!gagy*jBFBDW&~>;QpsnIYRHw0vNa*JQM+l
zHr7xYWvdNc7>q!|;2!}lY1e<$baK_5L&gEn(U91CMXrcsi|m}He?)<mD+*2wQP<9;
z%UT<`rOUTsLm3>g1);qRq}QSeMtw#vY;>x$tC1uR!ow<EBZ_=tHNCB)8CBnATB5Ix
z5DJWugv(&Ax^IQTg~iW*6FACprA0|Bwf3jUeN9iRFN+0H^8S?3M;REJo9|5D7>S9C
zn`>*u*Gr|(3Ivj2U&=qlVdW$Ym`K`r@?{To&a^uEPNy%96PN@JVmiMnZ@!6Oic7k5
zwi+rbX!2Q~9d|wIQce9B92qQ&XD$&~Y4`+a4C{2q{A7M|%TmWeIE_$sqw@~c2#06`
z%HSYLF&s_<?e*rX-1ywSW(+{Em;}-7^6^(a{ZnP->(()YY#jtHe~57W&yd>8sgD&^
zRj=SSp%`Q2)|QRFBzIeFP0iW6thD1CE?`4qZ*Fb|6fiH%WhEuO9X}moPID$gy1NyC
zK%W0n8iiBV5a;`4iyAd3zEazgGI6N;`?#%yCt4put;*M|(~o&X`z(0moIpwu`Xt8v
z;Q5}d_E1V+!54Zj^cjjLwG20Z606<*>Tu>;+*%BC{h*~Cc}Y)3NJfYUgw5z_0a7DC
zpj5@D`d@B$_st#;FE1}Z6(-&e%bD(8Vl{qFc%y-;&Wbyx1iC?gGB6q!>0bX^4`?$A
zJUl(I6M)zR{<&s&eVsixnCR7$N4C`@)$?S_a|QDrXSXs<t${V{c6HRF`hmKMw!Hrc
zb7r`rTHP9+=jaCN^DAC^zUZenh}rqRWa!jZXPy|<B0RF=ns1FopGX6lO(#B4{A#wh
zi|6C+Awu6lVfMAgZq09iECGPn#W>ppnSHv>gVo<E|BP#Es>KYNxMHA`WF6drK!5<#
z)b3e$_59gs+~8GEch1+Ss3@qU<Xb=oQDFdxvJz4@O+%eUIx=f;E&rU~Mb7P?+lxtp
zBQ43F<KWzz{qG+EH2x;KWE_m6Pqd~pMZeGUaf{Qaap{g}(<T~a0ICQEmd8RVufPs5
znhxkc&KxcJYa98W>KAK_`EObutE;O6wm!zl?fS$-DR|wIk?*tkQ`yG=qeQZ~W^p^>
zV<sz-@~TZbUBetPn*XXm$M(^nov4+t%v)Jjk(5J`v`ENLNWvh)k6`zM@(G?7MZ{Wy
zoI-@a!)W*EqGESw@~XiJpSd_V2YyzWt*tBgDW^_;5VIF+C3WKdCk`*4%~?FWQ3BZy
zX&2mXXcwFo^!)SXR=wzo#Qp;`51QbB&P)a+Qv_@WIaYNy<#ohZJ$U9>Wp$G$J)ZJP
zd1Tu<%tim06g+r};2SPf!@?VkH_MB8bW0U12-<XBlLm%FySJ3<>I$Ato6$hEeQ699
z*i@+`)nz6{^Cnc<S-2xPOV44kdnW11J1%l||KJ};2-k!*EN<6EmPQQ#`<x6?v)wTM
zlrD0#s5p!-&CBR-RqnvYRyn^-dwB!zc_(gy7#O;kMN}SA{yt(BS7pk(9ZA(s$QG4T
zJ_Jtf<!PJQbz6B*aK{a(ogVA_Cso)O_sS?Av#r(?%rHnW89nt`PUgX-kZ)0WR)DEC
zpXL8uf9GlwNKrRo*TR{%G-W)_kt}5w64HpWf_oi#DA}Q|6{*NN9*tQ%wYw+EDImE#
zH*2i<v-rJzX~8<^A^tu8=WG<j|Br8fEl;p`95~tw=xzN5;NKWHs!A}$GI@({{{sxA
BH97zQ

diff --git a/srcpkgs/synergy/patches/cmake.patch b/srcpkgs/synergy/patches/cmake.patch
new file mode 100644
index 000000000000..66ed48df3da2
--- /dev/null
+++ b/srcpkgs/synergy/patches/cmake.patch
@@ -0,0 +1,22 @@
+--- CMakeLists.txt	2020-12-29 14:53:13.000000000 +0100
++++ -	2021-02-17 22:53:35.496937933 +0100
+@@ -87,6 +87,7 @@
+     include (CheckIncludeFileCXX)
+     include (CheckSymbolExists)
+     include (CheckCSourceCompiles)
++    include (FindPkgConfig)
+ 
+     check_include_file_cxx (istream HAVE_ISTREAM)
+     check_include_file_cxx (ostream HAVE_OSTREAM)
+@@ -247,6 +248,11 @@
+         if (HAVE_Xi)
+             list (APPEND libs Xi)
+         endif()
++        if (${PKG_CONFIG_FOUND})
++             pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd)
++             include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS})
++             set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${AVAHI_COMPAT_INCLUDE_DIRS}")
++        endif ()
+ 
+         if (NOT SYNERGY_ENTERPRISE AND SYNERGY_BUILD_LEGACY_GUI)
+             set (DnsSdlib "dns_sd.h")
diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 252ea57e6d18..b329e4d59213 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,59 +1,35 @@
 # Template file for 'synergy'
 pkgname=synergy
-version=1.8.8
-revision=7
+version=1.13.0
+revision=1
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
-hostmakedepends="unzip pkg-config"
-makedepends="avahi-compat-libs-devel libcurl-devel
- libSM-devel libXext-devel libXrandr-devel libXtst-devel libXinerama-devel"
+configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"
+hostmakedepends="unzip pkg-config qt5-qmake qt5-host-tools"
+makedepends="avahi-compat-libs-devel libcurl-devel avahi-compat-libs-devel
+ libSM-devel libXext-devel libXrandr-devel libXtst-devel libXinerama-devel
+ qt5-devel qt5-tools-devel"
 short_desc="Share a single mouse and keyboard between multiple computers"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
 homepage="http://synergy-foss.org/"
-license="GPL-2"
 distfiles="https://github.com/symless/synergy-core/archive/v${version}-stable.tar.gz"
-checksum=9ee45aabf9f77925bfab6248e713ae5d9e6bfe6bc246e4a0a6304dc6a30f5f14
-
-CXXFLAGS="-pthread"
-
-post_extract() {
-	cd ext
-	unzip gmock-1.6.0.zip -d gmock-1.6.0
-	unzip gtest-1.6.0.zip -d gtest-1.6.0
-}
-
-if [ -z "$CROSS_BUILD" ]; then
-	makedepends+=" qt5-devel"
-	post_build() {
-		CXXFLAGS+=" $(pkg-config --cflags avahi-compat-libdns_sd)"
-		# qt5 gui
-		cd $wrksrc/src/gui
-		qmake-qt5 QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS"
-		make ${makejobs}
-	}
-	synergy-gui_package() {
-		depends="desktop-file-utils ${sourcepkg}>=${version}_${revision}"
-		pkg_install() {
-			vbin ${wrksrc}/bin/synergy
-			vmove usr/share/pixmaps
-			vmove usr/share/applications
-		}
-	}
-fi
-
-do_install() {
-	vbin bin/synergyc
-	vbin bin/synergys
-	vbin bin/syntool
+checksum=a57989dd2d3ae30657f2b95cba3cae112c189f9bbbc3d1b25b3874859afeb94d
 
+post_install() {
 	vmkdir usr/share/examples/${pkgname}
 	install -m644 doc/synergy.conf.example* \
 		${DESTDIR}/usr/share/examples/${pkgname}
 
-	vinstall ${FILESDIR}/synergy.png 644 usr/share/pixmaps
-	vinstall ${FILESDIR}/synergy.desktop 644 usr/share/applications
-
 	vsv synergys
 	vsv synergyc
 }
 
+synergy-gui_package() {
+	depends="desktop-file-utils ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/synergy
+		vmove usr/share/icons
+		vmove usr/share/applications
+	}
+}

From 6d6b6801b7d031111562ba480828b91f65f19167 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:43:45 +0100
Subject: [PATCH 1740/3458] sitecopy: remove package

---
 srcpkgs/removed-packages/template         |  3 ++-
 srcpkgs/sitecopy/patches/fix-docdir.patch | 11 -----------
 srcpkgs/sitecopy/patches/fix-sslv2.patch  | 20 --------------------
 srcpkgs/sitecopy/template                 | 14 --------------
 4 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/sitecopy/patches/fix-docdir.patch
 delete mode 100644 srcpkgs/sitecopy/patches/fix-sslv2.patch
 delete mode 100644 srcpkgs/sitecopy/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fd0328005a52..f05635378158 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=27
+revision=28
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -220,6 +220,7 @@ replaces="
  scantailor<=0.9.12.1_2
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
+ sitecopy<=0.16.6_11
  skypetab-ng<=20150201_3
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
diff --git a/srcpkgs/sitecopy/patches/fix-docdir.patch b/srcpkgs/sitecopy/patches/fix-docdir.patch
deleted file mode 100644
index e260ffb46d47..000000000000
--- a/srcpkgs/sitecopy/patches/fix-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-07-07 20:55:29.000000000 +0000
-+++ Makefile.in	2016-12-10 18:31:21.499245804 +0000
-@@ -11,7 +11,7 @@
- bindir = @bindir@
- mandir = @mandir@
- man1dir = $(mandir)/man1
--docdir = $(prefix)/doc/sitecopy
-+docdir = @docdir@/sitecopy
- localedir = $(datadir)/locale
- datadir = @datadir@
- datarootdir = @datarootdir@
diff --git a/srcpkgs/sitecopy/patches/fix-sslv2.patch b/srcpkgs/sitecopy/patches/fix-sslv2.patch
deleted file mode 100644
index a5b362874b9f..000000000000
--- a/srcpkgs/sitecopy/patches/fix-sslv2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/neon/ne_openssl.c	2008-02-06 12:27:38.000000000 +0100
-+++ lib/neon/ne_openssl.c	2016-05-11 23:11:29.244939342 +0200
-@@ -550,7 +550,7 @@
-         ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     } else {
--        ctx->ctx = SSL_CTX_new(SSLv2_server_method());
-+        ctx->ctx = SSL_CTX_new(SSLv23_server_method());
-         SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
-     }
-     return ctx;
-@@ -688,7 +688,7 @@
-     if (ctx->sess) {
-         SSL_SESSION *newsess = SSL_get0_session(ssl);
-         /* Replace the session if it has changed. */ 
--        if (newsess != ctx->sess || SSL_SESSION_cmp(ctx->sess, newsess)) {
-+        if (newsess != ctx->sess || memcmp(ctx->sess, newsess, sizeof(*newsess))) {
-             SSL_SESSION_free(ctx->sess);
-             ctx->sess = SSL_get1_session(ssl); /* bumping the refcount */
-         }
diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
deleted file mode 100644
index 5fc4d36362fa..000000000000
--- a/srcpkgs/sitecopy/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'sitecopy'
-pkgname=sitecopy
-version=0.16.6
-revision=9
-build_style=gnu-configure
-configure_args="--with-ssl=openssl"
-hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
-short_desc="Program to easily maintain remote web sites"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="http://www.manyfish.co.uk/sitecopy/"
-distfiles="https://sources.voidlinux.org/sitecopy-${version}/sitecopy-${version}.tar.gz"
-checksum=e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af

From f428407f4c4dc1f1a1e47f1ecabde304f8c70e47 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Jan 2021 12:08:45 +0100
Subject: [PATCH 1741/3458] newsboat: update to 2.22.1.

---
 srcpkgs/newsboat/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index e0ebdeeea50d..689e74ecfbdc 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,11 +1,12 @@
 # Template file for 'newsboat'
 pkgname=newsboat
-version=2.21
+version=2.22.1
 revision=1
 build_style=configure
 build_helper="rust"
 configure_script="./config.sh"
 make_install_args="prefix=/usr"
+make_check_target="ci-check"
 hostmakedepends="ruby-asciidoctor pkg-config cargo git gettext"
 makedepends="json-c-devel libcurl-devel libxml2-devel sqlite-devel stfl-devel
  rust-std"
@@ -16,11 +17,14 @@ license="MIT"
 homepage="https://newsboat.org/"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
 distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=0c46b3dd46bb578dd6dd4915db4cfdffb4352ab258f251080ad14655c75a9c31
+checksum=8920f41cc53776b67c0e85ad1696b0967f6ac248f3b8913d977942c15d75e690
 
-do_check() {
-	make test
-	(cd test && TERM=$TERM TMPDIR=/dev/shm ./test)
+# tests fail when run by superuser
+# they always fail on musl, see https://github.com/newsboat/newsboat/issues/1216
+make_check=extended
+
+pre_check() {
+	export TERM=$TERM
 }
 
 post_install() {

From e2e58290e5986e0bcf67a2cbbeb149c97ab74157 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 18 Feb 2021 00:21:40 +0300
Subject: [PATCH 1742/3458] amfora: update to 1.8.0

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

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 2019ac482bd0..35126aae9a41 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,6 +1,6 @@
 # Template file for 'amfora'
 pkgname=amfora
-version=1.7.2
+version=1.8.0
 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=3eb436a81b11b4db75dfb94e38eeaed994ce48a6a5f75ae02efd3f59cc76ec3e
+checksum=2cf95009ee9b70e46f92ea6346d4f615df2c163b27182ec0e62bf67fb9f9544c
 
 post_install() {
 	vinstall amfora.desktop 644 usr/share/applications/

From cd7daecd3198c3ca0ce6ef5a864c67c9ac82a118 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 17 Feb 2021 20:46:15 +0100
Subject: [PATCH 1743/3458] gnome-twitch: remove package

Doesn't work anymore, unmaintained.
---
 srcpkgs/gnome-twitch/template     | 15 ---------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 srcpkgs/gnome-twitch/template

diff --git a/srcpkgs/gnome-twitch/template b/srcpkgs/gnome-twitch/template
deleted file mode 100644
index 379be708477f..000000000000
--- a/srcpkgs/gnome-twitch/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gnome-twitch'
-pkgname=gnome-twitch
-version=0.4.2
-revision=1
-build_style=meson
-configure_args="-Dbuild-player-backends=mpv-opengl"
-hostmakedepends="glib-devel pkg-config"
-makedepends="gtk+3-devel json-glib-devel libepoxy-devel libpeas-devel
- libsoup-devel mpv-devel webkit2gtk-devel libX11-devel"
-short_desc="Enjoy Twitch on your GNU/Linux desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="http://gnome-twitch.vinszent.com"
-distfiles="https://github.com/vinszent/gnome-twitch/archive/v${version}.tar.gz"
-checksum=82c37c858f69c39b7cd38d20c91d8ec2441d339a6d2eaf1f1cc9f0503c52b661
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f05635378158..ae38b20a417d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -43,6 +43,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goffice0.8<=0.8.17_6
  gst1-python<=1.18.3_1

From 907ee7f2b1499927f95588a9f2b7503ace0d45b5 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 17 Feb 2021 20:30:29 +0100
Subject: [PATCH 1744/3458] New package: xdg-desktop-portal-wlr-0.2.0

---
 srcpkgs/xdg-desktop-portal-wlr/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-wlr/template

diff --git a/srcpkgs/xdg-desktop-portal-wlr/template b/srcpkgs/xdg-desktop-portal-wlr/template
new file mode 100644
index 000000000000..3392d274358e
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-wlr/template
@@ -0,0 +1,18 @@
+# Template file for 'xdg-desktop-portal-wlr'
+pkgname=xdg-desktop-portal-wlr
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols elogind-devel pipewire-devel"
+depends="xdg-desktop-portal"
+short_desc="Backend of xdg-desktop-portal for wlroots"
+maintainer="Isaac Freund <ifreund@ifreund.xyz>"
+license="MIT"
+homepage="https://github.com/emersion/xdg-desktop-portal-wlr"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=316f5df3a70331c2fa5476e33acf92349e56eb0514d245b942fcf3122ba32df6
+
+post_install() {
+	vlicense LICENSE
+}

From efa17596563d8dd96bc3d46fd047640482e7f696 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, 17 Feb 2021 20:51:52 +0700
Subject: [PATCH 1745/3458] xskat: build with gnu-makefile

---
 srcpkgs/xskat/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/xskat/template b/srcpkgs/xskat/template
index fbb276d97b85..2e77d4fb2576 100644
--- a/srcpkgs/xskat/template
+++ b/srcpkgs/xskat/template
@@ -1,20 +1,20 @@
 # Template file for 'xskat'
 pkgname=xskat
 version=4.0
-revision=4
-build_style=gnu-configure
-hostmakedepends="pkg-config xorg-util-macros imake xorg-cf-files gccmakedep"
+revision=5
+build_style=gnu-makefile
 makedepends="libX11-devel"
 short_desc="The card game Skat for Linux"
 maintainer="Markus Berger <pulux@pf4sh.de>"
-license="BSD"
+license="custom:xskat"
 homepage="http://www.xskat.de"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10
+LDFLAGS=-lX11
 
-do_build() {
-	make ${makejobs} CCOPTIONS="$CFLAGS" LOCAL_LDFLAGS="$LDFLAGS"
-}
-post_install() {
+do_install() {
+	sed -n '/xscat.*a card game/,/ z .*suffix/p' cards.c >LICENSE
+	vbin xskat
 	vman xskat.man xskat.6
+	vlicense LICENSE
 }

From 420b8a1927c08b5cfb11e3c02386b428fba2a3f6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 18 Feb 2021 07:27:35 -0500
Subject: [PATCH 1746/3458] python3-scipy: update to 1.6.1.

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

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 0c778e8ef3ca..c96b999a5fd8 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc="scipy-${version}"
 build_style=python3-module
@@ -12,11 +12,11 @@ makedepends="python3-devel python3-pybind11
 depends="python3-numpy"
 checkdepends="python3-pytest"
 short_desc="Scientific library for Python3"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://scipy.org/scipylib/"
 distfiles="https://github.com/scipy/scipy/releases/download/v${version}/scipy-${version}.tar.xz"
-checksum=dd06d02e8ac6e13e973cbab3da63888daf26a4fec1cd8a8d0804ec872864a7f5
+checksum=2800f47a5040cbab05b3ce58f1dfb670c70232b0f56d30380c6fd4ef4e787df5
 
 build_options="openblas"
 

From d947da143425044b46b35bacde2da9540b8c8d7c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 18 Feb 2021 08:07:04 -0500
Subject: [PATCH 1747/3458] python3-pyopencl: update to 2021.1.2.

---
 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 326632e9778d..ee439a881aa6 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.1
+version=2021.1.2
 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=ee78d2696a4bb62c6def2678d662d67d27c103621b8c00e21158d16ccbf5c346
+checksum=18871bc80c5a94869521189cf2c04d72c88367a441a9a033f72f66792ac33d29
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From 4b8350f5e84397d754b21c07fc3865ade5a9a00d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 18 Feb 2021 08:09:13 -0500
Subject: [PATCH 1748/3458] python3-ConfigArgParse: update to 1.3.

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

diff --git a/srcpkgs/python3-ConfigArgParse/template b/srcpkgs/python3-ConfigArgParse/template
index ea63fa702d30..ccd04b6a3dba 100644
--- a/srcpkgs/python3-ConfigArgParse/template
+++ b/srcpkgs/python3-ConfigArgParse/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-ConfigArgParse'
 pkgname=python3-ConfigArgParse
-version=1.2.3
-revision=2
+version=1.3
+revision=1
 wrksrc="ConfigArgParse-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Drop-in replacement for argparse"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/bw2/ConfigArgParse"
 distfiles="${PYPI_SITE}/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz"
-checksum=edd17be986d5c1ba2e307150b8e5f5107aba125f3574dddd02c85d5cdcfd37dc
+checksum=0428b975ab6c48bb101ccb732e1b5cb616296e28268e032aa806f32b647a1cc1
 
 post_install() {
 	vlicense LICENSE

From b69bd092ab3c3a07cb7d85d4d3b458ef2f3b136d Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 17 Feb 2021 00:11:17 +0100
Subject: [PATCH 1749/3458] py3status: update to 3.33.

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

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index a00c21800073..7644ad574444 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.31
+version=3.33
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c69bca855559f31fec4a257e76bc3e3cd2d4737f37785b96fa5509b6ee208b3a
+checksum=0c42463652334a556b3547162b46bfbd838abd023cdcc595653e94cfcb8de27f
 
 do_check() {
 	python3 -m pytest

From 68d7f86bfad175515979bc6d056c3fbe4055875c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 19:43:56 +0100
Subject: [PATCH 1750/3458] zou: remove package

- the package is now broken for over 1 year
- upstream is dead
---
 srcpkgs/removed-packages/template      |  3 ++-
 srcpkgs/zou/patches/libressl-2.9.patch | 10 ----------
 srcpkgs/zou/template                   | 23 -----------------------
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/zou/patches/libressl-2.9.patch
 delete mode 100644 srcpkgs/zou/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index ae38b20a417d..c4dc2785068c 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=28
+revision=29
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -247,6 +247,7 @@ replaces="
  nvidia340-dkms<=340.108_4
  nvidia340-opencl<=340.108_4
  nvidia340-libs<=340.108_4
+ zou<=0.2.0_7
  zuluplay<=1.1_1
  zuluplay-devel<=1.1_1
 "
diff --git a/srcpkgs/zou/patches/libressl-2.9.patch b/srcpkgs/zou/patches/libressl-2.9.patch
deleted file mode 100644
index 972aa2e28d44..000000000000
--- a/srcpkgs/zou/patches/libressl-2.9.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Cargo.toml.orig        2018-10-30 00:19:23.713512967 +0100
-+++ Cargo.toml     2018-10-30 00:20:02.501175591 +0100
-@@ -46,3 +46,7 @@
- lto = false
- debug-assertions = true
- panic = 'unwind'
-+
-+
-+[patch.crates-io]
-+openssl-sys = {git = 'https://github.com/jnbr/rust-openssl', rev = "5675404012996556db6bef9f8589536241561699"}
diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
deleted file mode 100644
index e000cdc557da..000000000000
--- a/srcpkgs/zou/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'zou'
-pkgname=zou
-version=0.2.0
-revision=6
-build_style=cargo
-hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-short_desc="Simple and fast download accelerator, written in Rust"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/k0pernicus/zou"
-distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
-checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
-
-pre_build() {
-	cargo update
-	cargo update --package openssl-sys --precise 0.9.35
-}
-
-post_install() {
-	vlicense LICENSE
-}

From bc3b7239aedcd75f82c43f2e3c60d6b2acaa31d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 20:14:16 +0100
Subject: [PATCH 1751/3458] pijul: fix build

sequoia was so wise to yank the unmaintained rfc2822 package from crates.io
but kept like all their old sequio crates up that depend on it.

So just fetch that crate from their gitlab.
---
 srcpkgs/pijul/patches/bindgen.patch | 7 ++++---
 srcpkgs/pijul/template              | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
index c90bb9dba2b7..fd46ef59279d 100644
--- a/srcpkgs/pijul/patches/bindgen.patch
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -1,9 +1,10 @@
 --- Cargo.toml.orig
 +++ Cargo.toml
-@@ -133,3 +133,6 @@
+@@ -133,3 +133,7 @@
  version = "2.0"
  [target."cfg(unix)".dependencies.tokio-uds]
  version = "0.2"
 +
-+[replace]
-+"bindgen:0.47.3" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"}
++[patch.crates-io]
++"bindgen" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"}
++"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016ab..2a7503819839 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -3,14 +3,17 @@ pkgname=pijul
 version=0.12.2
 revision=3
 build_style=cargo
+_sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
 makedepends="libsodium-devel libressl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://pijul.org/"
-distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${version}.tar.gz"
-checksum=f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
+distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${version}.tar.gz
+ https://gitlab.com/sequoia-pgp/sequoia/-/archive/v${_sequoia_ver}/sequoia-v${_sequoia_ver}.tar.gz"
+checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
+ 71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b"
 
 if [ "$CROSS_BUILD" ]; then
 	export HOST_CC="$BUILD_CC"

From 5a273ab221946e0dd3951cce247a7d9320eeeb25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 14:59:33 -0300
Subject: [PATCH 1752/3458] gobuster: fix go_import_path.

This allows us to remove git from hostmakedepends, since it was only
being used to download v1 of gobuster in order to build that, instead of
building the current version.

Fixes #28846.
---
 srcpkgs/gobuster/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index 79aa892e40c3..60e075b3182a 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,10 +1,9 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.1.0
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/OJ/gobuster
-hostmakedepends="git"
+go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From ae358adb1dfe5e672d47cf440cafaefc4db1f2e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Feb 2021 15:42:01 +0100
Subject: [PATCH 1753/3458] mesa: fix patch

---
 srcpkgs/mesa/patches/gen-git_sha1_h.patch | 47 ++++++++++++-----------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/mesa/patches/gen-git_sha1_h.patch b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
index 8228101b2e10..20b4bc23e940 100644
--- a/srcpkgs/mesa/patches/gen-git_sha1_h.patch
+++ b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
@@ -1,33 +1,34 @@
-See: https://github.com/mesa3d/mesa/commit/434da21a7c81acbe03f0e1621e80904313c0b05c
-
---- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
-+++ src/freedreno/common/meson.build	2021-02-12 21:32:57.108300772 +0100
-@@ -27,6 +27,7 @@
-     'freedreno_uuid.c',
-     'freedreno_uuid.h',
-     'freedreno_guardband.h',
-+    sha1_h,
-   ],
-   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+--- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
++++ -	2021-02-14 14:36:02.838935228 +0100
+@@ -42,8 +42,8 @@
+ )
+ 
+ libintel_common = static_library(
+-  ['intel_common', genX_xml_h],
+-  files_libintel_common,
++  'intel_common',
++  [files_libintel_common, genX_xml_h, sha1_h],
+   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
    c_args : [no_override_init_args],
+   gnu_symbol_visibility : 'hidden',
 --- src/gallium/frontends/lavapipe/meson.build	2021-01-29 19:33:19.784871800 +0100
-+++ src/gallium/frontends/lavapipe/meson.build	2021-02-12 21:33:41.406352915 +0100
++++ -	2021-02-14 14:36:36.898986675 +0100
 @@ -57,7 +57,7 @@
  
  liblavapipe_st = static_library(
    'lavapipe_st',
 -  [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
-+  [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h],
++  [liblvp_files, lvp_entrypoints, lvp_extensions_c , sha1_h],
    link_with : [ libvulkan_wsi ],
    c_args : [ lvp_flags ],
    gnu_symbol_visibility : 'hidden',
---- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
-+++ src/intel/common/meson.build	2021-02-12 21:35:09.226438768 +0100
-@@ -39,6 +39,7 @@
-   'gen_sample_positions.h',
-   'gen_uuid.c',
-   'gen_uuid.h',
-+  sha1_h,
- )
- 
- libintel_common = static_library(
+--- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
++++ -	2021-02-14 14:37:08.623233120 +0100
+@@ -27,6 +27,7 @@
+     'freedreno_uuid.c',
+     'freedreno_uuid.h',
+     'freedreno_guardband.h',
++    sha1_h
+   ],
+   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+   c_args : [no_override_init_args],

From 85313ebf21da2fa7157560ec3cd415612641a0f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 18 Feb 2021 21:06:15 +0100
Subject: [PATCH 1754/3458] qupzilla1: remove package

- qt5-webkit shouldn't be used for browsing the web
- superseeded by falkon
- broken with OpenSSL 1.1
---
 srcpkgs/qupzilla1/patches/musl-execinfo.patch | 20 -----------
 srcpkgs/qupzilla1/patches/qt-5.10.patch       | 36 -------------------
 srcpkgs/qupzilla1/patches/qt-5.11.patch       | 10 ------
 srcpkgs/qupzilla1/template                    | 33 -----------------
 srcpkgs/qupzilla1/update                      |  2 --
 srcpkgs/removed-packages/template             |  3 +-
 6 files changed, 2 insertions(+), 102 deletions(-)
 delete mode 100644 srcpkgs/qupzilla1/patches/musl-execinfo.patch
 delete mode 100644 srcpkgs/qupzilla1/patches/qt-5.10.patch
 delete mode 100644 srcpkgs/qupzilla1/patches/qt-5.11.patch
 delete mode 100644 srcpkgs/qupzilla1/template
 delete mode 100644 srcpkgs/qupzilla1/update

diff --git a/srcpkgs/qupzilla1/patches/musl-execinfo.patch b/srcpkgs/qupzilla1/patches/musl-execinfo.patch
deleted file mode 100644
index b9ace1257b4d..000000000000
--- a/srcpkgs/qupzilla1/patches/musl-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main/main.cpp	2015-01-26 15:26:15.000000000 +0100
-+++ src/main/main.cpp	2015-07-06 09:35:37.741814165 +0200
-@@ -22,7 +22,7 @@
- #include <QMessageBox> // For QT_REQUIRE_VERSION
- #include <iostream>
- 
--#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__)
-+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(__FreeBSD__) || defined(__HAIKU__)
- #include <signal.h>
- #include <execinfo.h>
- 
-@@ -166,7 +166,7 @@
-     QApplication::setGraphicsSystem(QSL("raster"));
- #endif
- 
--#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__)
-+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(__FreeBSD__)
-     signal(SIGSEGV, qupzilla_signal_handler);
- #endif
- 
diff --git a/srcpkgs/qupzilla1/patches/qt-5.10.patch b/srcpkgs/qupzilla1/patches/qt-5.10.patch
deleted file mode 100644
index b1d054378f30..000000000000
--- a/srcpkgs/qupzilla1/patches/qt-5.10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/sweord/qupzilla/commit/5bdd369c9514d481cf3d0761a383e087cead97c9
-
---- src/lib/webtab/searchtoolbar.ui
-+++ src/lib/webtab/searchtoolbar.ui
-@@ -64,9 +64,6 @@
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
--     <property name="shortcut">
--      <string notr="true">Ctrl+Shift+G</string>
--     </property>
-      <property name="autoRaise">
-       <bool>true</bool>
-      </property>
-@@ -80,9 +77,6 @@
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
--     <property name="shortcut">
--      <string notr="true">Ctrl+G</string>
--     </property>
-      <property name="autoRaise">
-       <bool>true</bool>
-      </property>
---- src/lib/webtab/searchtoolbar.cpp.orig
-+++ src/lib/webtab/searchtoolbar.cpp
-@@ -35,7 +35,9 @@
- 
-     ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton));
-     ui->next->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowDown));
-+    ui->next->setShortcut(QKeySequence("Ctrl+G"));
-     ui->previous->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowUp));
-+    ui->previous->setShortcut(QKeySequence("Ctrl+Shift+G"));
- 
-     connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(hide()));
-     connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(findNext()));
diff --git a/srcpkgs/qupzilla1/patches/qt-5.11.patch b/srcpkgs/qupzilla1/patches/qt-5.11.patch
deleted file mode 100644
index 0b083aa073f1..000000000000
--- a/srcpkgs/qupzilla1/patches/qt-5.11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lib/adblock/adblockmanager.cpp	2015-11-11 16:13:24.000000000 +0100
-+++ src/lib/adblock/adblockmanager.cpp	2019-05-14 15:22:20.780352476 +0200
-@@ -32,6 +32,7 @@
- #include <QTextStream>
- #include <QDir>
- #include <QTimer>
-+#include <QAction>
- 
- //#define ADBLOCK_DEBUG
- 
diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
deleted file mode 100644
index e72f0f95897e..000000000000
--- a/srcpkgs/qupzilla1/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'qupzilla1'
-pkgname=qupzilla1
-version=1.8.9
-revision=16
-wrksrc="QupZilla-${version}"
-build_style=qmake
-hostmakedepends="pkg-config"
-makedepends="qt5-script-devel qt5-tools-devel qt5-webkit-devel
- qt5-x11extras-devel hunspell-devel"
-depends="qt5-plugin-sqlite"
-short_desc="Lightweight multiplatform browser"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-3.0-or-later"
-homepage="https://qupzilla.com/"
-distfiles="https://github.com/QupZilla/qupzilla/releases/download/v${version}/QupZilla-${version}.tar.xz"
-checksum=620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac
-conflicts="qupzilla>=0"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools"
-	hostmakedepends+=" qt5-script-devel"
-	hostmakedepends+=" qt5-tools-devel"
-	hostmakedepends+=" qt5-webkit-devel"
-	hostmakedepends+=" qt5-x11extras-devel"
-fi
-
-do_build() {
-	# Avoid disable_parallel_build=yes by re-running make once
-	make ${makejobs} ${make_build_args} ${make_build_target} \
-		CC="$CC" CXX="$CXX" LINK="$CXX" || \
-	make ${makejobs} ${make_build_args} ${make_build_target} \
-		CC="$CC" CXX="$CXX" LINK="$CXX"
-}
diff --git a/srcpkgs/qupzilla1/update b/srcpkgs/qupzilla1/update
deleted file mode 100644
index 19da2736875d..000000000000
--- a/srcpkgs/qupzilla1/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=http://github.com/QupZilla/qupzilla/tags/
-pattern='\K1\.[89]+\.[\d]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c4dc2785068c..7091b354b4c2 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=29
+revision=30
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -200,6 +200,7 @@ replaces="
  python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4
  qucs<=0.0.19_2
+ qupzilla1<=1.8.9_16
  qt<=4.8.7_29
  qt-designer<=4.8.7_29
  qt-designer-devel<=4.8.7_29

From 4921058bb54261c8177260e5fe94a42b92cb23de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 15 Feb 2021 03:01:15 -0300
Subject: [PATCH 1755/3458] gcc: don't throw exception on locales other than
 "C" on musl.

libtsdc++'s generic locale implementation is stuck in ~2003,
unfortunately, and just throws an exception if locales other than "C"
are used. Some applications catch this error, but they shouldn't have
to, so we will import a patch to disable the exception. It is a
workaround, and the best solution is adding a proper generic
implementation to libstdc++.

Fixes #18659
---
 srcpkgs/gcc/patches/musl-generic-locale.patch | 16 ++++++++++++++++
 srcpkgs/gcc/template                          |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gcc/patches/musl-generic-locale.patch

diff --git a/srcpkgs/gcc/patches/musl-generic-locale.patch b/srcpkgs/gcc/patches/musl-generic-locale.patch
new file mode 100644
index 000000000000..9f459d0d9baf
--- /dev/null
+++ b/srcpkgs/gcc/patches/musl-generic-locale.patch
@@ -0,0 +1,16 @@
+See
+https://inbox.vuxu.org/musl/551d3310-039f-23c4-608e-5e15e625f638@sholland.org/
+
+diff --git gcc-5.4.0/libstdc++-v3/config/locale/generic/c_locale.cc.orig gcc-5.4.0/libstdc++-v3/config/locale/generic/c_locale.cc
+--- libstdc++-v3/config/locale/generic/c_locale.cc.orig
++++ libstdc++-v3/config/locale/generic/c_locale.cc
+@@ -213,9 +213,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+     // Currently, the generic model only supports the "C" locale.
+     // See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html
+     __cloc = 0;
+-    if (strcmp(__s, "C"))
+-      __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
+-			    "name not valid"));
+   }
+ 
+   void
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index c838403941c8..ba7084934857 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -15,7 +15,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=2
+revision=3
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"

From d4de0c8b99e2179a0bc1fae854890397128b5fe7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 18 Feb 2021 21:34:35 +0100
Subject: [PATCH 1756/3458] qed: update to 1.0.2.

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

diff --git a/srcpkgs/qed/template b/srcpkgs/qed/template
index 17696827b511..58be554924e1 100644
--- a/srcpkgs/qed/template
+++ b/srcpkgs/qed/template
@@ -1,6 +1,6 @@
 # Template file for 'qed'
 pkgname=qed
-version=1.0.1
+version=1.0.2
 revision=1
 wrksrc="QED-${version}"
 build_style=gnu-makefile
@@ -9,10 +9,10 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"  # Usenix Tape
 homepage="https://github.com/phonologus/QED"
 distfiles="https://github.com/phonologus/QED/archive/v${version}.tar.gz"
-checksum=80a3a71e2cbb8d666c3c18b69afc45986153152b2db8ff3610fe89de83bfe5db
+checksum=e0d27f76bfd9089623233e68eba9d23a3c221e15418c70fddef7e4a03535bdfd
 
 do_install() {
 	vbin qed
 	vman doc/qed.1
-	vman doc/qed-tutorial.1
+	vdoc doc/qed-tutorial.html
 }

From fa6254aa68eb03a983e448b8470131b96cd2f489 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 18 Feb 2021 23:29:40 +0100
Subject: [PATCH 1757/3458] python3-boto3: update to 1.17.9.

---
 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 dc6de94ac281..5e164d0171b3 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.17.3
+version=1.17.9
 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=31b4ecb153257e4f13229254a0b2a4d7d435ed51762ebd0410423817bbf4301c
+checksum=4a72a1d85b0621ccdaf7965568a6aebdfd9cfef9076302f7566fc482195b9fce
 
 post_install() {
 	vlicense LICENSE

From f97cbe78287e7c70b0d141cfdb48b0f0dfcc64c7 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 17 Feb 2021 18:35:42 +0100
Subject: [PATCH 1758/3458] taizen: remove package

Broken, no tagged releases.
---
 srcpkgs/removed-packages/template         |  1 +
 srcpkgs/taizen/patches/libressl-2.9.patch | 10 ---------
 srcpkgs/taizen/template                   | 25 -----------------------
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 srcpkgs/taizen/patches/libressl-2.9.patch
 delete mode 100644 srcpkgs/taizen/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7091b354b4c2..532d50f4b9ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -229,6 +229,7 @@ replaces="
  sqlite-replication<=3.32.3_2
  tagainijisho<=1.0.3_1
  tlsdate<=0.0.13_16
+ taizen<=0.0.0.20180808_4
  ttyload-git<=20141117_4
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
diff --git a/srcpkgs/taizen/patches/libressl-2.9.patch b/srcpkgs/taizen/patches/libressl-2.9.patch
deleted file mode 100644
index e38d7460a781..000000000000
--- a/srcpkgs/taizen/patches/libressl-2.9.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Cargo.toml.orig  2018-10-30 00:39:37.753448674 +0100
-+++ Cargo.toml       2018-10-30 00:40:01.649440996 +0100
-@@ -13,3 +13,7 @@
- urlencoding = "1.0.0"
- clap = "2.32.0"
- lazy_static = "1.0.2"
-+
-+
-+[patch.crates-io]
-+openssl-sys = {git = 'https://github.com/jnbr/rust-openssl', rev = "5675404012996556db6bef9f8589536241561699"}
diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
deleted file mode 100644
index fe2e78bc7235..000000000000
--- a/srcpkgs/taizen/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'taizen'
-pkgname=taizen
-version=0.0.0.20180808
-revision=4
-_githash=39f77b5c1128d710b12244e433677daaf87c085e
-wrksrc="${pkgname}-${_githash}"
-build_style=cargo
-hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
-short_desc="Browse mediawiki pages from the command line"
-maintainer="travankor <travankor@tuta.io>"
-license="MIT"
-homepage="https://github.com/NerdyPepper/taizen"
-distfiles="${homepage}/archive/${_githash}.tar.gz"
-checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
-nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.35
-}
-
-post_install() {
-	vlicense LICENSE
-}

From 9b9080215edbf9f1cbdd71559593ff009f5330a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:37:20 -0300
Subject: [PATCH 1759/3458] python3: apply patch for RCE in ctype
 representation.

---
 ...cbe694743cee120457aa6626712f7799a932.patch | 186 ++++++++++++++++++
 srcpkgs/python3/template                      |   2 +-
 2 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3/patches/c347cbe694743cee120457aa6626712f7799a932.patch

diff --git a/srcpkgs/python3/patches/c347cbe694743cee120457aa6626712f7799a932.patch b/srcpkgs/python3/patches/c347cbe694743cee120457aa6626712f7799a932.patch
new file mode 100644
index 000000000000..59fd8ad5eb2a
--- /dev/null
+++ b/srcpkgs/python3/patches/c347cbe694743cee120457aa6626712f7799a932.patch
@@ -0,0 +1,186 @@
+From c347cbe694743cee120457aa6626712f7799a932 Mon Sep 17 00:00:00 2001
+From: "Miss Islington (bot)"
+ <31488909+miss-islington@users.noreply.github.com>
+Date: Mon, 18 Jan 2021 13:29:31 -0800
+Subject: [PATCH] closes bpo-42938: Replace snprintf with Python unicode
+ formatting in ctypes param reprs. (GH-24247)
+
+(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7)
+
+Co-authored-by: Benjamin Peterson <benjamin@python.org>
+
+Co-authored-by: Benjamin Peterson <benjamin@python.org>
+---
+ Lib/ctypes/test/test_parameters.py            | 43 ++++++++++++++++
+ .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst  |  2 +
+ Modules/_ctypes/callproc.c                    | 51 +++++++------------
+ 3 files changed, 64 insertions(+), 32 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+
+diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py
+index e4c25fd880cef..531894fdec838 100644
+--- Lib/ctypes/test/test_parameters.py
++++ Lib/ctypes/test/test_parameters.py
+@@ -201,6 +201,49 @@ def __dict__(self):
+         with self.assertRaises(ZeroDivisionError):
+             WorseStruct().__setstate__({}, b'foo')
+ 
++    def test_parameter_repr(self):
++        from ctypes import (
++            c_bool,
++            c_char,
++            c_wchar,
++            c_byte,
++            c_ubyte,
++            c_short,
++            c_ushort,
++            c_int,
++            c_uint,
++            c_long,
++            c_ulong,
++            c_longlong,
++            c_ulonglong,
++            c_float,
++            c_double,
++            c_longdouble,
++            c_char_p,
++            c_wchar_p,
++            c_void_p,
++        )
++        self.assertRegex(repr(c_bool.from_param(True)), r"^<cparam '\?' at 0x[A-Fa-f0-9]+>$")
++        self.assertEqual(repr(c_char.from_param(97)), "<cparam 'c' ('a')>")
++        self.assertRegex(repr(c_wchar.from_param('a')), r"^<cparam 'u' at 0x[A-Fa-f0-9]+>$")
++        self.assertEqual(repr(c_byte.from_param(98)), "<cparam 'b' (98)>")
++        self.assertEqual(repr(c_ubyte.from_param(98)), "<cparam 'B' (98)>")
++        self.assertEqual(repr(c_short.from_param(511)), "<cparam 'h' (511)>")
++        self.assertEqual(repr(c_ushort.from_param(511)), "<cparam 'H' (511)>")
++        self.assertRegex(repr(c_int.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
++        self.assertRegex(repr(c_uint.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
++        self.assertRegex(repr(c_long.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
++        self.assertRegex(repr(c_ulong.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
++        self.assertRegex(repr(c_longlong.from_param(20000)), r"^<cparam '[liq]' \(20000\)>$")
++        self.assertRegex(repr(c_ulonglong.from_param(20000)), r"^<cparam '[LIQ]' \(20000\)>$")
++        self.assertEqual(repr(c_float.from_param(1.5)), "<cparam 'f' (1.5)>")
++        self.assertEqual(repr(c_double.from_param(1.5)), "<cparam 'd' (1.5)>")
++        self.assertEqual(repr(c_double.from_param(1e300)), "<cparam 'd' (1e+300)>")
++        self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^<cparam ('d' \(1.5\)|'g' at 0x[A-Fa-f0-9]+)>$")
++        self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^<cparam 'z' \(0x[A-Fa-f0-9]+\)>$")
++        self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^<cparam 'Z' \(0x[A-Fa-f0-9]+\)>$")
++        self.assertRegex(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' \(0x0*12\)>$")
++
+ ################################################################
+ 
+ if __name__ == '__main__':
+diff --git a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+new file mode 100644
+index 0000000000000..7df65a156feab
+--- /dev/null
++++ b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
+@@ -0,0 +1,2 @@
++Avoid static buffers when computing the repr of :class:`ctypes.c_double` and
++:class:`ctypes.c_longdouble` values.
+diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
+index b0a36a30248f7..f2506de54498e 100644
+--- Modules/_ctypes/callproc.c
++++ Modules/_ctypes/callproc.c
+@@ -489,58 +489,47 @@ is_literal_char(unsigned char c)
+ static PyObject *
+ PyCArg_repr(PyCArgObject *self)
+ {
+-    char buffer[256];
+     switch(self->tag) {
+     case 'b':
+     case 'B':
+-        sprintf(buffer, "<cparam '%c' (%d)>",
++        return PyUnicode_FromFormat("<cparam '%c' (%d)>",
+             self->tag, self->value.b);
+-        break;
+     case 'h':
+     case 'H':
+-        sprintf(buffer, "<cparam '%c' (%d)>",
++        return PyUnicode_FromFormat("<cparam '%c' (%d)>",
+             self->tag, self->value.h);
+-        break;
+     case 'i':
+     case 'I':
+-        sprintf(buffer, "<cparam '%c' (%d)>",
++        return PyUnicode_FromFormat("<cparam '%c' (%d)>",
+             self->tag, self->value.i);
+-        break;
+     case 'l':
+     case 'L':
+-        sprintf(buffer, "<cparam '%c' (%ld)>",
++        return PyUnicode_FromFormat("<cparam '%c' (%ld)>",
+             self->tag, self->value.l);
+-        break;
+ 
+     case 'q':
+     case 'Q':
+-        sprintf(buffer,
+-#ifdef MS_WIN32
+-            "<cparam '%c' (%I64d)>",
+-#else
+-            "<cparam '%c' (%lld)>",
+-#endif
++        return PyUnicode_FromFormat("<cparam '%c' (%lld)>",
+             self->tag, self->value.q);
+-        break;
+     case 'd':
+-        sprintf(buffer, "<cparam '%c' (%f)>",
+-            self->tag, self->value.d);
+-        break;
+-    case 'f':
+-        sprintf(buffer, "<cparam '%c' (%f)>",
+-            self->tag, self->value.f);
+-        break;
+-
++    case 'f': {
++        PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d);
++        if (f == NULL) {
++            return NULL;
++        }
++        PyObject *result = PyUnicode_FromFormat("<cparam '%c' (%R)>", self->tag, f);
++        Py_DECREF(f);
++        return result;
++    }
+     case 'c':
+         if (is_literal_char((unsigned char)self->value.c)) {
+-            sprintf(buffer, "<cparam '%c' ('%c')>",
++            return PyUnicode_FromFormat("<cparam '%c' ('%c')>",
+                 self->tag, self->value.c);
+         }
+         else {
+-            sprintf(buffer, "<cparam '%c' ('\\x%02x')>",
++            return PyUnicode_FromFormat("<cparam '%c' ('\\x%02x')>",
+                 self->tag, (unsigned char)self->value.c);
+         }
+-        break;
+ 
+ /* Hm, are these 'z' and 'Z' codes useful at all?
+    Shouldn't they be replaced by the functionality of c_string
+@@ -549,22 +538,20 @@ PyCArg_repr(PyCArgObject *self)
+     case 'z':
+     case 'Z':
+     case 'P':
+-        sprintf(buffer, "<cparam '%c' (%p)>",
++        return PyUnicode_FromFormat("<cparam '%c' (%p)>",
+             self->tag, self->value.p);
+         break;
+ 
+     default:
+         if (is_literal_char((unsigned char)self->tag)) {
+-            sprintf(buffer, "<cparam '%c' at %p>",
++            return PyUnicode_FromFormat("<cparam '%c' at %p>",
+                 (unsigned char)self->tag, (void *)self);
+         }
+         else {
+-            sprintf(buffer, "<cparam 0x%02x at %p>",
++            return PyUnicode_FromFormat("<cparam 0x%02x at %p>",
+                 (unsigned char)self->tag, (void *)self);
+         }
+-        break;
+     }
+-    return PyUnicode_FromString(buffer);
+ }
+ 
+ static PyMemberDef PyCArgType_members[] = {
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a924..5f517d9f044b 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,7 +4,7 @@
 #
 pkgname=python3
 version=3.9.1
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"

From e0af1a552a69653a6b231cc7917a31fb8982625c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 18 Feb 2021 22:05:02 +0200
Subject: [PATCH 1760/3458] skype: update to 8.69.0.77.

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

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index b90602697801..4776c3120ebc 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.68.0.100
+version=8.69.0.77
 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=8078e041174d0013be47e7dc0eeac70c042d6697242312db38333a4f1cfe2c7e
+checksum=3daaa53e9f81452d1c1fb5c8e31d7fe47a98b62eb7ad04e1993b4f6a0848407d
 repository="nonfree"
 nostrip="yes"
 

From 32511f2cab1bae0dc1cfec5ec7ed8d8318466016 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 18 Feb 2021 22:01:55 +0100
Subject: [PATCH 1761/3458] whois: update to 5.5.8.

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

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index c0e86f4decec..f8176385d374 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,6 +1,6 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.5.7
+version=5.5.8
 revision=1
 wrksrc=whois
 hostmakedepends="perl pkg-config gettext"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.linux.it/~md/software"
 changelog="https://raw.githubusercontent.com/rfc1036/whois/next/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.tar.xz"
-checksum=3efa700dbf38d127c31b21af3176cd6e5a69f96a056be60ac1dcd13df7717393
+checksum=cd9e7bad3b6968182bfcc311e22be3aec9a974397377d748845147884ce07547
 
 alternatives="
  whois:whois:/usr/bin/gwhois

From 39f7a4c1eef7d1d10553f01931c7fc7205985bcd Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Wed, 17 Feb 2021 11:41:55 +0200
Subject: [PATCH 1762/3458] dav1d: update to 0.8.1

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

diff --git a/common/shlibs b/common/shlibs
index 8d32c3af15c2..d9eb36d27dc7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3465,7 +3465,7 @@ libcsfml-window.so.2.5 CSFML-2.5_1
 libcsfml-system.so.2.5 CSFML-2.5_1
 libcsfml-network.so.2.5 CSFML-2.5_1
 libtokyocabinet.so.9 tokyocabinet-1.4.48_1
-libdav1d.so.4 libdav1d4-0.6.0_1
+libdav1d.so.5 libdav1d4-0.8.1_1
 libdqlite.so.0 dqlite-0.2.1_1
 libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1
 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
diff --git a/srcpkgs/dav1d/template b/srcpkgs/dav1d/template
index ada220417459..483f61feb17d 100644
--- a/srcpkgs/dav1d/template
+++ b/srcpkgs/dav1d/template
@@ -1,18 +1,18 @@
 # Template file for 'dav1d'
 pkgname=dav1d
-version=0.7.0
+version=0.8.1
 revision=1
 build_style=meson
 configure_args="-Denable_tests=true -Denable_asm=true -Denable_tools=true
  -Dfuzzing_engine=none -Dtestdata_tests=false"
 hostmakedepends="nasm"
 short_desc="Small and fast AV1 Decoder"
-maintainer="mustaqim <mustaqim@pm.me>"
+maintainer="mustaqim <git@mustaqim.ml>"
 license="BSD-2-Clause"
 homepage="https://code.videolan.org/videolan/dav1d"
 changelog="https://code.videolan.org/videolan/dav1d/raw/master/NEWS"
 distfiles="https://code.videolan.org/videolan/dav1d/-/archive/${version}/dav1d-${version}.tar.bz2"
-checksum=8057149f5f08c5ca47e1344fba9046ff84ac85ca409d7adbec8268c707ec5c19
+checksum=842da2945afcf54e651d17112bf2823a238e6c935a6c8dff3a8e96a2eb740269
 
 libdav1d4_package() {
 	short_desc+=" - runtime library"

From 76e571e70e0d860026c105f52bb145ba4845cb87 Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Thu, 18 Feb 2021 05:40:41 +0200
Subject: [PATCH 1763/3458] ffmpeg: revbump to build against libdav1d4

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

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 9879cb0e3aa6..5a79f1292c44 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=5
+revision=6
 short_desc="Decoding, encoding and streaming software"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"

From b8e2de59d4625091e3efa1a6f3da5030c9840f61 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 17 Feb 2021 18:29:39 +0100
Subject: [PATCH 1764/3458] scrcpy: update to 1.17.

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

diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index 189558ddc036..63f911d60458 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,6 +1,6 @@
 # Template file for 'scrcpy'
 pkgname=scrcpy
-version=1.16
+version=1.17
 revision=1
 build_style=meson
 configure_args="-Dcompile_server=false
@@ -14,8 +14,8 @@ license="Apache-2.0"
 homepage="https://github.com/Genymobile/scrcpy"
 distfiles="${homepage}/archive/v${version}.tar.gz
  ${homepage}/releases/download/v${version}/scrcpy-server-v${version}"
-checksum="94cbd59e26faa08ca25d5126d6c8d45e831b6a9e716ce05cd57bc4bcc751f742
- 94a79e05b4498d0460ab7bd9d12cbf05156e3a47bf0c5d1420cee1d4493b3832"
+checksum="c16f1fe1789290d0c7dd3a2778f33d6dc6347ffe3e78e64127b85eda52420d7f
+ 11b5ad2d1bc9b9730fb7254a78efd71a8ff46b1938ff468e47a21b653a1b6725"
 skip_extraction="scrcpy-server-v${version}"
 
 post_install() {

From bbb6ee78bc1d846799db861a8588597390ba02d1 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 17 Feb 2021 18:21:18 +0100
Subject: [PATCH 1765/3458] rmapi: update to 0.0.13.

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

diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index 621596030a5c..6fa65a895be1 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,6 +1,6 @@
 # Template file for 'rmapi'
 pkgname=rmapi
-version=0.0.12
+version=0.0.13
 revision=1
 build_style=go
 go_import_path=github.com/juruen/rmapi
@@ -9,4 +9,4 @@ maintainer="Patrick Pichler <mail@patrickpichler.dev>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/juruen/rmapi"
 distfiles="https://github.com/juruen/rmapi/archive/v${version}${_status}.tar.gz"
-checksum=2f647adc748641182d18e1c0c9cd89d829051dbe2902cbdbbcf3ea26e7aeb90a
+checksum=afaf438f0408af6fcadf73eb06b4c548ab678036eaf32bb825255e19f74a7157

From 74ddb6ec2c32e1aed4b525de9d32b0192625b017 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Feb 2021 20:54:58 +0200
Subject: [PATCH 1766/3458] growlight: update to 1.2.31.

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

diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 3e5826aff171..a3f358a2a467 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.28
+version=1.2.31
 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=eb43a380dd2c9c50d175d7268b6825e7967aa8f4678ef323b18532637ae215cf
+checksum=25cf643d99be88d299756ccb2933868641abecbc26793f5d87cfae93a461e2d6
 
 build_options="man zfs"
 

From 83afa669d11c1c845bc66b829156bd5e1e410786 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Wed, 17 Feb 2021 09:53:39 +0000
Subject: [PATCH 1767/3458] gnome-desktop: update to 3.38.4.

---
 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 1d225d66abff..4e98eea5eeaa 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.3
+version=3.38.4
 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=bfe00257b2bb59fff04ac1c144804084d1c253e66f9d7408f6060bbf7ad1d831
+checksum=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
 
 build_options="gir"
 build_options_default="gir"

From c0cfa7a679d0685624cfb87a89772304ed1cbb23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:04:18 -0300
Subject: [PATCH 1768/3458] goproxy: remove package.

Upstream removes tarballs (package is therefore currently broken),
licensing is weird and upstream repository even has ads in README.
---
 srcpkgs/goproxy/template          | 13 -------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 srcpkgs/goproxy/template

diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
deleted file mode 100644
index 437471ffa752..000000000000
--- a/srcpkgs/goproxy/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'goproxy'
-pkgname=goproxy
-version=7.0
-revision=1
-build_style=go
-go_import_path=github.com/snail007/goproxy
-hostmakedepends="git"
-short_desc="High performance HTTP(S), websocket, TCP, UDP, Socks5 proxy server"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/snail007/goproxy"
-distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
-checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 532d50f4b9ae..657f6e7057dd 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -46,6 +46,7 @@ replaces="
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goffice0.8<=0.8.17_6
+ goproxy<=7.0_1
  gst1-python<=1.18.3_1
  grv<=0.3.1_3
  gtkhtml<=4.10.0_1

From 86688e5d4b39ae564a927c0d7cf68b9605031f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 22:57:31 -0300
Subject: [PATCH 1769/3458] go-gdm: remove package.

No longer used by any template, last updated in 2017.
---
 srcpkgs/go-gdm/template           | 15 ---------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 srcpkgs/go-gdm/template

diff --git a/srcpkgs/go-gdm/template b/srcpkgs/go-gdm/template
deleted file mode 100644
index 771731945abe..000000000000
--- a/srcpkgs/go-gdm/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'go-gdm'
-pkgname=go-gdm
-version=1.4
-revision=7
-build_style=go
-hostmakedepends="git"
-short_desc="Go dependency manager - gdm"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Unlicense"
-go_import_path="github.com/sparrc/gdm"
-homepage="https://${go_import_path}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=2ac8800319d922fe2816e57f30e23ddd9a11ce2e93294c533318b9f081debde4
-conflicts="gdm"
-wrksrc="gdm-${version}"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 657f6e7057dd..42b7d98db366 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -47,6 +47,7 @@ replaces="
  go1.4-bootstrap<=20171003_2
  goffice0.8<=0.8.17_6
  goproxy<=7.0_1
+ go-gdm<=1.4_7
  gst1-python<=1.18.3_1
  grv<=0.3.1_3
  gtkhtml<=4.10.0_1

From 2392b93f02ef9e3842fad2c2584bee798c82a099 Mon Sep 17 00:00:00 2001
From: Simon Persson <simon@flaskpost.me>
Date: Thu, 18 Feb 2021 20:53:45 +0100
Subject: [PATCH 1770/3458] ncmpc: update to 0.45

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

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index 72207b651614..683ec13e85a3 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,6 +1,6 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
-version=0.44
+version=0.45
 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=e9cf0ef9e052d55ec3e863f04724fd0cfe1a1e15e1c0017eed820906690eb58c
+checksum=17ff446447e002f2ed4342b7324263a830df7d76bcf177dce928f7d3a6f1f785
 
 post_install() {
 	vmkdir usr/share/examples/ncmpc

From 10215170a20b78e0567d49ef48e9a00f226a687c Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Wed, 17 Feb 2021 20:54:32 +0100
Subject: [PATCH 1771/3458] swirc: update to 3.2.6.

---
 srcpkgs/swirc/template | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c4476706..6470d870df6a 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,6 +1,6 @@
 # Template file for 'swirc'
 pkgname=swirc
-version=3.2.5
+version=3.2.6
 revision=1
 build_style=configure
 make_install_args="PREFIX=/usr"
@@ -12,7 +12,7 @@ maintainer="Markus Uhlin <markus.uhlin@bredband.net>"
 license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.nifty-networks.net/swirc"
 distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="79ff8ee8e08bbbc313b9abb0f2c1641395a903b5ea114b8223cdaa71ec880ee0"
+checksum="dc451cdfcfba14e4b891bc35392ec845485d16ce1b945e3e4cd18b3278102498"
 
 post_configure() {
 	local _file="options.mk"
@@ -25,6 +25,18 @@ post_configure() {
 	vsed -i "$_file" -e "s/CXX=/CXX?=/"
 }
 
+post_check() {
+	# "make clean" is needed here because after running "make
+	# check" multiple objects in the main source dir and its
+	# subdirectories have been compiled with the intention to make
+	# unittesting possible by simulating real behavior. The
+	# main-symbol is also stripped (i.e. removed) from the main.o
+	# file during the "make check" phase. Thus a fresh rebuild is
+	# needed.
+	make clean
+	make ${makejobs}
+}
+
 post_install() {
 	vlicense debian/copyright COPYING
 }

From 5e063977771ef166ab351d2351b90fbf9e138249 Mon Sep 17 00:00:00 2001
From: gavin <gavin.downard@runbox.com>
Date: Sat, 13 Feb 2021 18:28:49 -0800
Subject: [PATCH 1772/3458] zsh-syntax-highlighting: add .plugin.zsh

And use install target instead of manually copying files.

Closes: #28740 [via git-merge-pr]
---
 srcpkgs/zsh-syntax-highlighting/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/zsh-syntax-highlighting/template b/srcpkgs/zsh-syntax-highlighting/template
index b655d88568ac..db65bce4940a 100644
--- a/srcpkgs/zsh-syntax-highlighting/template
+++ b/srcpkgs/zsh-syntax-highlighting/template
@@ -1,7 +1,7 @@
 # Template file for 'zsh-syntax-highlighting'
 pkgname=zsh-syntax-highlighting
 version=0.7.1
-revision=2
+revision=3
 depends="zsh"
 short_desc="Fish shell like syntax highlighting for Zsh"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,9 +12,7 @@ distfiles="${homepage}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=f5044266ee198468b1bcec881a56e6399e209657d6ed9fa6d21175bc76afdefa
 
 do_install() {
-	vinstall ${pkgname}.zsh 644 usr/share/zsh/plugins/${pkgname}
-	vinstall .version 644 usr/share/zsh/plugins/${pkgname}
-	vinstall .revision-hash 644 usr/share/zsh/plugins/${pkgname}
-	vcopy highlighters usr/share/zsh/plugins/${pkgname}
+	make install SHARE_DIR=${DESTDIR}/usr/share/zsh/plugins/${pkgname} DOC_DIR=${DESTDIR}/usr/share/zsh/plugins/${pkgname}/doc
+	vinstall ${pkgname}.plugin.zsh 644 usr/share/zsh/plugins/${pkgname}
 	vlicense COPYING.md
 }

From e60eb232ba5d2b227841b1113d22de4747a2f7fe Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 15:19:02 +0100
Subject: [PATCH 1773/3458] ardour: update to 6.5.0

fix ARM build
---
 .../patches/fix-musl-platform-detection.patch       | 13 +++++++++++++
 srcpkgs/ardour/template                             | 13 ++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/ardour/patches/fix-musl-platform-detection.patch

diff --git a/srcpkgs/ardour/patches/fix-musl-platform-detection.patch b/srcpkgs/ardour/patches/fix-musl-platform-detection.patch
new file mode 100644
index 000000000000..8f2d29cc423f
--- /dev/null
+++ b/srcpkgs/ardour/patches/fix-musl-platform-detection.patch
@@ -0,0 +1,13 @@
+On musl libc only __linux__ is defined
+
+--- libs/vst3/pluginterfaces/base/fplatform.h
++++ libs/vst3/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ 	#define SMTG_OS_LINUX	1
+ 	#define SMTG_OS_MACOS	0
+ 	#define SMTG_OS_WINDOWS	0
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index fcedeb358a1a..7fb37a367697 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.3.0
+version=6.5.0
 revision=1
 wrksrc="Ardour-${version}"
 build_style=waf3
@@ -13,12 +13,13 @@ makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
  vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2
  sratom-devel gtkmm2-devel libarchive-devel fluidsynth-devel hidapi-devel
  libltc-devel glibmm-devel"
+depends="desktop-file-utils"
 short_desc="Professional-grade digital audio workstation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ardour.org"
 distfiles="https://community.ardour.org/src/Ardour-${version}.tar.bz2"
-checksum=93418636d7d93f66bdf479ed5bf3c6b0cc0198dc8f76c5555110d3147e4ec74b
+checksum=ac981ec7565fa8a171116bc2fbeb3198a01aad4b7d7c846f965e074a8a162bdb
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*)  configure_args+=" --dist-target=x86_64" ;;
@@ -26,13 +27,7 @@ case "$XBPS_TARGET_MACHINE" in
 	aarch64*) configure_args+=" --dist-target=aarch64" ;;
 	ppc64*)   configure_args+=" --dist-target=ppc64" ;;
 	ppc*)     configure_args+=" --dist-target=ppc" ;;
-	# Seriously, build system for arm is broken
-	# They don't use cflags from pkg-config
-	# We need to append output of
-	# pkg-config --cflags glibmm-2.4 libxml-2.0
-	# into both CFLAGS and CXXFLAGS, and it's still run into failure.
-	# Maybe better with NEON on, I don't know
-	arm*)     broken="You are compiling libardour on a platform for which ardour/cycles.h needs work" ;;
+	arm*)     configure_args+=" --dist-target=armhf" ;;
 	*)        broken="Don't know build target" ;;
 esac
 

From 49eb680303a7e16ec8aa0a37f4dca8b4e4a327c6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 19 Feb 2021 14:10:35 +0100
Subject: [PATCH 1774/3458] bdf2psf: update to 1.201.

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

diff --git a/srcpkgs/bdf2psf/template b/srcpkgs/bdf2psf/template
index 9a1102666956..bb70982e4ec6 100644
--- a/srcpkgs/bdf2psf/template
+++ b/srcpkgs/bdf2psf/template
@@ -1,6 +1,6 @@
 # Template file for 'bdf2psf'
 pkgname=bdf2psf
-version=1.200
+version=1.201
 revision=1
 wrksrc="console-setup-${version}"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/bdf2psf"
 distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=dea2eb7e1a278cdc902f6a672b2833d7f27d47b26089bd411bf17e544208c6f0
+checksum=a82e4b675bead927082945b977077510bc2c30d5ad33feb7026486ffb05fad0d
 
 post_extract() {
 	sed -i '44s/if (/if (\$\#ARGV \< 0 \|\| /' Fonts/bdf2psf

From 849ef80d27b207e670821dacd0b5c60b918d49b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 19 Feb 2021 14:13:57 +0100
Subject: [PATCH 1775/3458] passwdqc: update to 2.0.0.

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

diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template
index cf1496061805..11c67086cc15 100644
--- a/srcpkgs/passwdqc/template
+++ b/srcpkgs/passwdqc/template
@@ -1,6 +1,6 @@
 # Template file for 'passwdqc'
 pkgname=passwdqc
-version=1.4.0
+version=2.0.0
 revision=1
 build_style=gnu-makefile
 make_install_args="SHARED_LIBDIR=/usr/lib SECUREDIR=/usr/lib/security"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause,0BSD"
 homepage="http://www.openwall.com/passwdqc/"
 distfiles="http://www.openwall.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=72689c31c34d48349a7c2aab2cf6cf95b8d22818758aba329d5e0ead9f95fc97
+checksum=a57ae2711275d81e301bcebe531fffc100f583051e1154c73f2d9cd9ab1e4c94
 
 do_build() {
 	make ${makejobs} CC="$CC" LD="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \

From ecc74e2ac7b235aad2389b2a64de4d2ddffd7e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 22:43:44 -0300
Subject: [PATCH 1776/3458] docker2aci: remove package.

Has been archived by upstream, due to the rtk project itself being
archived.
---
 srcpkgs/docker2aci/template       | 13 -------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 srcpkgs/docker2aci/template

diff --git a/srcpkgs/docker2aci/template b/srcpkgs/docker2aci/template
deleted file mode 100644
index 0ddd50cc80be..000000000000
--- a/srcpkgs/docker2aci/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'docker2aci'
-pkgname=docker2aci
-version=0.17.2
-revision=4
-hostmakedepends="git"
-build_style=go
-short_desc="Library and CLI tool to convert Docker images to ACIs"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0"
-go_import_path="github.com/appc/docker2aci"
-homepage="https://$go_import_path"
-distfiles="$homepage/archive/v$version.tar.gz"
-checksum=43cb18a3647ca8bae48a283fa3359e9555ab7a366c7ee9ef8a561797cebe2593
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 42b7d98db366..05afd2d043ae 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -32,6 +32,7 @@ replaces="
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2
  dleyna-server<=0.6.0_2
+ docker2aci<=0.17.2_4
  ebtables<=2.0.10.4_8
  eclipse-ecj<=4.9_3
  electron7<=7.3.3_1

From d06283c3be0d020a5bc87b4fbf30ef14e084faac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 22:51:50 -0300
Subject: [PATCH 1777/3458] dht-node: remove package.

Has been broken for a long time, and upstream repository is archived.
---
 srcpkgs/dht-node/files/dht-node/run |  4 ----
 srcpkgs/dht-node/template           | 20 --------------------
 srcpkgs/removed-packages/template   |  1 +
 3 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100755 srcpkgs/dht-node/files/dht-node/run
 delete mode 100644 srcpkgs/dht-node/template

diff --git a/srcpkgs/dht-node/files/dht-node/run b/srcpkgs/dht-node/files/dht-node/run
deleted file mode 100755
index 13aeb58e5441..000000000000
--- a/srcpkgs/dht-node/files/dht-node/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec chpst -u nobody dht-node -many 1 -mem
diff --git a/srcpkgs/dht-node/template b/srcpkgs/dht-node/template
deleted file mode 100644
index 7ae65c38731b..000000000000
--- a/srcpkgs/dht-node/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'dht-node'
-pkgname=dht-node
-version=0.2.0
-revision=3
-build_style=go
-go_import_path="github.com/ipfs/dht-node"
-go_build_tags="netgo"
-hostmakedepends="git"
-short_desc="IPFS dht node"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="MIT"
-homepage="http://github.com/ipfs/dht-node"
-distfiles="https://github.com/ipfs/dht-node/archive/v${version}.tar.gz"
-checksum=06ce87dc4c62b0f960eaa7e0d3c2d1adc1c5335361391faa5c7587bc2e4b59c1
-broken="missing distfile and modules"
-
-post_install() {
-	vlicense LICENSE
-	vsv dht-node
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 05afd2d043ae..1b7ad14c2f86 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -28,6 +28,7 @@ replaces="
  couchdb<=1.7.1_2
  ctpp2<=2.8.3_7
  ctpp2-devel<=2.8.3_7
+ dht-node<=0.2.0_3
  djmount<=0.71_8
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2

From 806b5b3c8f904ac4034a3d2f3f17b971abfc8284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 00:55:24 -0300
Subject: [PATCH 1778/3458] srcpkgs/: clean up Go packages.

Fix small typos, expand some variables, leave comments for updates.
---
 srcpkgs/antibody/template        | 2 +-
 srcpkgs/caddy/template           | 1 +
 srcpkgs/chezmoi/template         | 2 +-
 srcpkgs/consul-template/template | 2 +-
 srcpkgs/consul/template          | 2 +-
 srcpkgs/crane/template           | 2 +-
 srcpkgs/dep/template             | 2 +-
 srcpkgs/docker-gen/template      | 2 +-
 srcpkgs/flint/template           | 2 +-
 srcpkgs/forego/template          | 2 +-
 srcpkgs/gendesk/template         | 2 +-
 srcpkgs/git-lfs/template         | 2 +-
 srcpkgs/gkill/template           | 2 +-
 srcpkgs/glock/template           | 2 +-
 srcpkgs/go-ipfs/template         | 4 ++--
 srcpkgs/hugo/template            | 4 ++--
 srcpkgs/lego/template            | 4 ++--
 srcpkgs/massren/template         | 4 ++--
 srcpkgs/micro/template           | 2 +-
 srcpkgs/nomad/template           | 4 ++--
 srcpkgs/peco/template            | 2 +-
 srcpkgs/sift/template            | 2 +-
 srcpkgs/tag/template             | 4 ++--
 srcpkgs/terragrunt/template      | 2 +-
 srcpkgs/vault/template           | 4 ++--
 srcpkgs/webcat/template          | 2 +-
 srcpkgs/websocketd/template      | 2 +-
 27 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index 7071501830cd..cb109f0b1837 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -9,7 +9,7 @@ short_desc="Fast and lightweight shell plugin manager"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://getantibody.github.io/"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/getantibody/antibody/archive/v${version}.tar.gz"
 checksum=87bced5fba8cf5d587ea803d33dda72e8bcbd4e4c9991a9b40b2de4babbfc24f
 
 post_install() {
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index dbae70575666..6fe986419c94 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -3,6 +3,7 @@ pkgname=caddy
 version=1.0.5
 revision=1
 build_style=go
+# XXX: use caddy/v2 when updating
 go_import_path=github.com/caddyserver/caddy
 go_package="${go_import_path}/caddy"
 hostmakedepends="git"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 5c6d47e5abc4..64326d00b139 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -12,7 +12,7 @@ short_desc="Manage your dotfiles across multiple machines, securely"
 maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
-distfiles="https://github.com/twpayne/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
 checksum=23515591028202aaf7af908e38972f156ee08022f535bc74aaa9244b82da2fa1
 
 post_install() {
diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index 3d490804ba27..00cd77f34169 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -3,7 +3,7 @@ pkgname=consul-template
 version=0.25.1
 revision=1
 build_style=go
-go_import_path="github.com/hashicorp/$pkgname"
+go_import_path="github.com/hashicorp/consul-template"
 hostmakedepends="git"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"
 maintainer="Noel Cower <ncower@nil.dev>"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index e55c4d587fd2..b6fd558b9c34 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -3,7 +3,7 @@ pkgname=consul
 version=1.8.4
 revision=1
 build_style=go
-go_import_path="github.com/hashicorp/${pkgname}"
+go_import_path="github.com/hashicorp/consul"
 _git_commit=9ea1a204d832cfd4d8c5cba9df56876a526a4531
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index 0a19c2a68a8d..edb04e896ae5 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -8,7 +8,7 @@ short_desc="Lift containers with ease"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 go_import_path="github.com/michaelsauter/crane"
-homepage="https://${go_import_path}"
+homepage="https://github.com/michaelsauter/crane"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=00f202783ae2ef3a2d0e02fba0454defe53e823b4c99e2e3b5af734dc870906e
 
diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index f2a886bc66a2..79cce5410597 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -11,7 +11,7 @@ depends="git go"
 short_desc="Go dependency management tool"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-3-Clause"
-homepage="https://${go_import_path}"
+homepage="https://github.com/golang/dep"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a
 
diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 9256fde323a0..8a1ab6c33811 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -9,7 +9,7 @@ go_import_path="github.com/jwilder/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
-homepage="https://$go_import_path"
+homepage="https://github.com/jwilder/docker-gen"
 distfiles="$homepage/archive/$version.tar.gz"
 checksum=7951b63684e4ace9eab4f87f0c5625648f8add2559fa7779fabdb141a8a83908
 
diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index 1b8ae9d964c5..9a6b0d8c0aac 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -8,7 +8,7 @@ short_desc="Check your project for common sources of contributor friction"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 go_import_path="github.com/pengwynn/flint"
-homepage="https://${go_import_path}"
+homepage="https://github.com/pengwynn/flint"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=ec865ec5cad191c7fc9c7c6d5007754372696a708825627383913367f3ef8b7f
 
diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 6f239f15efcb..315153aef009 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -8,6 +8,6 @@ short_desc="A process supervisor in Go"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 go_import_path="github.com/ddollar/forego"
-homepage="https://$go_import_path"
+homepage="https://github.com/ddollar/forego"
 distfiles="$homepage/archive/$version.tar.gz"
 checksum=23119550cc0e45191495823aebe28b42291db6de89932442326340042359b43d
diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 1c2d600d23d0..51904d9d14df 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -10,7 +10,7 @@ short_desc="Utility to generate .desktop files and download icons"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="http://roboticoverlords.org/gendesk/"
-distfiles="https://github.com/xyproto/${pkgname}/archive/${version}.tar.gz
+distfiles="https://github.com/xyproto/gendesk/archive/${version}.tar.gz
  http://roboticoverlords.org/images/default.png"
 checksum="924606ca1c15a140b70f363c4a0ac46fb3ad4d05bc39db400d0b0e41dd4456bb
  4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 588d7fe9aa3f..81f99bef2176 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -9,7 +9,7 @@ short_desc="Git extension for versioning large files"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://git-lfs.github.com/"
-distfiles="https://github.com/git-lfs/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/git-lfs/git-lfs/archive/v${version}.tar.gz"
 checksum=2b2e70f1233f7efe9a010771510391a07527ec7c0af721ecf8edabac5d60f62b
 
 post_build() {
diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index f2b9ae64a201..6c9d5adafa46 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -8,7 +8,7 @@ short_desc="Easy Process Killer"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 go_import_path="github.com/heppu/gkill"
-homepage="https://$go_import_path"
+homepage="https://github.com/heppu/gkill"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=aee86f1e18a88ecd3024c6deb3dbd6a2e385961ad8365046dc2b64596bdbb84b
 
diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 6cd6cc4c5d89..3d5eb4ea7342 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -11,6 +11,6 @@ go_import_path="github.com/robfig/glock"
 go_package="${go_import_path}"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Public Domain"
-homepage="https://$go_import_path"
+homepage="https://github.com/robfig/glock"
 distfiles="$homepage/archive/$_commit.tar.gz"
 checksum=b8fea16ccdfa4a927a8590753d44ca5bb610561f3b9e09cc1e501ef5c9351dc9
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index 4f0a7e98403f..321d7015598f 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -3,7 +3,7 @@ pkgname=go-ipfs
 version=0.7.0
 revision=2
 build_style=go
-go_import_path="github.com/ipfs/${pkgname}"
+go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
 hostmakedepends="git"
 depends="fs-repo-migrations>=1.6.4"
@@ -12,7 +12,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="MIT, Apache-2.0"
 homepage="https://ipfs.io"
 changelog="https://github.com/ipfs/go-ipfs/blob/master/CHANGELOG.md"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/ipfs/go-ipfs/archive/v${version}.tar.gz"
 checksum=152986ebb30657ab706bee708fbe929114f5e8c39fbe602e3bbec93fe74c9123
 
 system_accounts="_ipfs"
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 9b4818c6467e..8abec86a971a 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -3,7 +3,7 @@ pkgname=hugo
 version=0.80.0
 revision=1
 build_style=go
-go_import_path="github.com/gohugoio/${pkgname}"
+go_import_path="github.com/gohugoio/hugo"
 go_build_tags="$(vopt_if extended extended)"
 hostmakedepends="git"
 depends="$(vopt_if pygments python-Pygments)"
@@ -11,7 +11,7 @@ short_desc="Fast & Modern Static Website Engine"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
 checksum=4ddcd6ebea21e5fd4067db4a481ab7810e34496d5991a3520169c8f5ee1d38bb
 
 build_options="pygments extended"
diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index a71ffb026e3a..573dbdf943b6 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -3,8 +3,8 @@ pkgname=lego
 version=4.0.1
 revision=1
 build_style=go
-go_import_path="github.com/go-acme/${pkgname}/v4"
-go_package="${go_import_path}/cmd/${pkgname}"
+go_import_path="github.com/go-acme/lego/v4"
+go_package="${go_import_path}/cmd/lego"
 hostmakedepends="git"
 short_desc="Let's Encrypt client and ACME library written in Go"
 maintainer="Anachron <gith@cron.world>"
diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index db3941c71701..d3f4250b2ecb 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -7,8 +7,8 @@ hostmakedepends="git"
 short_desc="Massive renamer from command line"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
-go_import_path="github.com/laurent22/${pkgname}"
-homepage="https://${go_import_path}"
+go_import_path="github.com/laurent22/massren"
+homepage="https://github.com/laurent22/massren"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=7a728d96a9e627c3609d147db64bba60ced33c407c75e9512147a5c83ba94f56
 
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 27b87e22b7fd..c0a2842eb85a 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -6,7 +6,7 @@ build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"
 go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
-# Adding CompuileDate is bad reproducibility and adding CommitHash
+# Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
 hostmakedepends="git"
 short_desc="Modern and intuitive terminal-based text editor"
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 9ed33f12a0aa..ddaf4f6b78e9 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -3,7 +3,7 @@ pkgname=nomad
 version=1.0.1
 revision=1
 build_style=go
-go_import_path="github.com/hashicorp/${pkgname}"
+go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
 _git_commit=a480eed0815c54612856d9115a34bb1d1a773e8c
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
@@ -12,7 +12,7 @@ short_desc="Cluster scheduler designed to easily integrate into existing workflo
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
 checksum=1dca9ebb1636fc8ef005d9c6eed8cf10fbfc3d7c9ff7307606454142d858f419
 patch_args="-Np1"
 
diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 44c50774ed23..182c2e5ecdcf 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -10,7 +10,7 @@ short_desc="Simplistic interactive filtering tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/peco/peco"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/peco/peco/archive/v${version}.tar.gz"
 checksum=90d87503265c12f8583f5c6bc19c83eba7a2e15219a6339d5041628aa48c4705
 
 post_install() {
diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index adf4b95b79fb..22a9698bf44d 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -8,6 +8,6 @@ short_desc="A fast and powerful open source alternative to grep"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3"
 go_import_path="github.com/svent/sift"
-homepage="https://$go_import_path"
+homepage="https://github.com/svent/sift"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=bbbd5c472c36b78896cd7ae673749d3943621a6d5523d47973ed2fc6800ae4c8
diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index 1363f7118a87..7cd64a2e240b 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -4,12 +4,12 @@ version=1.4.0
 revision=7
 build_style=go
 hostmakedepends="git mercurial"
-go_import_path="github.com/aykamko/${pkgname}"
+go_import_path="github.com/aykamko/tag"
 short_desc="Instantly jump to your ag matches"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/aykamko/tag"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=d3a02466e600634cf0ffff9ad8c5f70eba97e44758edf35cc4efbda9cbfdff9a
 
 post_install() {
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index f907bacb02ec..f8fb232a5c37 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -3,7 +3,7 @@ pkgname=terragrunt
 version=0.28.4
 revision=1
 build_style=go
-go_import_path="github.com/gruntwork-io/$pkgname"
+go_import_path="github.com/gruntwork-io/terragrunt"
 hostmakedepends="git"
 depends="terraform"
 short_desc="Thin wrapper for Terraform that provides extra tools"
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index edfa5c95a91c..85fc439ba9c7 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -3,7 +3,7 @@ pkgname=vault
 version=1.6.1
 revision=1
 build_style=go
-go_import_path="github.com/hashicorp/${pkgname}"
+go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
 _git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
@@ -12,7 +12,7 @@ short_desc="Manage Secrets and Protect Sensitive Data"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
-distfiles="https://github.com/hashicorp/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
 checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index c1cb0b678a52..5d6c459dd93b 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -9,5 +9,5 @@ short_desc="WebSocket Netcat"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3"
 homepage="https://github.com/thypon/webcat"
-distfiles="https://github.com/thypon/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/thypon/webcat/archive/v${version}.tar.gz"
 checksum=5b3be1cb8deb08f144d674a0bf23f97a692ebb601666d3a38df6e80b2e68d0b7
diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index e0eba0cdb598..80857258f371 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -8,6 +8,6 @@ short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD"
 go_import_path="github.com/joewalnes/websocketd"
-homepage="https://$go_import_path"
+homepage="https://github.com/joewalnes/websocketd"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=6b8fe0fad586d794e002340ee597059b2cfc734ba7579933263aef4743138fe5

From 27faa970345793001cf7a58950bd955df321dfc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:25:27 -0300
Subject: [PATCH 1779/3458] gucci: fix checksum.

Upstream force pushed the same tag, so checksum for the tarball changed.
Only changes were timestamps for files and some small differences in
their .travis.yml file, which doesn't affect the build.
---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index fb10a6ca866c..fd3f94cdf7e7 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=7ce8967cb83eddb8db6878a9f00a96996f7503fb0a5ee01fa9e1947d2444ead8
+checksum=50d9d513fff97128bbd92685af5b244cbc1453e79010fb2b1aea51c84d478855
 
 post_install() {
 	vlicense LICENSE

From ba0780034f79298c3802f1b461da600bc295f054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:57:10 -0300
Subject: [PATCH 1780/3458] hydroxide: set correct go_import_path and use
 go_package.

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

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 86cc09417aab..bd4dc1b255e8 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -3,7 +3,8 @@ pkgname=hydroxide
 version=0.2.17
 revision=1
 build_style=go
-go_import_path=github.com/emersion/hydroxide/cmd/hydroxide
+go_import_path=github.com/emersion/hydroxide
+go_package=$go_import_path/cmd/hydroxide
 hostmakedepends="git"
 short_desc="Third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge"
 maintainer="DirectorX <void.directorx@protonmail.com>"

From 013b9290369755aa54c2d6fd1bc8026cd9c50d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:59:56 -0300
Subject: [PATCH 1781/3458] ipfs-cluster: clean up unnecessary hostmakedepends

At least gx-go seems to have been forgotten in commit
31effcb4a1a21b4b0e209ba2618365ef17c0cc41, which removed the commands
using gx from pre_build.
---
 srcpkgs/ipfs-cluster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index 281a5d1239ef..ebb062d409c7 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"
-hostmakedepends="git wget gx-go"
+hostmakedepends="git"
 depends="go-ipfs"
 short_desc="Collective pinning and composition for IPFS"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 43a06cd90ef6bc165e937238f1bf6a384f3d3e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 00:22:05 -0300
Subject: [PATCH 1782/3458] miniflux: use correct go_import_path.

Also use ChangeLog from master and fix homepage.
---
 srcpkgs/miniflux/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index aa50315ece7a..00515c0a7a43 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,18 +1,17 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.27
-revision=1
+revision=2
 wrksrc="v2-${version}"
 build_style=go
-go_import_path="github.com/miniflux/miniflux"
-go_package="miniflux.app"
+go_import_path="miniflux.app"
 hostmakedepends="git"
 short_desc="Minimalist and opinionated feed reader written in Go"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
 homepage="https://miniflux.app"
-changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
-distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
+changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog"
+distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
 checksum=ec6696b1cf41ef50b76d02d1179838e03d9c3bcb3dce48febe2b5f4ecc450473
 system_accounts="_miniflux"
 

From 5c208dba5a14cd12b53d10a8130d3b13cbec3182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 01:31:46 -0300
Subject: [PATCH 1783/3458] termshark: split command path correctly between
 go_import_path and go_package.

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

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 941c36f66d55..1b9c8765e748 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,10 +1,10 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.2.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/gcla/termshark"
-go_package="${go_import_path}/v2/cmd/termshark"
+go_import_path="github.com/gcla/termshark/v2"
+go_package="${go_import_path}/cmd/termshark"
 hostmakedepends="git"
 depends="wireshark"
 short_desc="Terminal UI for tshark, inspired by Wireshark"

From f10f0f28733f1a5ea3682f71ccbe6a37f1a86923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 01:32:18 -0300
Subject: [PATCH 1784/3458] sops: use correct go_import_path, add go_package.

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

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index d8c344b94bcb..ca43b4a502dd 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,9 +1,10 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.6.1
-revision=1
+revision=2
 build_style=go
-go_import_path="go.mozilla.org/sops/v3/cmd/sops"
+go_import_path="go.mozilla.org/sops/v3"
+go_package="${go_import_path}/cmd/sops"
 hostmakedepends="git"
 short_desc="Simple and flexible tool for managing secrets"
 maintainer="Noel Cower <ncower@nil.dev>"

From 48f465e1f83b4fcada6c6f00de49306f72bd7eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:10:34 -0300
Subject: [PATCH 1785/3458] gx-go: remove package.

Package has been broken for some time, and hasn't seen nearly any action
after the latest release.
---
 srcpkgs/gx-go/template            | 19 -------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 srcpkgs/gx-go/template

diff --git a/srcpkgs/gx-go/template b/srcpkgs/gx-go/template
deleted file mode 100644
index b06ced23433b..000000000000
--- a/srcpkgs/gx-go/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'gx-go'
-pkgname=gx-go
-version=1.9.0
-revision=1
-build_style=go
-go_import_path="github.com/whyrusleeping/gx-go"
-hostmakedepends="git"
-depends="gx"
-short_desc="A subtool for the gx package manager for packages written in go"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="MIT"
-homepage="https://github.com/whyrusleeping/gx-go"
-distfiles="https://github.com/whyrusleeping/gx-go/archive/v${version}.tar.gz"
-checksum=f3a0ee17359e0e5efab8008361da0e312ca723a0c9e165342a0306caba55a535
-broken="cli.BoolFlag does not implement cli.Flag (Apply method has pointer receiver)"
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1b7ad14c2f86..2d2338a8b9b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -54,6 +54,7 @@ replaces="
  grv<=0.3.1_3
  gtkhtml<=4.10.0_1
  gtkhtml-devel<=4.10.0_1
+ gx-go<=1.9.0_1
  libgtkhtml<=4.10.0_1
  httperf<=0.9.0_9
  icecat<=78.6.1_1

From 50751191e7cee6f689e3307887b139986bb36809 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 19 Feb 2021 15:33:18 +0200
Subject: [PATCH 1786/3458] notcurses: update to 2.2.2.

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

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 88ac59ef455b..9e9f2fc95dc8 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.2.1
+version=2.2.2
 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=e32fcf7344d2ff8afa81ea5c6a065eb476ff27e2b9edf0eeea714b028d2faebd
+checksum=f6e31e2662aad880373e45f23f4056c5fd254627b57084d71da2430df20f0488
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From d9f03ee35953310055257509b6e47db305373f06 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 16 Feb 2021 23:32:48 +0100
Subject: [PATCH 1787/3458] kodi-addon-pvr-zattoo: update to 18.1.23.

---
 srcpkgs/kodi-addon-pvr-zattoo/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 6dba619aa96f..c313e855d20f 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-zattoo'
 pkgname=kodi-addon-pvr-zattoo
-version=18.1.21
-revision=2
+version=18.1.23
+revision=1
 _kodi_release=Leia
 wrksrc="pvr.zattoo-${version}-${_kodi_release}"
 build_style=cmake
@@ -14,5 +14,6 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://github.com/rbuehlma/pvr.zattoo"
 distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
-checksum=19de7bc58bcf37bbcff5ad2cb2f095cb15a4217f9abec5c9ff30d0489dab89d2
+checksum=9c3dc2ed9f8c39bcc4f5798439b85f2bdae1a427ffeb1b9d18aa5e2caca29f4e
 nocross="depends on kodi-platform"
+make_check=no # No target to "make test"

From a73ce17069365c739c9ce9da71724c5870f89765 Mon Sep 17 00:00:00 2001
From: Laura Liberda <laura@selfisekai.rocks>
Date: Fri, 19 Feb 2021 12:49:58 +0100
Subject: [PATCH 1788/3458] onedrive: update to 2.4.10

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

diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
index 80b8edc4e960..e8237ccf0cb2 100644
--- a/srcpkgs/onedrive/template
+++ b/srcpkgs/onedrive/template
@@ -1,7 +1,7 @@
 # Template file for 'onedrive'
 pkgname=onedrive
-version=2.4.9
-revision=3
+version=2.4.10
+revision=1
 build_style=gnu-configure
 configure_args="DC=ldc2"
 hostmakedepends="ldc pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/abraunegg/onedrive"
 changelog="https://raw.githubusercontent.com/abraunegg/onedrive/master/CHANGELOG.md"
 distfiles="https://github.com/abraunegg/onedrive/archive/v${version}.tar.gz"
-checksum=27be7a0e898a6e2aa425eaecb983def4e81147e2e453c36c63f584e8c999966a
+checksum=ddafb0900959627dd329e6a82ab46d02596c02d4d4714d325a5474e763d7461e
 nocross="uses host flags for cross compilations"
 
 post_install() {

From 573de1e5b80d9b396e6b67e89a04957f09ccb685 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Fri, 19 Feb 2021 11:37:33 +0100
Subject: [PATCH 1789/3458] slack-desktop: update to 4.13.0

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

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 7a2199f9589b..92efdaf151c1 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.12.2
+version=4.13.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=1b9b90234efc37b01b84426ce9aff5ec7a22e4349dc2f60b3354ffb6dac4c38b
+checksum=b8a63e1a91e4320b7e46aed692a5579fe2334b0f6963f9dceedccd05a7f51bc3
 restricted=yes
 repository="nonfree"
 nopie=yes

From 4440851940c066b9b68b6123ba15c78ffff674f0 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 16 Feb 2021 23:47:44 +0100
Subject: [PATCH 1790/3458] openimagedenoise: update to 1.3.0.

By ericonr:
- enable tests
---
 common/shlibs                     | 2 +-
 srcpkgs/openimagedenoise/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d9eb36d27dc7..ea28154120b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3798,7 +3798,7 @@ 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.15 janet-1.15.1_1
-libOpenImageDenoise.so.0 openimagedenoise-1.2.0_1
+libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.3.3_1
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.7.0 openvdb-7.0.0_1
diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 3eb4a7326847..9c1800228964 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,6 +1,6 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.2.4
+version=1.3.0
 revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
@@ -12,7 +12,11 @@ maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=948b070c780b5de0d983e7d5d37f6d9454932cc278913d9ee5b0bd047d23864a
+checksum=88367b2bbea82d1df45d65141c36b6d86491bc6b397dc70beb3a05dda566f31c
+
+do_check() {
+	build/oidnTest
+}
 
 openimagedenoise-devel_package() {
 	short_desc+=" - development files"

From ae903db918047fb0978e26de97e35646fea48fe2 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 16 Feb 2021 23:55:00 +0100
Subject: [PATCH 1791/3458] blender: revbump for new openimagedenoise-1.3.0.

Closes: #28812 [via git-merge-pr]
---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index b724ef01318c..01b3677ff4f6 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=2.90.1
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 0d9cf48f5989b76ef0b6a6edde075f2ecd1b13cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 13:02:32 -0300
Subject: [PATCH 1792/3458] ardour: trigger builders.

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

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 7fb37a367697..354e25ac1cd7 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,4 +1,4 @@
-# Template file for 'ardour'
+# Template file for 'ardour'.
 pkgname=ardour
 version=6.5.0
 revision=1

From afc7fd93cfad1e51b93b1308d62f6150d926b85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 14:50:16 -0300
Subject: [PATCH 1793/3458] ardour: trigger builders again.

Build is OOM'ing.
---
 srcpkgs/ardour/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 354e25ac1cd7..7fb37a367697 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,4 +1,4 @@
-# Template file for 'ardour'.
+# Template file for 'ardour'
 pkgname=ardour
 version=6.5.0
 revision=1

From be08c496ed6b569a000f657eabf90f7a13fc4c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 12:56:57 -0300
Subject: [PATCH 1794/3458] common/build-style: fix do_check for cmake.

make was accidentally left hardcoded to query if a test target was
available, which meant tests wouldn't be run for most of the
applications, since they were now using ninja.
---
 common/build-style/cmake.sh | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 26d55f527e33..00ef3ff37e5f 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -79,20 +79,34 @@ do_build() {
 }
 
 do_check() {
+	: ${make_cmd:=ninja}
+
 	cd ${cmake_builddir:=build}
 
-	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
-		if make -q test 2>/dev/null; then
-			:
-		else
-			if [ $? -eq 2 ]; then
-				msg_warn 'No target to "make test".\n'
-				return 0
-			fi
-		fi
+	if [ -z "$make_check_target" ]; then
+		case $make_cmd in
+			make)
+				if make -q test 2>/dev/null; then
+					:
+				else
+					if [ $? -eq 2 ]; then
+						msg_warn 'No target to "make test".\n'
+						return 0
+					fi
+				fi
+				;;
+			ninja)
+				if ! ninja -t query test >/dev/null 2>&1; then
+					msg_warn 'No target to "ninja test".\n'
+					return 0
+				fi
+				;;
+			*)
+				msg_warn "Can't run tests with '$make_cmd', define do_check.\n"
+				;;
+		esac
 	fi
 
-	: ${make_cmd:=ninja}
 	: ${make_check_target:=test}
 
 	CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}

From 5e23480a28634a3dfd45e4e5125514e89cbf490a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 19 Feb 2021 19:31:11 +0100
Subject: [PATCH 1795/3458] gscan2pdf: update to 2.11.1.

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

diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index 3f9360dfb05e..e77017debcfc 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'.
 pkgname=gscan2pdf
-version=2.11.0
+version=2.11.1
 revision=1
 build_style=perl-module
 hostmakedepends="perl gettext"
@@ -16,7 +16,7 @@ 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"
-checksum=d0b96e98a68f7f311e48a74e796838f5ef07dca7c90d5bb50081bcba0c2a13cb
+checksum=aa728071c43665e43f653f200ee477cb87580c7adab0412c8c72b512ddb32f2a
 nocross=yes
 
 do_check() {

From 7ef47720c76f5f72eec2927becc4a10116abe4bb Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 19 Feb 2021 19:35:39 +0100
Subject: [PATCH 1796/3458] linux5.4: update to 5.4.99.

---
 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 fda74484e494..b35edec41a0f 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.98
+version=5.4.99
 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=83a248d6fbe388f133769d736f36b754767abc9d66f1c034b537ad778fbd46b1
+checksum=5bdad12c69253d30d836dd51e0b2a9a04a6749cc6b4b2412561a1efcb1351a27
 python_version=3
 patch_args="-Np1"
 

From 10750ba7b2c622ef3ce5f31ffba9a6e0808f24d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:05 +0100
Subject: [PATCH 1797/3458] attica: update to 5.79.0.

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

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index c88d6236bf7e..8a8cb7294b74 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=15f194688ffaa78b5cc093c61c08f7002f7eff042ce202466c67077f13d49676
+checksum=8af244b41f08448ea3693e9f7d9b50de9df76b416016cd1143dfc581dd65d9dc
 
 attica-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 13a97af5a71f60b16df476b092952a63e9a03d67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:07 +0100
Subject: [PATCH 1798/3458] baloo5: update to 5.79.0.

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

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index da59a8fa2939..f518996b1a48 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.78.0
+version=5.79.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f152c9644c812cdaf0dbfb5fb224e64e2fa0dedf615dc1f2fa572abc1e051add
+checksum=80f9aca313fc214b6363ae37546df7825eafdb291bdc6f597d86cb0b8c38ff50
 
 baloo5-devel_package() {
 	short_desc+=" - development"

From f3bf5653583bec90e2b3d6ecb627a695c8426216 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:10 +0100
Subject: [PATCH 1799/3458] bluez-qt5: update to 5.79.0.

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

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index 1b31c4718081..89bf06b8307e 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.78.0
+version=5.79.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e97b36b02afb97193036ffa615430d4047d76e5a4be4596862be7e44b7d303bd
+checksum=f2da3f23fb5b03f4295f41db4ecca7221caa2a2df9afd4cdbfff9ca988bed16a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 6f239ea5c1fd6b7412d4d53b12eac8550ed8cdef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:13 +0100
Subject: [PATCH 1800/3458] breeze-icons: update to 5.79.0.

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

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index f1dd6f793116..0861508b1eac 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=425f6d0163dac092939dede0b1023de5b175738cb59bb2ec002c821973a449b9
+checksum=c6320406a8e93df3a5918e24ef94b76b3c0ddd3e17567451b7dce403f33b4d1b
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From 15fdd9b0cf2d5513b24973be6fceb9de4bd1adad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:15 +0100
Subject: [PATCH 1801/3458] extra-cmake-modules: update to 5.79.0.

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

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index b729f3944554..35b6b63e11c0 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=OFF -DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=eede1f0c21f24eca56bd71a805fa76500a8c683bf21982cb33f4bba682d012f9
+checksum=b29602db99c566d88fa92106abe114bd57b7ffc6ca20773426f896ffde68bed8
 python_version=3
 
 post_install() {

From c588334cae8103d0a1e58dca1365cb248bae9f2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:18 +0100
Subject: [PATCH 1802/3458] frameworkintegration: update to 5.79.0.

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

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 34241fd19cdb..66540fb863c5 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=908b5977cf711d6b78b5eab30bc9093bb2804a45cd15986d57124d869d407167
+checksum=41c88a378d37fa0c1e89f3c26e26eb30e28d54a0d82cf8025cc5c48d31441130
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 591198a666ccadb29dd7557115699e16e3e7f792 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:21 +0100
Subject: [PATCH 1803/3458] kactivities5-stats: update to 5.79.0.

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

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index bc47894a29ff..ed181616ba50 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.78.0
+version=5.79.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=fa303808bdf9dbb268177ae876b1d85d3eebf0ccb7aebaee74b2a067b9e6d629
+checksum=23f5f68ddab812499052f3a4cb3b9c2244226bc63096a01ecf7552171242b968
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From c47f6ac8d69a734a000f82a459546fcb10070233 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:23 +0100
Subject: [PATCH 1804/3458] kactivities5: update to 5.79.0.

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

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 5388b8bf55fe..2e19b3a6db5d 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.78.0
+version=5.79.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=114eba7e76f3341c20fc7ac3936a8385d3d9d7b985aa1491689d4c6a38cb6787
+checksum=f4903fa1ad41cfb23e419b287070c51d8df12d10ee5cde538c8b621c07d16d34
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From aefd4c982ef954388b93a7baac7448e6df2c39cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:26 +0100
Subject: [PATCH 1805/3458] kapidox: update to 5.79.0.

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

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 1bde2d0f9776..b645944a9513 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=774f1b8fafb161c7602ab45774cf6024360d9cc840d99adc436feb6cc75011b5
+checksum=2752c83d9b72245c94d000b5568a457817dc5b6bfcd550daa5f046d5ba9e6462
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From adab41714d2575855d1c16606f13d24c374d8b2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:29 +0100
Subject: [PATCH 1806/3458] karchive: update to 5.79.0.

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

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 48ad79665b00..a65f9704a28d 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=82e7a24280132b1654dc36caba52676b988a9feeaa6dbb9d398b170608f012d3
+checksum=0cd2bf46cc476b8b56138b3a892688ab70d0ddaa9739350a7421dc77a6210e07
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 788958cd89f42a401b8aa21294ee71884b66049e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:32 +0100
Subject: [PATCH 1807/3458] kauth: update to 5.79.0.

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

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index e7295401182b..1c7b11a165df 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=efb3b050492f466c4c531217c39aed67524976884a00f395eaeca147caf61db0
+checksum=aa01b26a48556292141b2c103b177ec991127e6faf0e3edd0f0efa78887578a1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From ab3dc7c8c00ab6a8f8dcda0b87884ad255eaf161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:34 +0100
Subject: [PATCH 1808/3458] kbookmarks: update to 5.79.0.

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

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index d90e2f423b9d..1bc4b2d17455 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8301b0857e253bd12ffdbcde2866f91c4dcfe438bccd51b8bbbc61efa703ef2c
+checksum=0dcfdf8b2f1d6cebdf830adc338d07a10cf2ddca815c21365cf5ec8e67943981
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 471fcddd363e3f70438833b7df5f5ea59faca2c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:36 +0100
Subject: [PATCH 1809/3458] kcalendarcore: update to 5.79.0.

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

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 06d55c421ae8..75b0e59a87a4 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3090887fe9ea28c062530aed6f0148ad34ab610c2efea7dc6e75258715d727ed
+checksum=3b325b199549dc75d091e61b588fb14dc5160a1d259a5c734a685209a20c6ca7
 replaces="kcalcore>=0"
 
 do_check() {

From abe14da36becf95f8b9f4d90d8ecf15ad120eb1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:39 +0100
Subject: [PATCH 1810/3458] kcmutils: update to 5.79.0.

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

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 4041f487496d..d72018c1204b 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=68165fa953286ba5034b1766d09b02542c9d3eaa13dc4d64e8ced84cc70cc2d3
+checksum=73d286b84ad32e3fa350b667993a6db731ee4c7e878d0a0cf9f5c81933423ef3
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 514e74b89c5667bb182563d5fa9549a8ccc678e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:41 +0100
Subject: [PATCH 1811/3458] kcodecs: update to 5.79.0.

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

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 464b57b0857c..70438acfae75 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36b461cef0bb95c34298615a8a6d1f2da37676c9605ebae76d6cbdb393e8fc7a
+checksum=c81fa7229cb70021339d4c822517980e30f0a9dc79f143f577a6d56dcd6f64a9
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 64d82aaa93434487cde8cf8d4055ded780e82e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:43 +0100
Subject: [PATCH 1812/3458] kcompletion: update to 5.79.0.

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

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index f3b0bdd0fa0c..e88fe4dc7264 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a73972651b5230c8df2d5d7b463d48004b8fd6672bda164e834eec5345113fa9
+checksum=9bff8b791d2434057a0137805e8dcc81ddfaa6dc87f0b5180c74be770934d7fe
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From 1b84d5e361d20083602cf855af91bae2dbf894f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:46 +0100
Subject: [PATCH 1813/3458] kconfig: update to 5.79.0.

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

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 1739c93da945..17aca02f1318 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b27a1e97d520e98178f955b8ab29e794df7733beab1898ef06ab5f14afcfffbb
+checksum=f948718ac87f573b14bbf73e4af02d488f023cfcf011425af7cdbc0cefca510a
 
 kconfig-devel_package() {
 	short_desc+=" - development"

From 6e9b0d2e1218de7c13f81763031560a35ba00c9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:48 +0100
Subject: [PATCH 1814/3458] kconfigwidgets: update to 5.79.0.

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

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 6b53696034ab..ad14225872c0 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=87d4cd10145d5bf0e07f1913682553e368db0ee4a900d18368517ad9fda2ec39
+checksum=7ea01c69328f460a1e70131626d00a7a668814ab415dca7692dbc6a1631330d3
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 6129e0ac09d0f1c029ac324d86c000021d45e7dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:51 +0100
Subject: [PATCH 1815/3458] kcontacts: update to 5.79.0.

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

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index e12465ca8314..e75bfc9c39e1 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.78.0
+version=5.79.0
 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/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c3d12aa4675f7677e8c87725b23ae65bb258fd230f9ed9eac38b5d8100555f6
+checksum=c9574d77235646c3c0c6b1a9fe1eceaf131a2051a1f9de48d9949ee6a7dbd449
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 938618228c3c59becf38330b0f33a5dd0be4e66f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:53 +0100
Subject: [PATCH 1816/3458] kcoreaddons: update to 5.79.0.

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

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index eca6b6690124..3093a9fef6d4 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=635ff94d5d15e0f7603901dbeeecc20ef633fd4f558d20462e7aacb1a88c3b07
+checksum=6f221bd93be73aeec863cd7089c69e84fef76bea83a906c6cd2c853937813659
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 8814bb2e49e83a19ac1488ae7d63e752f4dec38a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:56 +0100
Subject: [PATCH 1817/3458] kcrash: update to 5.79.0.

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

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index 9cd655b30187..9369326afd7b 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=724a224efce588b9295b3ea01ea879d3eeefe77c843d833858718ec8bbfc3d67
+checksum=ecaa74faaf31098acf8974eb5785101b9477fc78a7308a306a6c4d162468e470
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From bf1f271e885b4896c92c0232e5cb06f483b96f89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:55:58 +0100
Subject: [PATCH 1818/3458] kdav: update to 5.79.0.

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

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index b0e82be82b8f..a2c7c0e43fd4 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.78.0
+version=5.79.0
 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"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1200ac36df6cbf1f6a307166b50f3091762b8e5beb5e9a5925c4f89ccb2f10c7
+checksum=d4f5d1f29de8f4b9cce6505f209d266dbd7b32ad8dc3e7fe1813fd4eacc2e394
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 081ca6985da0fb210666c7ea4ac32762109c089e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:00 +0100
Subject: [PATCH 1819/3458] kdbusaddons: update to 5.79.0.

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

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 258bb9f2154c..903e3071577e 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f91d0b5762243e5e044c087d4faaa584ad5f779fdede138a0048fd4af24d399
+checksum=2071c5a06226b77c4cb1d4e46b50258c980e57448fdbb1a49259db64a7a2539f
 
 kdbusaddons-devel_package() {
 	short_desc+=" - development"

From 2bee1916dcc9a54491700ef6694ab22c6baf6615 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:03 +0100
Subject: [PATCH 1820/3458] kdeclarative: update to 5.79.0.

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

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 631a02c98f87..10b0a0bea73c 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4759319fd1569d64f53d299f67c8564e75f687376f2774dadc7c53e45d2f4797
+checksum=f07b19a737cd0c5d824718332a2f20386583645fc075aca3b06d781cf7556115
 
 kdeclarative-devel_package() {
 	short_desc+=" - development"

From ebb47e48097db060da98cf71e5fb78a467330b7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:05 +0100
Subject: [PATCH 1821/3458] kded: update to 5.79.0.

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

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index d83cc3640a48..31f3867eb60d 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=35156cac1df945e7420351b8a361567f20f21af78fef053fa51d8a0ebac2bd52
+checksum=7569df00afdf22419038afa1f8c537806bbb1974c504262b31b12d9c8941cbbf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From f3c8ca9dccedbc6d9588a96e6a41654bda831bb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:08 +0100
Subject: [PATCH 1822/3458] kdelibs4support: update to 5.79.0.

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

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index 7fec2a834f6d..f551ff7d9974 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=98f914a9f2ad778c3f5dad4f340cb930a13fda968c899aef3812403d20fb94c5
+checksum=a542e75e0b20325e5a88d33229441416da4c8d467742a229b2aa87e368053411
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From f29347dbae8df28c994d9969ea2e620ef262d466 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:11 +0100
Subject: [PATCH 1823/3458] kdesignerplugin: update to 5.79.0.

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

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index b87caec99737..a0a1c04f4f0d 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=9ff333f7d0432219b654bc4bb31cc3b152961dbc91454bdea7d522d6d11b0fb2
+checksum=56f043b6cb745f308831b80d6a7b9cb2548f69221394c17095a399aecdc9f8c9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From c1c9a3f2c8c1ea732b47c237af80f438191b22ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:13 +0100
Subject: [PATCH 1824/3458] kdesu: update to 5.79.0.

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

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index f5f0770b6fdc..42b3beec4661 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5f942ebfa602acf61a46f45474ec2f5403a15111906641f3108de0e8db44b1c
+checksum=81018fb3a53e00dd19a15b472d7189f96b0aa5481d8371f923666271f22d9fc2
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 3e3fc6a88dd5cd31501e4eb799a17203cfdd2264 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:15 +0100
Subject: [PATCH 1825/3458] kdewebkit: update to 5.79.0.

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

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index ab31b7cbdef8..d4c781879a29 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=61e17a2616cf93469852ea10c5bb6e2a6bc50c944dcfeb65834f9ca109a39655
+checksum=ff8ee3fc99feb36c30eda0a243af164dca9b496fa1c5727b7ad1676113b90135
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 705f9d2260041a1a9c0554dd3de86fd4c1498528 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:18 +0100
Subject: [PATCH 1826/3458] kdnssd: update to 5.79.1.

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

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 9396fff3262e..f06f3c1cb9ce 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.78.0
+version=5.79.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4e03bd3dfcd468ef2d75182488b779006b59a5cb6c7f44fb093116d04b5c52e7
+checksum=9716aeed43b794948a78444ea645ba14f24f13395d410a78a68b1f8428f51898
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 5a216173486456fb46de3739e9d97ab89209713c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:20 +0100
Subject: [PATCH 1827/3458] kdoctools: update to 5.79.0.

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

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 7f5d909ec9d8..659fe795f811 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7a08eef3d7c0e4eac7d46ddc0d25942e008907bcac10ed27bca02a1169e2cf62
+checksum=ebc37ba10261fc05808ae332260eabfc86705b1d0cf906b529ca7099df907b0d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"

From 87fd8d76884db0baacd2d4078a887754f4e52486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:23 +0100
Subject: [PATCH 1828/3458] kemoticons: update to 5.79.0.

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

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index d21b438efc52..a258a825944d 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=753c5c315a93174f3ce24bd8318bc7c1c0db813fba1e19ea6563be58ac805491
+checksum=17de3a8a711ec44654b97054850d8f44a2a394cec9288815e9a36fcf9af3a113
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 7b2ea8d2786025b8f54b657cf33c58963718f85f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:25 +0100
Subject: [PATCH 1829/3458] kfilemetadata5: update to 5.79.0.

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

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 8eebfe4957fa..35d871348cce 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.78.0
+version=5.79.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=9dd965188f38dfc5cdcefb3b73d41885b069acb95076b96140b64e72dc213c84
+checksum=250d950d1009fc274db631ff6e680f68add007f82fb12a90aacc5d84f055b27b
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From f588d7ec11ab8ff330cb97fb643d13a17fa4708a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:28 +0100
Subject: [PATCH 1830/3458] kglobalaccel: update to 5.79.0.

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

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 2f27b0c819e2..6a9133b69379 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3f196edde20388b2c1b1aa0139de7701e86d1faa85578827e89f96f56293b822
+checksum=c8778522f31a677d99b199247b43858ad4aa3e6c5db3f6a6aa84ac53c7de1d63
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From 594cebcd804cfd144191bfa09da0cb324f055538 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:30 +0100
Subject: [PATCH 1831/3458] kguiaddons: update to 5.79.0.

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

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 527d26ae5ad0..ec6662332f66 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad09ed2db12a8740c5bc2d0b1e45b4a4f5c05835b995d2aa5492c11561bc77d0
+checksum=bc00488e123a1f7905682393b140b80c8340cb131cc0baa3fb6ad575878f1c85
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 2d8b636253be1b474f63e13483cd8a519a854c0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:33 +0100
Subject: [PATCH 1832/3458] kholidays: update to 5.79.0.

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

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 631edaba26d3..f5894542332f 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2768b85bad18603eacb93d211ebba51db800e532a2c0ec9f70cdaf5c0d50f590
+checksum=16298163d85a27232b90f185b26741748a70222c191e557182cecd1ebcc16bd1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From d2df3140e9b828142fd744d3d97561de3776aa9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:36 +0100
Subject: [PATCH 1833/3458] khtml: update to 5.79.0.

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

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 044bb1f3abcc..e4951059e127 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=16b63351a779bb877263c86fcc3600f8385dbfb7218593560fe022ba1830515d
+checksum=1ece8dbd1bae528e07a335ef53278b8fda3e79a6c52ce0163d0de439d69d26a4
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 0ebd65a058c71baf3403e7c709ab2e608a386a64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:38 +0100
Subject: [PATCH 1834/3458] ki18n: update to 5.79.0.

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

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index d1acafc03f48..3a1e5a2410b2 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=13352d2ce158c09edde129712adc12ca50c81bbcafe2df924192b5faf2dc4e55
+checksum=33be21c3e4b0de8d942fde7a0d3c34a85cc48440ee745375b6a71ed6993f4a8b
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 151509e610a4484d1a8c281a69e1e4736de3a0ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:41 +0100
Subject: [PATCH 1835/3458] kiconthemes: update to 5.79.0.

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

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 8b3823410f15..96491779b208 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb887e4d93cdd240545c8c16431cafafe3ec3c696589540d79a0e28b92084d6b
+checksum=dd12bde84d39889c7d67ec772564a90018fb559765e2d074f798fcdb00467a2d
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 9f6bc156ffcd91f0acfd28864b1fde209ff64a3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:43 +0100
Subject: [PATCH 1836/3458] kidletime: update to 5.79.0.

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

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index a98fb33d610c..0fa41a665587 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa96864a2ea370a08ef3b6c720d2716b03d18213973b21e617e3d635ae79862b
+checksum=53e59c7f8465753f58d23543a1bc25f83ed9f0cd6381a800f9cff7cd488ce25e
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 139eb6cd9b92932f024aa3ff0253060be134c372 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:46 +0100
Subject: [PATCH 1837/3458] kimageformats: update to 5.79.0.

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

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 899a5a657532..083dbd4d0644 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecd4cf4ec006998b73724776cb2cb11f636057bd5f29ae134451fec612e1623f
+checksum=ecc8e38500d2723ab2db343252955df73c75d4e20a54e8671436b2bf0961ce25

From 329c4025e8a300c1d2d10016b83067239079769a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:48 +0100
Subject: [PATCH 1838/3458] kinit: update to 5.79.0.

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

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 4e8af1ec9425..a814a5744ea7 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7b93fd213ca6b0787a18033f97255acf159d65bdf8e5f90a706a036c6aa5509b
+checksum=3b1727caf611f354ec2d3a2c0d74458cdfcc98325122ee64f35cf1a8de88f95e
 
 kinit-devel_package() {
 	short_desc+=" - development"

From 5ed6092cef355d165aa3ab22aa7450b336e951d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:52 +0100
Subject: [PATCH 1839/3458] kio: update to 5.79.0.

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

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 7fd6937356cf..b1d17acdf32b 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e211dba2c1ed73b67188d3ddbaf40043409912ab731aed4eba5bea32a587d620
+checksum=767c67aab4e1a43d1d2ebf74f9deab21791150cc5f533be561dc1346d16e25e6
 
 CXXFLAGS+=" -fpermissive"
 

From 5dbbd4fad11e7288a517978b4d2fbba556984b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:54 +0100
Subject: [PATCH 1840/3458] kirigami2: update to 5.79.0.

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

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index cba20a775457..ca978894902e 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=5e4e2be2a03d4ff4aae99c9451c2fc81015f9e5c22cc679e188346e83be3c718
+checksum=f7d39c9dbc20ce0fda1adfe27745ffcd8ec02ca79e8f344efc5b858fd1312b07
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 2fb3df09375de0946c418bfbc67eefb8e5e118b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:57 +0100
Subject: [PATCH 1841/3458] kitemmodels: update to 5.79.0.

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

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index f79918ab8c15..83424d815ca5 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4a361cf0fd7bc48261fddcc5b916367cb22b5a2cfdbb91a6eff5d0da4e7cc8fa
+checksum=7a29b2b7f20a3dbfd65a12e38f431716e14c8d43f9f1edc32e15e03920503dbd
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 2da43f1df0c0d18efa7fe4cae985e8001d66d9dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:56:59 +0100
Subject: [PATCH 1842/3458] kitemviews: update to 5.79.0.

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

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 10b66b1ede47..55f66fecc2a7 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=05f8895880afd15b2c08570df26cfc6cec847808e1aab0968ffeaf47618eda83
+checksum=d4022ec9599e5b99c6c3e11e1145e6f85d1a87a0d57d9a42aec24605bb87415c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From 18ebde68c07bf623a5d6c0b2c2f6a95059292d25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:02 +0100
Subject: [PATCH 1843/3458] kjobwidgets: update to 5.79.0.

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

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index b6d0ab12ae33..dcbf9d23ae63 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9bc3ba73f7a55896dc772adac8042e3cd62d795e5f066593eb08644e023fbe31
+checksum=f9bd15bd6e7f5328c40cfbe3b64624f449a90bcdb2c5c30fb8f15a70212a2a15
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From d0c9d835f85ca55cb0c055f87d3a18ddcdf11abc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:04 +0100
Subject: [PATCH 1844/3458] kjs: update to 5.79.0.

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

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 6959d0410a77..e8c8e6e36537 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=9070e1d8b28ea111f1946de57fd80c74dd03e92e31fa3106c4fbb5d38de4566a
+checksum=ea09304824c63adc735e524e604203bcd0fe45a848524856413dc4ceabeca1ec
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From c90cea3a91d6d9c0edb8e5c07e6495e975108074 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:07 +0100
Subject: [PATCH 1845/3458] kjsembed: update to 5.79.0.

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

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 349f76ac9659..c3e1c1cd04b3 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=296faa38f8996e8b99a7e83fb67d4b0dda5a4284a77aaec9d41ccc62f1ea1065
+checksum=fe1694f5ae939f049ba2585112218d1dcbafede6974f486b51619d1a6bc172a2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 78cc0b3a9d94fdaec94c53cdd413c473c036ec58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:09 +0100
Subject: [PATCH 1846/3458] kmediaplayer: update to 5.79.0.

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

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 50856c9bd725..2c36715f955d 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=9afa27eafc8c7d144134d6ddc6e3cbc6310d6324f81d2ca6bd4142f69898c07b
+checksum=0b75cc92742784cb6ccecfc790458ed1abaca3c38b903d837e7f31955664f9d1
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 29b0714c87e253e74339502dacfcd05f16f52f88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:12 +0100
Subject: [PATCH 1847/3458] knewstuff: update to 5.79.0.

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

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 9715df32071d..63538378d471 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5b0abd5d4ff67e1f4fb921b710d1251569bfc2e19788d9ce7843b498f9a61b9
+checksum=3e2055002f7e2f8cbffb414b7cd98ed38b911b95d5eee914139389a041064f2f
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From e8df57e9f498d73e5a669749d718a7d9cf280b7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:16 +0100
Subject: [PATCH 1848/3458] knotifications: update to 5.79.0.

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

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 491a5986b0d9..384c0ee2d0c5 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=397fc21bbbaf235fd092f3bde731d2c0f1736ed4595e4a4cfa4b1e4328ee2339
+checksum=129ee0ab84740d4bcd1930ddd2b6d0e692836c576175bac804c8a40f94eee485
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 19099a46ff70620d3d43d8dfbc17f850a2d70ced Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:18 +0100
Subject: [PATCH 1849/3458] knotifyconfig: update to 5.79.0.

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

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 477043de0447..d1d8fa0a9fdc 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df01a3c61502d60d16adcdc1c7b75de4b05e0850243c86dbd8fd1012a339fa5b
+checksum=2d111a6b80dab8cfce710440824cd528d2d1ee5194a5d1e467e620e45649cd30
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From b7b1263923ea3c7475c38b5b4602f66da96ef560 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:21 +0100
Subject: [PATCH 1850/3458] kpackage: update to 5.79.0.

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

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 4d5966710bb7..f7fef38366ee 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ec906a1037b91d747a858b77e40e24c279c1af72199cc15dec422a1707741b34
+checksum=47782782f9cda0d38ab87be340b868cfb9350e3a53b4126d8ea2c33429e173f6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 1c90261a2811710b3ebc4f2c91e9448149c0b906 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:23 +0100
Subject: [PATCH 1851/3458] kparts: update to 5.79.0.

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

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index b56568801445..d2d98049144c 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77d33ade190828254d1e0c8855b873282168eaf6a4f8ff42c902c2f8a1dee1da
+checksum=a941b95c1f3f6f36656fb22eca5ea9606ea59d2c3c414363c68f106cdcd32d35
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From e47892103f6202dfbb7fa33987eb46256b1d2116 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:26 +0100
Subject: [PATCH 1852/3458] kpeople: update to 5.79.0.

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

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 8b15279901a4..9293c224ec27 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b180d9623f9ed0c83deb49a299bad6f7b88b50a2f83ea745d0c970e830088c31
+checksum=c4310f04bf7f7de6b0ab9b997f5374f2a0237caf034d518f1cc7644025834836
 
 kpeople-devel_package() {
 	short_desc+=" - development"

From bc9e51c543477ce7deeebbe8baa1b898ff163242 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:28 +0100
Subject: [PATCH 1853/3458] kplotting: update to 5.79.0.

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

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 54f2138ca46b..77c1923870b7 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6cb34efc35645ee26801587f65d7f4ba452dd219c1fcb6dcb31a30725f1e8d03
+checksum=c67238fb1395197b2ee2a65f327458132106df6110765952bd979b11cfbb5c51
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 3fd8db94346325c79c9c9f97db2bd59dc2fb6bb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:30 +0100
Subject: [PATCH 1854/3458] kpty: update to 5.79.0.

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

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index ded456180410..4120ac57cd54 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c3d1d6d431de7608f9e764ab40c4e1f0c1765d0f6f44c092c4d62e942e9511da
+checksum=6acafd2a025ee89fd83abd1ae543704018408d04bce9fa5ec756577b424ea0e1
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 8153d49decc13fa645a5f16a139c2de9318f4f28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:33 +0100
Subject: [PATCH 1855/3458] kquickcharts: update to 5.79.0.

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

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 4f75e6a49840..8280a2f65982 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=1762b927e8fbaa24cb20425dfcdf875190000f357d1f3637dd580bc2c75d05ff
+checksum=cea84ce7f9aad891477c916a875e82a142b0f33ee457f9eadfcaf77e701d2add
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From 1851ea3d14d2e4c02eccd99d6340a6e79d5ae10d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:36 +0100
Subject: [PATCH 1856/3458] kross: update to 5.79.0.

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

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 6f6029cc66df..449329649829 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6121ce648605b8de960889a6c48a5fda967b3f52e38c626c5ac6f5f2e766d41f
+checksum=cc3564329823d659ab6d146e3f646f6cd1457a6512bff7c4f88a3b6159f71702
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 5317e6e7a98f470b093c3dda3ffdfab2767e8fc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:38 +0100
Subject: [PATCH 1857/3458] krunner: update to 5.79.0.

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

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 98e8a4ab4a35..a80458e5c368 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=755e627292550d56ae77e356eb7bd5991652c196d8499af6fb6da7989e301e02
+checksum=91a99cf7a5bd4eed6f272fa0d90a02312a9194660ccef80e67066465a252ee6c
 
 krunner-devel_package() {
 	short_desc+=" - development"

From 3ad9bc3f478345df3df70c27b552db9c8e45934c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:41 +0100
Subject: [PATCH 1858/3458] kservice: update to 5.79.0.

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

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index e5804330c91f..5252f3fe56bb 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2ce68ad220b2bc6975f84d8f231afe1a1b5cf6922a75e0ce9541c61e3c5535a0
+checksum=d7e6dfb95fc343521dad4840712dc83bbc33b5e4210f689dbb05ae1f34913fb7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From d52695bfd7d1ef10e9e77596cc2a7faba90646ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:43 +0100
Subject: [PATCH 1859/3458] ksolid: update to 5.79.0.

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

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index c3f9a84aa175..12c3c6ee4dbc 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.78.0
+version=5.79.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=129710956e0f9940b00a0b6b9dca86709f3b753ab88debbf93d7ebaeb44bfde1
+checksum=34c3699100f117709f459adbe08c94562af387bf45a1901cbca0106cc4d07a0c
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From de74e6652fdaf92a94e677c916ddf450ecefbed3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:47 +0100
Subject: [PATCH 1860/3458] ktexteditor: update to 5.79.0.

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

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index b0b9b2450aa1..69c3793c41a2 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5664c5eb12fc1282f751be6874ac2b99fb59056ddd6562b7e05e8e6e874524e4
+checksum=83b94589d3a23f0b268eb5cfa9544541ac0015ecfab5cf3fd5e95e4499d155b3
 
 ktexteditor-devel_package() {
 	short_desc+=" - development"

From fb5b9f9ba0c008bbb45fa8da3ab5fddb0ca19fec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:50 +0100
Subject: [PATCH 1861/3458] ktextwidgets: update to 5.79.0.

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

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 18999dc8ae5c..a59e0f5ea63e 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e8133b3f5ba809c48a92895ecb4b4a1c4beb11ddb589fe6691b6545ce9eef8be
+checksum=b4a03b6f38e6dcf45eec16b2ed545377d1e81614168552386d932d7f25c1d0ae
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From e3888cbebfc60d3b82a725e1d13734acaff6e3f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:52 +0100
Subject: [PATCH 1862/3458] kunitconversion: update to 5.79.0.

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

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index a712cec56d3d..5b4535dd1cbb 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c790c9870362032556e3c7d6b37c01bfb571eef32d33a4ac3c96260d8a5439d
+checksum=549c31f8adc5806a1e1a1657b9ea9d80bce5c21b2bcd832f5642afbdaba856a7
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 2f08fab2af46c4bca5e7ead6a7d6a0b5482fdb8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:55 +0100
Subject: [PATCH 1863/3458] kwallet: update to 5.79.0.

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

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 771ed6aab409..f1310682ae5e 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9730997f28ca4e55b015a5d76adcb1200d3e26ec21af9f1a598ce3e4532b16a9
+checksum=77b8a16ffdfda08f018a1c58e24758af37405cdbf9b096236318f90c849d2ce2
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From b9ab053ac87970ce991fc5949b58554a178949c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:57:57 +0100
Subject: [PATCH 1864/3458] kwayland: update to 5.79.0.

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

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index df3e56a49d02..073fb2d92971 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab6ba414a69b2399ae7b83844d9ea735cd763afc2e5c2a74292b5ae914db4a14
+checksum=9319b51ec0b1107d8964e16cdb50954df89502d2555a5e65735f9cb31583f991
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 5bc7f3315fe6d64ca079c77e5e3fcfabb423c75f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:01 +0100
Subject: [PATCH 1865/3458] kwidgetsaddons: update to 5.79.0.

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

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 22f678d7fa7a..25451f8c5e1a 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e4abb00c3228459768e99451350d94255a386ccd9cd15005ffe47f31694c5e2c
+checksum=ac47d79f9a9f839f3b49b4fc89c07e56787ed4b662898443c69b9d3454e7ee4a
 
 kwidgetsaddons-devel_package() {
 	short_desc+=" - development"

From 5295fd489851c439f2fa9a0754085f9fe3488508 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:03 +0100
Subject: [PATCH 1866/3458] kwindowsystem: update to 5.79.0.

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

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index df9aa90a19fa..8adf4aca5a78 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6cb9caeceddaaa35754bb41051e1104f60bc205cf89b434fbdd88415edf57200
+checksum=b8aef806276b5f12e9810473679401a6715b3b86e786eb874b12b2b6ed16f196
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From d743ef0ba879e256ff7d47808f8562dc82de2283 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:06 +0100
Subject: [PATCH 1867/3458] kxmlgui: update to 5.79.0.

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

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index b0a290687ee5..66a8632d6134 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f80cb68986675a70a36ae711296973c9f88142779c4b402aa156a1bd577fdd17
+checksum=6983ae7d11a3518fd02850e8c9598aa35ea101b383c0a055d1f89e1d62590ec9
 
 kxmlgui-devel_package() {
 	short_desc+=" - development"

From 63ef252f6613fc6c4b9f95e5364b935813b875d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:08 +0100
Subject: [PATCH 1868/3458] kxmlrpcclient: update to 5.79.0.

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

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 51ba6abfa3ea..f9c9f297f36a 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=5d7c24fb3593f1eb43aefd74793738305025677ccbfcd38ecbd071a987602115
+checksum=8a64d6faadaf6fe36ef8d1493cc0e1be2a1db472f950b9caaaa396ed347d9bb3
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From adc6960a5738b918d9efe19d6db61eecb566be74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:10 +0100
Subject: [PATCH 1869/3458] modemmanager-qt5: update to 5.79.0.

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

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index 4335491c4b36..506fdff2a3e7 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.78.0
+version=5.79.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d9db3adb4f6e4103bbf2d584a6286c3995169090c072a6e8adeeb7b395bcc327
+checksum=8d17f3873ec858dabf33142f4a8193f1ab14fb263385f58d91b263a53c64cb75
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From ad5e69bbadeb2a00157390b8101313c811fe4dfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:13 +0100
Subject: [PATCH 1870/3458] networkmanager-qt5: update to 5.79.0.

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

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index 064ebbd80744..ffe973f9a4b0 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.78.0
+version=5.79.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=caf3d4ee4056af726467282bbbbb610e121f4288976adf3c174ba338e967de71
+checksum=da54339c4a8946bf430b01d7ec53542d1d6aab816a01303ad3fb8f8385c22a12
 
 networkmanager-qt5-devel_package() {
 	short_desc+=" - development"

From 85ce8bb520064be9e69f97ca3b93deacd4b65d9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:49 +0100
Subject: [PATCH 1871/3458] oxygen-icons5: update to 5.79.0.

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

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index bbe99bcc5840..d0d2cdf8691c 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=29cf52784263001acb4942d77107963aa354d5e98538563e60ae679dcafbe3f6
+checksum=5a63c5e40a7d9c3999b3d75734efe24ac3e57e23bc0f7b192ef70944494ed4c8
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From ed3aaacf748e9f6b6d833fb5f011154f15ef4338 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:53 +0100
Subject: [PATCH 1872/3458] plasma-framework: update to 5.79.0.

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

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index d9dc41f08228..b9b1366d9b91 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=46aee1e872728af5ec5c28c604494bbcdf01c32c19f9fe2593b749bbeb698481
+checksum=9dfc3d9a97b6a12ec29df27db063d4ac850c50339688968d9c4768e51b760b96
 
 plasma-framework-devel_package() {
 	short_desc+=" - development"

From 2b7b6a81c19c6be6d6db047a8e7d2b73ef215640 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:55 +0100
Subject: [PATCH 1873/3458] prison: update to 5.79.0.

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

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 4e5efa0557c1..0f2c6f397cbd 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=d351df1579331eadea6fe1f47fde8c7e11765746831947e993879edc996cfa79
+checksum=425dca5bf0dcf5b86cd71f2a62a8b86463619cc339ea4767e024a4778c35c6e6
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 1bd8cebc751c15c49a06b37eca7fe6ec2eb0628f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:58:57 +0100
Subject: [PATCH 1874/3458] purpose: update to 5.79.0.

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

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 1a787bcc6b22..f7a4789745fd 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=498017bdbd1f46773963d2b97bfb8b7d9e480fa6d958a83ce629c7d327e1628f
+checksum=ffe22c66aa638e984db9c0c30e49b739aa91878dc3b551f7a41c3bfe6b8197d6
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From 07349013d98d2c09d20215602d6b39fdce6ebc16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:59:01 +0100
Subject: [PATCH 1875/3458] qqc2-desktop-style: update to 5.79.0.

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

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index be00cfc41bb0..ec844e790902 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=33ea60eba2112036b6e3e136161746afe84d44227da7b6d3011b83beb3eb3329
+checksum=32ae0d02cdda44e5aa920c6b077f4034d1aad9c884bddac0e574cdfe575bd3b3
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8df64478cd9a8e75fb974f55559fef871f36f058 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:59:03 +0100
Subject: [PATCH 1876/3458] sonnet: update to 5.79.0.

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

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 17a7d8077bc0..e707c07896c3 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c2e70e96c66efa359b47c66937403089b11f6f9bf5406cb24f023809e70280cb
+checksum=d86f3aa5808784af3019c38126471fdf3add7b3420ce6a8f79a04c86d0ca6125
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From 2c36ac288801cf320a81be4d7ea7ea6dc5d4cf57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:59:06 +0100
Subject: [PATCH 1877/3458] syndication: update to 5.79.0.

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

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 71c56e6dc8e1..1e4b096896cd 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules 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}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=a12db60298fb8914d59ef286618a3c1fc351d6544f747024f665cddc5320c26b
+checksum=51862b9c8bbc6f8baa9dfea63c22d1fd92f95ae683581df7d58fe97f0c03dfcb
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 6780341c50cc8bb1387b4537cd03d7b9b8630a72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:59:09 +0100
Subject: [PATCH 1878/3458] syntax-highlighting: update to 5.79.1.

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

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index b33ca6bdf479..bf2190b6f8af 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.78.0
+version=5.79.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8b5eb71ce548bb2267235db42d026d8655285396cfc2766e0277c8688d7bd6d4
+checksum=b2825ebee4c527f96562d18abb553195809dcc32174a4b998c71850e24527990
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools syntax-highlighting qt5-devel qt5-tools-devel"

From 7b6b1f038a11b8f25f2cd11264c4fbf14da637c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 19 Feb 2021 18:59:12 +0100
Subject: [PATCH 1879/3458] threadweaver: update to 5.79.0.

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

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index c30b0eee929e..72cef6f32389 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.78.0
+version=5.79.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d972e78e5ce89004d52c08e689b539877f20c036a1ef0383d2be02bc6e7598d2
+checksum=297ca4454e9dc526af8033ee47932a63e3ef3d76868a75dfa66df0f7a04d5918
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From b286a5314310a130b20925eaee64e79826f0cf0a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 19 Feb 2021 21:34:21 +0100
Subject: [PATCH 1880/3458] ok.sh: update to 0.7.0.

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

diff --git a/srcpkgs/ok.sh/template b/srcpkgs/ok.sh/template
index 2e64907c7be8..0e986cb34e6a 100644
--- a/srcpkgs/ok.sh/template
+++ b/srcpkgs/ok.sh/template
@@ -1,7 +1,7 @@
 # Template file for 'ok.sh'
 pkgname=ok.sh
-version=0.6.1
-revision=2
+version=0.7.0
+revision=1
 depends="curl jq"
 checkdepends="socat ${depends}"
 short_desc="GitHub API client library written in POSIX sh"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/whiteinge/ok.sh"
 distfiles="https://github.com/whiteinge/ok.sh/archive/${version}.tar.gz"
-checksum=d051cba9301fe14b3d3044ee49e72da929298e29e3df1b61ee0a50f95a967b25
+checksum=79781711c16126b40f8acb3de1284b5a02aa936a7d6634555edcd01b5307efa2
 
 do_check() {
 	PATH="${PATH}":"${PWD}" make test

From 4d8e245ec3a28683fbdf03ac7425dc10809c49bc Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Fri, 19 Feb 2021 18:47:36 -0600
Subject: [PATCH 1881/3458] Amass: update to 3.11.5.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index d8ed19380c3f..078b6948b5a2 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.11.3
+version=3.11.5
 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=42c43e3a621c94f9838acbc5779ade3ce312785f5b434614d219986451f57e29
+checksum=8c60b7720eddb46bb4a841384485173de66d625dd2362e10c8d15e3106189e0e

From b739dadb7a083383915f6172c490dbda23d873a4 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 19 Feb 2021 21:11:25 +0100
Subject: [PATCH 1882/3458]  gotop: update to 4.1.1.

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

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 3566a8d9a78e..6b22aec99372 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,6 +1,6 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=go
 go_ldflags="-X main.Version=v${version}"
@@ -12,7 +12,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=e61375feb183cc2c73764aaac92e164ea77f073206f7dbbfd4997c0efd38bfc0
+checksum=314dcfc4b0faa0bb735e5fa84b2406492bf94f7948af43e2b9d2982d69d542ed
 
 post_install() {
 	vlicense LICENSE

From 7286390efbfaf56d71bafc5377644a519df75311 Mon Sep 17 00:00:00 2001
From: DirectorX <DirectorX@users.noreply.github.com>
Date: Sat, 20 Feb 2021 02:24:02 +0200
Subject: [PATCH 1883/3458] alacritty: update to 0.7.2.

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

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 0604f7bdc92a..7a679de9696c 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.7.1
+version=0.7.2
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=90dc5cd49bf0bb01a3202de2170ba376f9530aa265a939f6b3af3d30f8361f50
+checksum=750c294d384d23f1dfc30e9105380e4194507b0828ac91d8ffd94c9bbc18d6c3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 159acffaafbdb09776ee02f0002f4e81f109664e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 01:28:50 -0300
Subject: [PATCH 1884/3458] xurls: fix go_import_path.

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

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index 4bf77a78e92e..03a9960c67d5 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,10 +1,10 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.2.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/mvdan/${pkgname}"
-go_package="${go_import_path}/cmd/${pkgname}"
+go_import_path="mvdan.cc/xurls/v2"
+go_package="${go_import_path}/cmd/xurls"
 hostmakedepends="git"
 short_desc="Extract urls from text"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 82751b5d80486d399796a33f8a66b7bf84a45a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 03:35:50 -0300
Subject: [PATCH 1885/3458] bind: update to 9.16.12.

Fixes CVE-2020-8625 and whatever else was fixed in previous releases.

Add --disable-backtrace so it can build correctly on armv[67]l-musl,
otherwise I got errors about undefined references to _Unwind_GetIP,
which could have been provided by libunwind, but just makes the build
more complicated.
---
 common/shlibs         | 14 +++++++-------
 srcpkgs/bind/template | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ea28154120b4..be04108f650b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1009,13 +1009,13 @@ libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
 libtirpc.so.3 libtirpc-1.0.2_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
-libirs.so.1601 bind-libs-9.16.3_1
-libisc.so.1606 bind-libs-9.16.6_1
-libisccc.so.1600 bind-libs-9.16.2_1
-libisccfg.so.1601 bind-libs-9.16.7_1
-libns.so.1604 bind-libs-9.16.5_1
+libbind9-9.16.12.so bind-libs-9.16.12_1
+libdns-9.16.12.so bind-libs-9.16.12_1
+libirs-9.16.12.so bind-libs-9.16.12_1
+libisc-9.16.12.so bind-libs-9.16.12_1
+libisccc-9.16.12.so bind-libs-9.16.12_1
+libisccfg-9.16.12.so bind-libs-9.16.12_1
+libns-9.16.12.so bind-libs-9.16.12_1
 libplist-2.0.so.3 libplist-2.2.0_1
 libplist++-2.0.so.3 libplist++-2.2.0_1
 libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4fc..f7eb103ce98c 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
-version=9.16.7
-revision=3
+version=9.16.12
+revision=1
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -11,18 +11,23 @@ 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
+ --with-libidn2 --disable-backtrace
  $(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)"
+checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="MPL-2.0"
 homepage="https://www.isc.org/downloads/bind/"
 changelog="https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/CHANGES"
 distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.xz"
-checksum=9f7d1812ebbd26a699f62b6fa8522d5dec57e4bf43af0042a0d60d39ed8314d1
+checksum=9914af9311fd349cab441097898d94fb28d0bfd9bf6ed04fe1f97f042644da7f
+# guarantee subpackage ordering
+subpackages="bind-libs bind-utils bind-devel"
+# requires special network setup
+make_check=extended
 
 conf_files="/etc/named/named.conf"
 system_accounts="named"
@@ -33,11 +38,6 @@ make_dirs="/var/named 0770 root named"
 build_options="geoip"
 build_options_default="geoip"
 
-do_check() {
-	# requires special network setup
-	:
-}
-
 post_install() {
 	vsv named
 	vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named
@@ -52,7 +52,7 @@ post_install() {
 bind-libs_package() {
 	short_desc+=" - Runtime libraries"
 	pkg_install() {
-		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/*-*.so"
 	}
 }
 

From acfc6b0e4e21e4e49e2eef2b38bc39b4e570f753 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 19 Feb 2021 19:59:27 +0300
Subject: [PATCH 1886/3458] nushell: update to 0.27.1

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

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 9a14dc1771e8..a2cda058b6cd 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,6 +1,6 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.27.0
+version=0.27.1
 revision=2
 build_style=cargo
 configure_args="--features=extra"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://www.nushell.sh/"
 changelog="https://www.nushell.sh/blog/"
 distfiles="https://github.com/nushell/nushell/archive/${version}.tar.gz"
-checksum=0d086c660af2e6e286fcac0d0063607bd302961ba542a087145f6a3948fd7130
+checksum=bd153a95ea15446bb61a9e0292adc165ee0dd3a586298e77a0041597d68bc04e
 register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no

From 3ca05422fcab6c91ba4011acc99bd650736a8d72 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 19 Feb 2021 21:08:16 +0100
Subject: [PATCH 1887/3458] bpytop: update to 1.0.62.

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

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index c4b2e00034cf..ef48c813d33e 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.61
+version=1.0.62
 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=01bc712df11cb7022fff510e118130f4834c3dcd1f85267ada9c50a30af5919b
+checksum=a8e731dfb70d2fad3202e124d815c68dca327ebeebc5c30292964fd737e7cd41
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From 23fb46da38176c35a1f5a67f6bf333ac6d2f8d4e Mon Sep 17 00:00:00 2001
From: Reed Wade <reedwade@misterbanal.net>
Date: Sat, 13 Jun 2020 12:45:12 +0200
Subject: [PATCH 1888/3458] New Package: Dwarf-Therapist-41.1.7

---
 srcpkgs/Dwarf-Therapist/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/Dwarf-Therapist/template

diff --git a/srcpkgs/Dwarf-Therapist/template b/srcpkgs/Dwarf-Therapist/template
new file mode 100644
index 000000000000..fd3eb5925f08
--- /dev/null
+++ b/srcpkgs/Dwarf-Therapist/template
@@ -0,0 +1,18 @@
+# Template file for 'Dwarf-Therapist'
+pkgname=Dwarf-Therapist
+version=41.2.1
+revision=1
+build_style=cmake
+makedepends="qt5-declarative-devel libcap-devel hicolor-icon-theme"
+depends="dwarffortress"
+short_desc="Management tool designed to run side-by-side with Dwarf Fortress"
+maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Dwarf-Therapist/Dwarf-Therapist/"
+distfiles="https://github.com/Dwarf-Therapist/Dwarf-Therapist/archive/v${version}.tar.gz"
+checksum=ec954daff6e03d9d44153ed3df90685de3a7a07431fd47639d83b2f5b3f62e4b
+
+post_install() {
+	vbin dist/ptrace_scope/patch_df_ptracer
+	vbin dist/ptrace_scope/ptrace_cap_wrapper
+}

From fbada44c472fe24067a9e88a1c440c3f1927b5f3 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, 20 Feb 2021 08:46:12 +0700
Subject: [PATCH 1889/3458] goocanvas: enable gir on cross

---
 srcpkgs/goocanvas/template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/goocanvas/template b/srcpkgs/goocanvas/template
index 474031c57bf1..bc2cdf8420c5 100644
--- a/srcpkgs/goocanvas/template
+++ b/srcpkgs/goocanvas/template
@@ -1,22 +1,20 @@
 # Template file for 'goocanvas'
 pkgname=goocanvas
 version=2.0.4
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config"
-makedepends="gtk+3-devel cairo-devel glib-devel"
+build_helper=gir
+hostmakedepends="pkg-config python3 glib-devel"
+makedepends="gtk+3-devel cairo-devel libglib-devel"
 short_desc="Canvas widget for GTK+ that uses the cairo 2D library for drawing"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/GooCanvas"
-distfiles="${GNOME_SITE}/goocanvas/2.0/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/goocanvas/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=c728e2b7d4425ae81b54e1e07a3d3c8a4bd6377a63cffa43006045bceaa92e90
 
-if [ -z "$CROSS_BUILD" ]; then
-	hostmakedepends+=" gobject-introspection"
-else
-	hostmakedepends+=" python glib-devel"
-fi
+build_options=gir
+build_options_default=gir
 
 goocanvas-devel_package() {
 	short_desc+=" - development files"
@@ -27,7 +25,7 @@ goocanvas-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove usr/include
 		vmove usr/share/gtk-doc
-		if [ -z "$CROSS_BUILD" ]; then
+		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
 	}

From 7e996e05d9c4c78523d476a3743a3610c028e0f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:19:58 -0300
Subject: [PATCH 1890/3458] gobuster: add git back to hostmakedepends.

Might be necessary for building in some situations.
---
 srcpkgs/gobuster/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index 60e075b3182a..c5427cd4339b 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -4,6 +4,7 @@ version=3.1.0
 revision=2
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
+hostmakedepends="git"
 short_desc="Directory, file and DNS busting tool"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From d5654db86593d16174ae23623fcf70eb47239621 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Fri, 19 Feb 2021 19:19:02 -0600
Subject: [PATCH 1891/3458] projectM: update to 3.1.11.

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

diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index 6d9fc6a0a943..ac15d2a7a758 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,7 +1,7 @@
 # Template file for 'projectM'
 pkgname=projectM
-version=3.1.7
-revision=3
+version=3.1.11
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--datadir=/usr/libexec --enable-qt --enable-pulseaudio
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/projectM-visualizer/projectm"
 distfiles="${homepage}/releases/download/v${version}/projectM-${version}.tar.gz"
-checksum=30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3
+checksum=4f60506637d178b96646bdd3c78161f6e30a89dee556675625d6e03dea0ee791
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"

From 838482ad948a3919d3ed76754006668295faf6e8 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 18 Feb 2021 21:59:59 +0100
Subject: [PATCH 1892/3458] tig: update to 2.5.2.

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

diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template
index 815cab0a0584..13df86e9feff 100644
--- a/srcpkgs/tig/template
+++ b/srcpkgs/tig/template
@@ -1,6 +1,6 @@
 # Template file for 'tig'
 pkgname=tig
-version=2.5.1
+version=2.5.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-2.0-only"
 homepage="https://jonas.github.io/tig/"
 distfiles="https://github.com/jonas/tig/archive/tig-${version}.tar.gz"
-checksum=ae31e8b76ca00254d5a975f14bf5f4609778d6ecffa92430502450b4fe5461b5
+checksum=f3dbd9eb2f80a5ba1218b197e1428e576d6110ea94a817f6d0984950f5780c29
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

From 750808a84fee85bb34b4eeaee0c658ab1d360cea Mon Sep 17 00:00:00 2001
From: Midge Sinnaeve <mantissa-@users.noreply.github.com>
Date: Fri, 12 Feb 2021 15:46:30 +0100
Subject: [PATCH 1893/3458] Link OptiX library after installing

This change allows applications that use OptiX (eg. Blender) to find and use the library.
---
 srcpkgs/nvidia/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index db0ff9232660..83bfd9afe40b 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -209,6 +209,8 @@ do_install() {
 
 	# optix ray racing engine
 	vinstall libnvoptix.so.${version} 755 usr/lib
+	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so
+	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so.1
 
 	# dkms pkg
 	vmkdir usr/src/nvidia-${version}

From d2c6d5a203a6cc1eaa14b78a4948e0f0b51db0e2 Mon Sep 17 00:00:00 2001
From: Midge Sinnaeve <mantissa-@users.noreply.github.com>
Date: Mon, 15 Feb 2021 11:04:28 +0100
Subject: [PATCH 1894/3458] Hardcoded /usr/lib path instead of using variable

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

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 83bfd9afe40b..2d300b5613dd 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -209,8 +209,8 @@ do_install() {
 
 	# optix ray racing engine
 	vinstall libnvoptix.so.${version} 755 usr/lib
-	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so
-	ln -sf libnvoptix.so.${version} ${DESTDIR}/${libdir}/libnvoptix.so.1
+	ln -sf libnvoptix.so.${version} /usr/lib/libnvoptix.so
+	ln -sf libnvoptix.so.${version} /usr/lib/libnvoptix.so.1
 
 	# dkms pkg
 	vmkdir usr/src/nvidia-${version}

From 56607ab8dc58247496c7e318923c7062511d9cdc Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Fri, 19 Feb 2021 20:08:00 -0600
Subject: [PATCH 1895/3458] nvidia: revbump because mistakes and reasons

Sorry. :(
---
 srcpkgs/nvidia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 2d300b5613dd..15cab648bf89 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=460.39
-revision=2
+revision=3
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"

From deb295f3a818006822d82508297e25cdfe11b1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 21:45:00 -0300
Subject: [PATCH 1896/3458] wxPython4: fix cross build.

The PYTHON_CONFIG path was using /bin/python3-config, but the cross
toolchains currently lack usrmerge. Since the canonical location is
/usr/bin anyway, switching to /usr/bin is 100% correct.

Since we are here, also clean up how CFLAGS are being set.
---
 srcpkgs/wxPython4/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index 08dcc5d5c128..1f32be9131ce 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -16,24 +16,21 @@ 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}"
+	CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
 fi
 
 pre_build() {
 	chmod -R go+rX $wrksrc
 	if [ "$CROSS_BUILD" ]; then
 		PYPREFIX="$XBPS_CROSS_BASE"
-		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
 		LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib"
 		CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
 		LDSHARED="${CC} -shared $LDFLAGS"
 		env CC="$CC" LDSHARED="$LDSHARED" \
 			PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
-			PYTHON_CONFIG="${XBPS_CROSS_BASE}/bin/python3-config" \
+			PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" \
 			LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx
 	else
 		python3 build.py build_py --use_syswx

From f59085429381751700dc71fb147839afd0e083c0 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 18 Feb 2021 16:32:46 +0300
Subject: [PATCH 1897/3458] python3-PyJWT: update to 2.0.1 + fix information

Depend on the correct python package
---
 srcpkgs/python3-PyJWT/template | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
index d8137fd5ec68..0fe2e97c019c 100644
--- a/srcpkgs/python3-PyJWT/template
+++ b/srcpkgs/python3-PyJWT/template
@@ -1,15 +1,20 @@
 # Template file for 'python3-PyJWT'
 pkgname=python3-PyJWT
-version=2.0.0
+version=2.0.1
 revision=1
-wrksrc="PyJWT-${version}"
+wrksrc="pyjwt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python"
-checkdepends="python3-pytest"
-short_desc="Platform independent file lock"
+depends="python3"
+short_desc="Python implementation of RFC 7519"
 maintainer="fosslinux <fosslinux@aussies.space>"
-license="Unlicense"
-homepage="https://filelock.readthedocs.io/en/latest/"
-distfiles="${PYPI_SITE}/P/PyJWT/PyJWT-${version}.tar.gz"
-checksum=7a2b271c6dac2fda9e0c33d176c4253faba2c6c6b3a99c7f28a32c3c97522779
+license="MIT"
+homepage="https://pyjwt.readthedocs.io/"
+distfiles="https://github.com/jpadilla/pyjwt/archive/${version}.tar.gz"
+checksum=63f296b42b4107a9e3ba4994d2d575ee0d05b9a55f433a3f46febfc4ee381ad1
+# Re-enable when switching to OpenSSL
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 44650ec9fd3c8c21812c5c431f09cd9d2e6b0998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 17:24:28 -0300
Subject: [PATCH 1898/3458] common/build-style: remove go_get from Go style.

Fix Manual accordingly, and also fix indentation to be compatible with
nearby items.

The two packages which set this variable set it explicitly to "no", so
it wasn't relied upon. From its description, it was recommended only for
git packages, which by default don't fit Void's packaging guidelines.
Removing to avoid anyone coming to rely on it.
---
 Manual.md                     | 15 +++++----------
 common/build-style/go.sh      |  2 +-
 srcpkgs/doctl/template        |  1 -
 srcpkgs/goimapnotify/template |  1 -
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Manual.md b/Manual.md
index 86dfeff6103e..ddb9bec934c9 100644
--- a/Manual.md
+++ b/Manual.md
@@ -914,12 +914,11 @@ that do such things as append (`+=`) to variables, should have `make_use_env`
 set in the body of the template.
 
 - `go` For programs written in Go that follow the standard package
-  structure. The variable `go_import_path` must be set to the package's
-  import path, e.g. `github.com/github/hub` for the `hub` program. If
-  the variable `go_get` is set to `yes`, the package will be
-  downloaded with `go get`. Otherwise (the default) it's expected that
-  the distfile contains the package. In both cases, dependencies will
-  be downloaded with `go get`.
+structure. The variable `go_import_path` must be set to the package's
+import path, e.g. `github.com/github/hub` for the `hub` program. This
+information can be found in the `go.mod` file for modern Go projects.
+It's expected that the distfile contains the package, but dependencies
+will be downloaded with `go get`.
 
 - `meta` For `meta-packages`, i.e packages that only install local files or simply
 depend on additional packages. This build style does not install
@@ -1585,10 +1584,6 @@ The following template variables influence how Go packages are built:
   variable is required.
 - `go_package`: A space-separated list of import paths of the packages
   that should be built. Defaults to `go_import_path`.
-- `go_get`: If set to yes, the package specified via `go_import_path`
-  will be downloaded with `go get`. Otherwise, a distfile has to be
-  provided. This option should only be used with `-git` (or similar)
-  packages; using a versioned distfile is preferred.
 - `go_build_tags`: An optional, space-separated list of build tags to
   pass to Go.
 - `go_mod_mode`: The module download mode to use. May be `off` to ignore
diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index c9f476b95c7a..d18116ee9633 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -15,7 +15,7 @@ do_configure() {
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
 		# Skip GOPATH symlink for Go modules
 		msg_normal "Building $pkgname using Go modules.\n"
-	elif [ "${go_get}" != "yes" ]; then
+	else
 		mkdir -p ${GOSRCPATH%/*}/
 		ln -fs "$PWD" "${GOSRCPATH}"
 	fi
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 926126ac0e25..a8bff28abc28 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
 go_build_tags="v${version}"
-go_get="no"
 short_desc="Command line tool for DigitalOcean services"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 3e4bd5edfca1..2c045c337fdc 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -4,7 +4,6 @@ version=2.0
 revision=1
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
-go_get="no"
 hostmakedepends="git"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From c2a299c1031dfec71ee5f9c83d94fd98c06fc246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:15:42 -0300
Subject: [PATCH 1899/3458] chrome-gnome-shell: use python3.

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

diff --git a/srcpkgs/chrome-gnome-shell/template b/srcpkgs/chrome-gnome-shell/template
index f4ae9ad6cfbd..244f7fa37a71 100644
--- a/srcpkgs/chrome-gnome-shell/template
+++ b/srcpkgs/chrome-gnome-shell/template
@@ -1,11 +1,11 @@
 # Template file for 'chrome-gnome-shell'
 pkgname=chrome-gnome-shell
 version=10.1
-revision=1
+revision=2
 build_style=cmake
 configure_args=" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXTENSION=OFF ../"
-hostmakedepends="python jq"
-depends="python python-gobject python-requests dbus gnome-shell"
+hostmakedepends="python3 jq"
+depends="python3 python3-gobject python3-requests dbus gnome-shell"
 short_desc="GNOME Shell integration for Chrome"
 maintainer="Stepan Usatiuk <stepus53@gmail.com>"
 license="GPL-3.0-or-later"

From 4eb1ed2a724a6a8286bdbcee794ae671ca9ab821 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, 20 Feb 2021 12:16:56 +0700
Subject: [PATCH 1900/3458] build-style/cmake: also fix -isystem for Ninja

Discovered by cross-build failure of gnuradio-osmosdr.

While we're at it, fix flags.make in batch.
---
 common/build-style/cmake.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 00ef3ff37e5f..2eb512ee390c 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -67,8 +67,12 @@ _EOF
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
 		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" \;
+	# Replace -isystem with -I
+	if [ "$CMAKE_GENERATOR" = "Unix Makefiles" ]; then
+		find . -name flags.make -exec sed -i -e 's/-isystem/-I/g' +
+	elif [ "$CMAKE_GENERATOR" = Ninja ]; then
+		sed -i -e 's/-isystem/-I/g' build.ninja
+	fi
 }
 
 do_build() {

From 79da39cf0f9d538249627ecfee5fe520cfba7b88 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, 20 Feb 2021 12:19:04 +0700
Subject: [PATCH 1901/3458] gqrx: fix cross build

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

diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 020e90288aed..8fc8f01bbc4c 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -5,7 +5,8 @@ revision=2
 build_style=cmake
 configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
  $(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3
+ gnuradio"
 makedepends="boost-devel gnuradio-devel gnuradio-osmosdr-devel
  pulseaudio-devel qt5-svg-devel log4cpp-devel mpir-devel volk-devel
  fftw-devel python3-devel alsa-lib-devel jack-devel gmpxx-devel

From 83ae8ffe6cde3ae64885b2fd2a70731cefb3b5ee 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, 20 Feb 2021 13:10:46 +0700
Subject: [PATCH 1902/3458] build-style/cmake: add missing "{}"

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 2eb512ee390c..5100a96dfd7b 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -69,7 +69,7 @@ _EOF
 
 	# Replace -isystem with -I
 	if [ "$CMAKE_GENERATOR" = "Unix Makefiles" ]; then
-		find . -name flags.make -exec sed -i -e 's/-isystem/-I/g' +
+		find . -name flags.make -exec sed -i -e 's/-isystem/-I/g' "{}" +
 	elif [ "$CMAKE_GENERATOR" = Ninja ]; then
 		sed -i -e 's/-isystem/-I/g' build.ninja
 	fi

From 3acef889a723af37092f72249df6e37843b4b982 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 20:06:38 +0100
Subject: [PATCH 1903/3458] man-db: update to 2.9.4.

Closes: #28642 [via git-merge-pr]
---
 srcpkgs/man-db/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index 7b3b2bcbff9e..c8b873771d27 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,6 +1,6 @@
 # Template file for 'man-db'
 pkgname=man-db
-version=2.9.3
+version=2.9.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
@@ -20,13 +20,16 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.nongnu.org/man-db/"
 changelog="https://git.savannah.gnu.org/cgit/man-db.git/plain/NEWS"
 distfiles="${NONGNU_SITE}/man-db/man-db-${version}.tar.xz"
-checksum=fa5aa11ab0692daf737e76947f45669225db310b2801a5911bceb7551c5597b8
+checksum=b66c99edfad16ad928c889f87cf76380263c1609323c280b3a9e6963fdb16756
 provides="man-0_1"
 lib32disabled=yes
 system_accounts="_man"
 _man_homedir="/var/cache/man"
 make_dirs="/var/cache/man 0755 _man _man"
 
+# among others, requires the _man user to be available in the masterdir
+make_check=no
+
 alternatives="
  man:man:/usr/bin/mandb-man
  man:whatis:/usr/bin/mandb-whatis

From 90cce07f1d58cfa817aa8c67df6e440ad8dabbce Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Thu, 18 Feb 2021 14:34:07 +0100
Subject: [PATCH 1904/3458] pipewire: update to 0.3.22

* explicitly enable the vulkan plugin: it is now disabled by default due
to being useless at the moment, but we've already packaged it...
---
 srcpkgs/pipewire/INSTALL.msg                  |  4 +-
 ...0bea4167573d3d364e1a768605d11be241293.diff | 74 -------------------
 srcpkgs/pipewire/patches/ncursesw.patch       | 10 +--
 srcpkgs/pipewire/template                     |  8 +-
 4 files changed, 11 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
index f7c4437683dc..8475a2465b7b 100644
--- a/srcpkgs/pipewire/INSTALL.msg
+++ b/srcpkgs/pipewire/INSTALL.msg
@@ -1,3 +1,3 @@
-WARNING: pipewire>=0.3.19 changed the config file format. If
+WARNING: pipewire frequently changes the config file format. If
 you edited /etc/pipewire/pipewire.conf you must recreate it from
-/etc/pipewire/pipewire.conf.new-0.3.19_1 with your changes on top.
+/etc/pipewire/pipewire.conf.new-0.3.xx with your changes on top.
diff --git a/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff b/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
deleted file mode 100644
index 10cd090cce7c..000000000000
--- a/srcpkgs/pipewire/patches/3450bea4167573d3d364e1a768605d11be241293.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-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/patches/ncursesw.patch b/srcpkgs/pipewire/patches/ncursesw.patch
index 92598546b114..09b8f071c41c 100644
--- a/srcpkgs/pipewire/patches/ncursesw.patch
+++ b/srcpkgs/pipewire/patches/ncursesw.patch
@@ -1,11 +1,11 @@
---- meson.build.orig	2021-01-05 18:40:24.345620177 +0100
-+++ meson.build	2021-01-05 18:40:43.209619527 +0100
-@@ -325,7 +325,7 @@
+--- meson.build.orig	2021-02-18 14:35:42.028024846 +0100
++++ meson.build	2021-02-18 14:39:53.808039159 +0100
+@@ -311,7 +311,7 @@
  pthread_lib = dependency('threads')
  dbus_dep = dependency('dbus-1')
- sdl_dep = dependency('sdl2', required : false)
+ sdl_dep = dependency('sdl2', required : get_option('sdl2'))
 -ncurses_dep = dependency('ncurses', required : false)
 +ncurses_dep = dependency('ncursesw', required : false)
- sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : false)
+ sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
  
  if get_option('gstreamer')
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index f327ea67fb22..7072e95fa015 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,11 +1,11 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.21
-revision=2
+version=0.3.22
+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
- -Dudevrulesdir=/usr/lib/udev/rules.d"
+ -Dvulkan=true -Dudevrulesdir=/usr/lib/udev/rules.d"
 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
@@ -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=228e744f7acfac92e4c7a2606ed7f6ecd7460f53ec735e7c01176539e386432b
+checksum=5db2caf41af79cd9e343d07a3804c63b8b243c1d74e926181058e29771d4b691
 conf_files="/etc/pipewire/pipewire.conf"
 
 replaces="libpulseaudio-pipewire>=0"

From 5bb95d6dfa277135c53522449dd2630580bf31db Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 28 Jan 2021 19:33:52 +0300
Subject: [PATCH 1905/3458] grub-btrfs: update to 4.8.1

Added a service file to auto-update grub menu on changes
in /.snapshots directory
---
 srcpkgs/grub-btrfs-runit                    |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/conf    |  1 +
 srcpkgs/grub-btrfs/files/grub-btrfs/log/run |  2 ++
 srcpkgs/grub-btrfs/files/grub-btrfs/run     | 12 ++++++++++++
 srcpkgs/grub-btrfs/template                 | 13 +++++++++++--
 5 files changed, 27 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/grub-btrfs-runit
 create mode 100644 srcpkgs/grub-btrfs/files/grub-btrfs/conf
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/log/run
 create mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/run

diff --git a/srcpkgs/grub-btrfs-runit b/srcpkgs/grub-btrfs-runit
new file mode 120000
index 000000000000..ad9b415a9d84
--- /dev/null
+++ b/srcpkgs/grub-btrfs-runit
@@ -0,0 +1 @@
+grub-btrfs
\ No newline at end of file
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/conf b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
new file mode 100644
index 000000000000..75d1f2ceca8b
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/conf
@@ -0,0 +1 @@
+SNAPSHOTS_PATH=/.snapshots
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/log/run b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
new file mode 100755
index 000000000000..267659045cda
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t grub-btrfs
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/run b/srcpkgs/grub-btrfs/files/grub-btrfs/run
new file mode 100755
index 000000000000..3ee376330278
--- /dev/null
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+exec 2>&1
+[ -r conf ] && . ./conf
+
+if [ -d "${SNAPSHOTS_PATH}" ]
+then
+	exec wendy ${OPTS} -m 960 -w "${SNAPSHOTS_PATH}" bash -c \
+	 'if [ -s "/boot/grub/grub-btrfs.cfg" ]; then /etc/grub.d/41_snapshots-btrfs; else update-grub; fi'
+else
+  exit 1
+fi
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index fd8efe3b657e..8c1a2f5954c9 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.8
+version=4.8.1
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,8 +9,17 @@ 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=78ba3c0e5c998317785d07409c6aaebb269fad1fe97794c95a0842f012676794
+checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd
 }
+
+grub-btrfs-runit_package() {
+	depends="wendy ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - runit service"
+
+	pkg_install() {
+		vsv grub-btrfs
+	}
+}

From a16bf6a7340844061007ec4e69e6a30e859d51cb Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Fri, 19 Feb 2021 23:16:42 -0800
Subject: [PATCH 1906/3458] void-release-keys: Add 20210218 key

---
 srcpkgs/void-release-keys/files/void-release-20210218.pub | 2 ++
 srcpkgs/void-release-keys/template                        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/void-release-keys/files/void-release-20210218.pub

diff --git a/srcpkgs/void-release-keys/files/void-release-20210218.pub b/srcpkgs/void-release-keys/files/void-release-20210218.pub
new file mode 100644
index 000000000000..77a140445cfb
--- /dev/null
+++ b/srcpkgs/void-release-keys/files/void-release-20210218.pub
@@ -0,0 +1,2 @@
+untrusted comment: This key is only valid for images with date 20210218. public key
+RWRSNnH5WbLx1EWUgJGeccx/Dof1MH5k5tZFytMlIOgpRJvRxHJtMqrP
diff --git a/srcpkgs/void-release-keys/template b/srcpkgs/void-release-keys/template
index fc6e28ec2426..4ad46b1289df 100644
--- a/srcpkgs/void-release-keys/template
+++ b/srcpkgs/void-release-keys/template
@@ -1,7 +1,7 @@
 # Template file for 'void-release-keys'
 pkgname=void-release-keys
 version=1
-revision=2
+revision=3
 short_desc="Void Linux Release Keys"
 maintainer="Void Release Engineering <releases@voidlinux.org>"
 license="Public Domain"

From dfef43de05767b13ea95e79f9f8eaf0c757de357 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Fri, 19 Feb 2021 23:02:35 -0800
Subject: [PATCH 1907/3458] jetbrains-jdk-bin: update to 11.0.10b1341.2.

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

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index 6d502fc463f9..1521c48bfaa9 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,7 +1,6 @@
 # Template file for 'jetbrains-jdk-bin'
 pkgname=jetbrains-jdk-bin
-reverts=11.0.9b1183.9_1
-version=11.0.9.1b1257.1
+version=11.0.10b1341.2
 revision=1
 archs="x86_64"
 wrksrc="jbrsdk"
@@ -13,7 +12,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=c9f40f9591a3d740963e12a668740525f6d84fe7f6756589ec99e695a34fe94a
+checksum=692460c73e21592298d57362088ade4017d88fe4cd917f746be94b81a8fd7953
 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 e862fe8eef23ab03a7915069c7319a72201b0214 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 20 Feb 2021 12:17:25 +0100
Subject: [PATCH 1908/3458] rspamd: fix build

changing to ninja in cmake build-style broke the sed calls
---
 srcpkgs/rspamd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e0..10a2681fc193 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -32,15 +32,15 @@ if [ "$CROSS_BUILD" ]; then
 
 	pre_build() {
 		make -C build_native/contrib/snowball
-		sed -i "s#\./snowball#../../../build_native/contrib/snowball/snowball#g" \
-			build/contrib/snowball/CMakeFiles/stemmer.dir/build.make
+		vsed -e "s#${wrksrc}/build/contrib/snowball/snowball#${wrksrc}/build_native/contrib/snowball/snowball#g" \
+			-i build/build.ninja
 	}
 fi
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)	# Remove non existing library nsl
-			sed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
+			vsed -i CMakeLists.txt -e "/LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)/d"
 	esac
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+=" -C ${FILESDIR}/TryRunResults.cmake"

From c17f5b1b919b7cef0d2c669805e9c4631f1e6a59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 20 Feb 2021 12:32:00 +0100
Subject: [PATCH 1909/3458] monero: fix cross-build

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

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e2490..bb2f0600d941 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -77,7 +77,7 @@ pre_build() {
 		# but is not included in the binary package. It thus needs to be
 		# built for the host
 		CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			make -C build ${makejobs} generate_translations_header
+			ninja -C build ${makejobs} generate_translations_header
 	fi
 }
 

From b90f73f8d83dee752ae06b39309b394aa2ca1272 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 20 Feb 2021 13:12:20 +0100
Subject: [PATCH 1910/3458] build-style/meson.sh: move <lang>_args to build-in
 options section and fix cross compiling of rust code

It seems like meson is dropping rust_args when testing the rust compiler, so we just append them directly to rustc
---
 common/build-style/meson.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh
index b1eddda36e76..c59fd7d984dd 100644
--- a/common/build-style/meson.sh
+++ b/common/build-style/meson.sh
@@ -53,7 +53,7 @@ strip = '${STRIP}'
 readelf = '${READELF}'
 objcopy = '${OBJCOPY}'
 pkgconfig = '${PKG_CONFIG}'
-rust = 'rustc'
+rust = ['rustc', '--target', '${RUST_TARGET}' ,'--sysroot', '${XBPS_CROSS_BASE}/usr']
 g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner'
 g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler'
 g-ir-generate = '${XBPS_CROSS_BASE}/usr/bin/g-ir-generate'
@@ -62,6 +62,8 @@ cups-config = '${XBPS_CROSS_BASE}/usr/bin/cups-config'
 
 [properties]
 needs_exe_wrapper = true
+
+[built-in options]
 c_args = ['$(echo ${CFLAGS} | sed -r "s/\s+/','/g")']
 c_link_args = ['$(echo ${LDFLAGS} | sed -r "s/\s+/','/g")']
 

From 4f1d55fb3685f2995993477dbcc1cd1933133680 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, 20 Feb 2021 07:06:47 +0700
Subject: [PATCH 1911/3458] python3-elementpath: update to 2.1.4.

---
 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 039c2b1f877c..199c05cdfe15 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.1.1
+version=2.1.4
 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=7ac47a1a0da75ccde8a7427954a05a8d8d341a6032c8e272c4d471babcc63e02
+checksum=326643aca7beff0864d022cd591736b8550a70fccafd67a89198166baed1c2c4
 
 post_patch() {
 	# locale handling in musl is NOT that ideal,

From 09db1893b2bb754f9e8c6a8f27480dc5831ca7f8 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, 20 Feb 2021 07:07:28 +0700
Subject: [PATCH 1912/3458] python3-xmlschema: update to 1.5.1.

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

diff --git a/srcpkgs/python3-xmlschema/template b/srcpkgs/python3-xmlschema/template
index c8629becabe1..09a68b9cfac3 100644
--- a/srcpkgs/python3-xmlschema/template
+++ b/srcpkgs/python3-xmlschema/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-xmlschema'
 pkgname=python3-xmlschema
-version=1.4.1
+version=1.5.1
 revision=1
 wrksrc=xmlschema-${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/xmlschema"
 distfiles="${PYPI_SITE}/x/xmlschema/xmlschema-${version}.tar.gz"
-checksum=ade693114ff2e4a9ed5a2371ce29ae888f689bc58e326e5796f8a7dc8954dd4a
+checksum=c4c72b457865f46394bb23525b4e233d6537d9e97b8c6144a6cda2d5ef0d6688
 
 do_check() {
 	PYTHONPATH=$(pwd)/build/lib python3 -m unittest

From 697ae63cb81c97a98158df760f2db8f37ad3526b 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, 20 Feb 2021 07:07:37 +0700
Subject: [PATCH 1913/3458] python3-Sphinx: update to 3.5.1.

---
 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 99ed0a8019b7..290850ec55f4 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.3
+version=3.5.1
 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=41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c
+checksum=11d521e787d9372c289472513d807277caafb1684b33eb4f08f7574c405893a9
 conflicts="python-Sphinx>=0"
 
 do_check() {

From 01979e2e7f9ba3f1435766b34d5ce0968d2022c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:05:02 -0500
Subject: [PATCH 1914/3458] protobuf25: rename to protobuf26, update to 3.15.0

---
 common/shlibs                               |  6 ++--
 srcpkgs/libprotobuf25                       |  1 -
 srcpkgs/libprotobuf25-lite                  |  1 -
 srcpkgs/libprotobuf26                       |  1 +
 srcpkgs/libprotobuf26-lite                  |  1 +
 srcpkgs/libprotoc-devel                     |  2 +-
 srcpkgs/libprotoc25                         |  1 -
 srcpkgs/libprotoc25-devel                   |  1 -
 srcpkgs/libprotoc26                         |  1 +
 srcpkgs/libprotoc26-devel                   |  1 +
 srcpkgs/protobuf                            |  2 +-
 srcpkgs/protobuf-devel                      |  2 +-
 srcpkgs/protobuf-lite                       |  2 +-
 srcpkgs/protobuf25-devel                    |  1 -
 srcpkgs/protobuf26-devel                    |  1 +
 srcpkgs/{protobuf25 => protobuf26}/template | 40 +++++++++++----------
 16 files changed, 33 insertions(+), 31 deletions(-)
 delete mode 120000 srcpkgs/libprotobuf25
 delete mode 120000 srcpkgs/libprotobuf25-lite
 create mode 120000 srcpkgs/libprotobuf26
 create mode 120000 srcpkgs/libprotobuf26-lite
 delete mode 120000 srcpkgs/libprotoc25
 delete mode 120000 srcpkgs/libprotoc25-devel
 create mode 120000 srcpkgs/libprotoc26
 create mode 120000 srcpkgs/libprotoc26-devel
 delete mode 120000 srcpkgs/protobuf25-devel
 create mode 120000 srcpkgs/protobuf26-devel
 rename srcpkgs/{protobuf25 => protobuf26}/template (76%)

diff --git a/common/shlibs b/common/shlibs
index be04108f650b..ce0e74cc74e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3002,9 +3002,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
 libm17n-gui.so.0 m17n-lib-1.7.0_1
 libm17n-core.so.0 m17n-lib-1.7.0_1
 libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.25 libprotobuf25-lite-3.14.0_1
-libprotoc.so.25 libprotoc25-3.14.0_1
-libprotobuf.so.25 libprotobuf25-3.14.0_1
+libprotobuf-lite.so.26 libprotobuf26-lite-3.15.0_1
+libprotoc.so.26 libprotoc26-3.15.0_1
+libprotobuf.so.26 libprotobuf26-3.15.0_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
diff --git a/srcpkgs/libprotobuf25 b/srcpkgs/libprotobuf25
deleted file mode 120000
index fc93dda44955..000000000000
--- a/srcpkgs/libprotobuf25
+++ /dev/null
@@ -1 +0,0 @@
-protobuf25
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf25-lite b/srcpkgs/libprotobuf25-lite
deleted file mode 120000
index fc93dda44955..000000000000
--- a/srcpkgs/libprotobuf25-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf25
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf26 b/srcpkgs/libprotobuf26
new file mode 120000
index 000000000000..33f1f6780449
--- /dev/null
+++ b/srcpkgs/libprotobuf26
@@ -0,0 +1 @@
+protobuf26
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf26-lite b/srcpkgs/libprotobuf26-lite
new file mode 120000
index 000000000000..33f1f6780449
--- /dev/null
+++ b/srcpkgs/libprotobuf26-lite
@@ -0,0 +1 @@
+protobuf26
\ No newline at end of file
diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
index fc93dda44955..33f1f6780449 120000
--- a/srcpkgs/libprotoc-devel
+++ b/srcpkgs/libprotoc-devel
@@ -1 +1 @@
-protobuf25
\ No newline at end of file
+protobuf26
\ No newline at end of file
diff --git a/srcpkgs/libprotoc25 b/srcpkgs/libprotoc25
deleted file mode 120000
index fc93dda44955..000000000000
--- a/srcpkgs/libprotoc25
+++ /dev/null
@@ -1 +0,0 @@
-protobuf25
\ No newline at end of file
diff --git a/srcpkgs/libprotoc25-devel b/srcpkgs/libprotoc25-devel
deleted file mode 120000
index fc93dda44955..000000000000
--- a/srcpkgs/libprotoc25-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf25
\ No newline at end of file
diff --git a/srcpkgs/libprotoc26 b/srcpkgs/libprotoc26
new file mode 120000
index 000000000000..33f1f6780449
--- /dev/null
+++ b/srcpkgs/libprotoc26
@@ -0,0 +1 @@
+protobuf26
\ No newline at end of file
diff --git a/srcpkgs/libprotoc26-devel b/srcpkgs/libprotoc26-devel
new file mode 120000
index 000000000000..33f1f6780449
--- /dev/null
+++ b/srcpkgs/libprotoc26-devel
@@ -0,0 +1 @@
+protobuf26
\ No newline at end of file
diff --git a/srcpkgs/protobuf b/srcpkgs/protobuf
index fc93dda44955..33f1f6780449 120000
--- a/srcpkgs/protobuf
+++ b/srcpkgs/protobuf
@@ -1 +1 @@
-protobuf25
\ No newline at end of file
+protobuf26
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
index fc93dda44955..33f1f6780449 120000
--- a/srcpkgs/protobuf-devel
+++ b/srcpkgs/protobuf-devel
@@ -1 +1 @@
-protobuf25
\ No newline at end of file
+protobuf26
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
index fc93dda44955..33f1f6780449 120000
--- a/srcpkgs/protobuf-lite
+++ b/srcpkgs/protobuf-lite
@@ -1 +1 @@
-protobuf25
\ No newline at end of file
+protobuf26
\ No newline at end of file
diff --git a/srcpkgs/protobuf25-devel b/srcpkgs/protobuf25-devel
deleted file mode 120000
index fc93dda44955..000000000000
--- a/srcpkgs/protobuf25-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf25
\ No newline at end of file
diff --git a/srcpkgs/protobuf26-devel b/srcpkgs/protobuf26-devel
new file mode 120000
index 000000000000..33f1f6780449
--- /dev/null
+++ b/srcpkgs/protobuf26-devel
@@ -0,0 +1 @@
+protobuf26
\ No newline at end of file
diff --git a/srcpkgs/protobuf25/template b/srcpkgs/protobuf26/template
similarity index 76%
rename from srcpkgs/protobuf25/template
rename to srcpkgs/protobuf26/template
index 00afe18a549f..3f9689a50e08 100644
--- a/srcpkgs/protobuf25/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
-# Template file for 'protobuf25'
-pkgname=protobuf25
-version=3.14.0
+# Template file for 'protobuf26'
+pkgname=protobuf26
+version=3.15.0
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,10 +12,10 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=d0f5f605d0d656007ce6c8b5a82df3037e1d8fe8b121ed42e536f569dec16113
+checksum=6aff9834fd7c540875e1836967c8d14c6897e3785a2efac629f69860fb7834ff
 
 # Switch to versioned package
-conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0"
+conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"
 replaces="protobuf<=3.11.4_1 ${conflicts}"
 
 if [ "$CROSS_BUILD" ]; then
@@ -42,7 +42,7 @@ post_install() {
 	vlicense LICENSE
 }
 
-libprotobuf25_package() {
+libprotobuf26_package() {
 	short_desc="Protocol buffers C++ library"
 	pkg_install() {
 		vmove "usr/lib/libprotobuf.so.*"
@@ -50,7 +50,7 @@ libprotobuf25_package() {
 	}
 }
 
-libprotobuf25-lite_package() {
+libprotobuf26-lite_package() {
 	short_desc="Protocol buffers C++ library (lite version)"
 	pkg_install() {
 		vmove "usr/lib/libprotobuf-lite.so.*"
@@ -58,7 +58,7 @@ libprotobuf25-lite_package() {
 	}
 }
 
-libprotoc25_package() {
+libprotoc26_package() {
 	short_desc="Protocol buffers compiler library"
 	pkg_install() {
 		vmove "usr/lib/libprotoc.so.*"
@@ -66,11 +66,12 @@ libprotoc25_package() {
 	}
 }
 
-libprotoc25-devel_package() {
-	depends="libprotoc25-${version}_${revision}"
+libprotoc26-devel_package() {
+	depends="libprotoc26-${version}_${revision}"
 	short_desc="Protocol buffers compiler library - development files"
 	# Switch to versioned package
-	conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0 libprotoc24-devel>=0"
+	conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0
+	 libprotoc24-devel>=0 libprotoc25-devel>=0"
 	replaces="libprotoc-devel<=3.11.4_1 ${conflicts}"
 	pkg_install() {
 		vmove usr/lib/libprotoc.a
@@ -79,13 +80,14 @@ libprotoc25-devel_package() {
 	}
 }
 
-protobuf25-devel_package() {
+protobuf26-devel_package() {
 	depends="zlib-devel
-	 libprotobuf25-${version}_${revision}
-	 libprotobuf25-lite-${version}_${revision}"
+	 libprotobuf26-${version}_${revision}
+	 libprotobuf26-lite-${version}_${revision}"
 	short_desc="Protocol buffers C++ library - development files"
 	# Switch to versioned package
-	conflicts="protobuf18-devel>=0 protobuf23-devel>=0 protobuf24-devel>=0"
+	conflicts="protobuf18-devel>=0 protobuf23-devel>=0
+	 protobuf24-devel>=0 protobuf25-devel>=0"
 	replaces="protobuf-devel<=3.11.4_1 ${conflicts}"
 	pkg_install() {
 		vmove usr/include
@@ -100,23 +102,23 @@ protobuf25-devel_package() {
 protobuf_package() {
 	build_style=meta
 	short_desc="Protocol buffers compiler (meta package)"
-	depends="protobuf25"
+	depends="protobuf26"
 }
 
 protobuf-devel_package() {
 	build_style=meta
 	short_desc="Protocol buffers C++ library - development files (meta package)"
-	depends="protobuf25-devel"
+	depends="protobuf26-devel"
 }
 
 protobuf-lite_package() {
 	build_style=meta
 	short_desc="Protocol buffers C++ library - lite version (meta package)"
-	depends="libprotobuf25-lite"
+	depends="libprotobuf26-lite"
 }
 
 libprotoc-devel_package() {
 	build_style=meta
 	short_desc="Protocol buffers compiler library - development files (meta package)"
-	depends="libprotoc25-devel"
+	depends="libprotoc26-devel"
 }

From 336f08315f6860be39d33b38b233e45243deed83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:47 -0500
Subject: [PATCH 1915/3458] EternalTerminal: revbump for protobuf26

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

diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 7551dd588d8c..7bac78d2ffd4 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
 version=6.0.13
-revision=1
+revision=2
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"

From f107ec55bbc03a0e283049b01b1c1a2b68ee108c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:47 -0500
Subject: [PATCH 1916/3458] android-tools: revbump for protobuf26

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

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076b..65a59d774079 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
 version=30.0.5
-revision=1
+revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"

From a039a896f0ef80c07ea331b2aacc15461a7934a1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:48 -0500
Subject: [PATCH 1917/3458] astroid: revbump for protobuf26

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

diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 599a0d1f70dc..6b90d21bd131 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
 # Template file for 'astroid'
 pkgname=astroid
 version=0.15
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
 makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel

From e0a40754392a88eabb7a1c869f6af4a223d5581e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:48 -0500
Subject: [PATCH 1918/3458] bloaty: revbump for protobuf26

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

diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template
index 0198c1cfd47c..3a752c28e634 100644
--- a/srcpkgs/bloaty/template
+++ b/srcpkgs/bloaty/template
@@ -1,7 +1,7 @@
 # Template file for 'bloaty'
 pkgname=bloaty
 version=1.1
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config protobuf"
 makedepends="capstone-devel protobuf-devel re2-devel zlib-devel"

From 77a9c3502d561f368df28062a0426344c484b862 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:48 -0500
Subject: [PATCH 1919/3458] clementine: revbump for protobuf26

---
 srcpkgs/clementine/patches/pb_namespace.patch | 3030 +++++++++++++++++
 srcpkgs/clementine/template                   |    2 +-
 2 files changed, 3031 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/clementine/patches/pb_namespace.patch

diff --git a/srcpkgs/clementine/patches/pb_namespace.patch b/srcpkgs/clementine/patches/pb_namespace.patch
new file mode 100644
index 000000000000..c6f51300bf9c
--- /dev/null
+++ b/srcpkgs/clementine/patches/pb_namespace.patch
@@ -0,0 +1,3030 @@
+diff -ur ext/clementine-spotifyblob/spotifyclient.cpp ext/clementine-spotifyblob/spotifyclient.cpp
+--- ext/clementine-spotifyblob/spotifyclient.cpp	2020-09-23 22:34:08.000000000 -0400
++++ ext/clementine-spotifyblob/spotifyclient.cpp	2021-02-19 12:03:48.233473023 -0500
+@@ -40,7 +40,7 @@
+ const int SpotifyClient::kWaveHeaderSize = 44;
+ 
+ SpotifyClient::SpotifyClient(QObject* parent)
+-    : AbstractMessageHandler<pb::spotify::Message>(nullptr, parent),
++    : AbstractMessageHandler<cpb::spotify::Message>(nullptr, parent),
+       api_key_(QByteArray::fromBase64(kSpotifyApiKey)),
+       protocol_socket_(new QTcpSocket(this)),
+       session_(nullptr),
+@@ -119,8 +119,8 @@
+   SpotifyClient* me =
+       reinterpret_cast<SpotifyClient*>(sp_session_userdata(session));
+   const bool success = error == SP_ERROR_OK;
+-  pb::spotify::LoginResponse_Error error_code =
+-      pb::spotify::LoginResponse_Error_Other;
++  cpb::spotify::LoginResponse_Error error_code =
++      cpb::spotify::LoginResponse_Error_Other;
+ 
+   if (!success) {
+     qLog(Warning) << "Failed to login" << sp_error_message(error);
+@@ -128,16 +128,16 @@
+ 
+   switch (error) {
+     case SP_ERROR_BAD_USERNAME_OR_PASSWORD:
+-      error_code = pb::spotify::LoginResponse_Error_BadUsernameOrPassword;
++      error_code = cpb::spotify::LoginResponse_Error_BadUsernameOrPassword;
+       break;
+     case SP_ERROR_USER_BANNED:
+-      error_code = pb::spotify::LoginResponse_Error_UserBanned;
++      error_code = cpb::spotify::LoginResponse_Error_UserBanned;
+       break;
+     case SP_ERROR_USER_NEEDS_PREMIUM:
+-      error_code = pb::spotify::LoginResponse_Error_UserNeedsPremium;
++      error_code = cpb::spotify::LoginResponse_Error_UserNeedsPremium;
+       break;
+     default:
+-      error_code = pb::spotify::LoginResponse_Error_Other;
++      error_code = cpb::spotify::LoginResponse_Error_Other;
+       break;
+   }
+ 
+@@ -166,7 +166,7 @@
+   qLog(Debug) << "libspotify:" << QString::fromUtf8(data).trimmed();
+ }
+ 
+-void SpotifyClient::Search(const pb::spotify::SearchRequest& req) {
++void SpotifyClient::Search(const cpb::spotify::SearchRequest& req) {
+   sp_search* search =
+       sp_search_create(session_, req.query().c_str(), 0, req.limit(), 0,
+                        req.limit_album(), 0, 0,  // artists
+@@ -221,11 +221,11 @@
+ 
+ void SpotifyClient::SendSearchResponse(sp_search* result) {
+   // Take the request out of the queue
+-  pb::spotify::SearchRequest req = pending_searches_.take(result);
++  cpb::spotify::SearchRequest req = pending_searches_.take(result);
+ 
+   // Prepare the response
+-  pb::spotify::Message message;
+-  pb::spotify::SearchResponse* response = message.mutable_search_response();
++  cpb::spotify::Message message;
++  cpb::spotify::SearchResponse* response = message.mutable_search_response();
+ 
+   *response->mutable_request() = req;
+ 
+@@ -250,7 +250,7 @@
+   QList<sp_albumbrowse*> browses = pending_search_album_browses_.take(result);
+   for (sp_albumbrowse* browse : browses) {
+     sp_album* album = sp_albumbrowse_album(browse);
+-    pb::spotify::Album* msg = response->add_album();
++    cpb::spotify::Album* msg = response->add_album();
+ 
+     ConvertAlbum(album, msg->mutable_metadata());
+     ConvertAlbumBrowse(browse, msg->mutable_metadata());
+@@ -272,7 +272,7 @@
+   sp_search_release(result);
+ }
+ 
+-void SpotifyClient::MessageArrived(const pb::spotify::Message& message) {
++void SpotifyClient::MessageArrived(const cpb::spotify::Message& message) {
+   if (message.has_login_request()) {
+     Login(message.login_request());
+   } else if (message.has_load_playlist_request()) {
+@@ -303,16 +303,16 @@
+ }
+ 
+ void SpotifyClient::SetPlaybackSettings(
+-    const pb::spotify::PlaybackSettings& req) {
++    const cpb::spotify::PlaybackSettings& req) {
+   sp_bitrate bitrate = SP_BITRATE_320k;
+   switch (req.bitrate()) {
+-    case pb::spotify::Bitrate96k:
++    case cpb::spotify::Bitrate96k:
+       bitrate = SP_BITRATE_96k;
+       break;
+-    case pb::spotify::Bitrate160k:
++    case cpb::spotify::Bitrate160k:
+       bitrate = SP_BITRATE_160k;
+       break;
+-    case pb::spotify::Bitrate320k:
++    case cpb::spotify::Bitrate320k:
+       bitrate = SP_BITRATE_320k;
+       break;
+   }
+@@ -325,12 +325,12 @@
+   sp_session_set_volume_normalization(session_, req.volume_normalisation());
+ }
+ 
+-void SpotifyClient::Login(const pb::spotify::LoginRequest& req) {
++void SpotifyClient::Login(const cpb::spotify::LoginRequest& req) {
+   sp_error error = sp_session_create(&spotify_config_, &session_);
+   if (error != SP_ERROR_OK) {
+     qLog(Warning) << "Failed to create session" << sp_error_message(error);
+     SendLoginCompleted(false, sp_error_message(error),
+-                       pb::spotify::LoginResponse_Error_Other);
++                       cpb::spotify::LoginResponse_Error_Other);
+     return;
+   }
+ 
+@@ -341,7 +341,7 @@
+     if (error != SP_ERROR_OK) {
+       qLog(Warning) << "Tried to relogin but no stored credentials";
+       SendLoginCompleted(false, sp_error_message(error),
+-                         pb::spotify::LoginResponse_Error_ReloginFailed);
++                         cpb::spotify::LoginResponse_Error_ReloginFailed);
+     }
+   } else {
+     sp_session_login(session_, req.username().c_str(), req.password().c_str(),
+@@ -352,10 +352,10 @@
+ 
+ void SpotifyClient::SendLoginCompleted(
+     bool success, const QString& error,
+-    pb::spotify::LoginResponse_Error error_code) {
+-  pb::spotify::Message message;
++    cpb::spotify::LoginResponse_Error error_code) {
++  cpb::spotify::Message message;
+ 
+-  pb::spotify::LoginResponse* response = message.mutable_login_response();
++  cpb::spotify::LoginResponse* response = message.mutable_login_response();
+   response->set_success(success);
+   response->set_error(DataCommaSizeFromQString(error));
+ 
+@@ -412,8 +412,8 @@
+ }
+ 
+ void SpotifyClient::SendPlaylistList() {
+-  pb::spotify::Message message;
+-  pb::spotify::Playlists* response = message.mutable_playlists_updated();
++  cpb::spotify::Message message;
++  cpb::spotify::Playlists* response = message.mutable_playlists_updated();
+ 
+   sp_playlistcontainer* container = sp_session_playlistcontainer(session_);
+   if (!container) {
+@@ -441,7 +441,7 @@
+       continue;
+     }
+ 
+-    pb::spotify::Playlists::Playlist* msg = response->add_playlist();
++    cpb::spotify::Playlists::Playlist* msg = response->add_playlist();
+     msg->set_index(i);
+     msg->set_name(sp_playlist_name(playlist));
+     sp_user* playlist_owner = sp_playlist_owner(playlist);
+@@ -470,19 +470,19 @@
+   SendMessage(message);
+ }
+ 
+-sp_playlist* SpotifyClient::GetPlaylist(pb::spotify::PlaylistType type,
++sp_playlist* SpotifyClient::GetPlaylist(cpb::spotify::PlaylistType type,
+                                         int user_index) {
+   sp_playlist* playlist = nullptr;
+   switch (type) {
+-    case pb::spotify::Inbox:
++    case cpb::spotify::Inbox:
+       playlist = sp_session_inbox_create(session_);
+       break;
+ 
+-    case pb::spotify::Starred:
++    case cpb::spotify::Starred:
+       playlist = sp_session_starred_create(session_);
+       break;
+ 
+-    case pb::spotify::UserPlaylist: {
++    case cpb::spotify::UserPlaylist: {
+       sp_playlistcontainer* pc = sp_session_playlistcontainer(session_);
+ 
+       if (pc && user_index <= sp_playlistcontainer_num_playlists(pc)) {
+@@ -499,7 +499,7 @@
+   return playlist;
+ }
+ 
+-void SpotifyClient::LoadPlaylist(const pb::spotify::LoadPlaylistRequest& req) {
++void SpotifyClient::LoadPlaylist(const cpb::spotify::LoadPlaylistRequest& req) {
+   PendingLoadPlaylist pending_load;
+   pending_load.request_ = req;
+   pending_load.playlist_ = GetPlaylist(req.type(), req.user_playlist_index());
+@@ -509,8 +509,8 @@
+   if (!pending_load.playlist_) {
+     qLog(Warning) << "Invalid playlist requested or not logged in";
+ 
+-    pb::spotify::Message message;
+-    pb::spotify::LoadPlaylistResponse* response =
++    cpb::spotify::Message message;
++    cpb::spotify::LoadPlaylistResponse* response =
+         message.mutable_load_playlist_response();
+     *response->mutable_request() = req;
+     SendMessage(message);
+@@ -524,7 +524,7 @@
+   PlaylistStateChangedForLoadPlaylist(pending_load.playlist_, this);
+ }
+ 
+-void SpotifyClient::SyncPlaylist(const pb::spotify::SyncPlaylistRequest& req) {
++void SpotifyClient::SyncPlaylist(const cpb::spotify::SyncPlaylistRequest& req) {
+   sp_playlist* playlist =
+       GetPlaylist(req.request().type(), req.request().user_playlist_index());
+ 
+@@ -577,13 +577,13 @@
+   }
+ 
+   // Everything is loaded so send the response protobuf and unref everything.
+-  pb::spotify::Message message;
+-  pb::spotify::LoadPlaylistResponse* response =
++  cpb::spotify::Message message;
++  cpb::spotify::LoadPlaylistResponse* response =
+       message.mutable_load_playlist_response();
+ 
+   // For some reason, we receive the starred tracks in reverse order but not
+   // other playlists.
+-  if (pending_load->request_.type() == pb::spotify::Starred) {
++  if (pending_load->request_.type() == cpb::spotify::Starred) {
+     std::reverse(pending_load->tracks_.begin(), pending_load->tracks_.end());
+   }
+ 
+@@ -610,7 +610,7 @@
+ }
+ 
+ void SpotifyClient::AddTracksToPlaylist(
+-    const pb::spotify::AddTracksToPlaylistRequest& req) {
++    const cpb::spotify::AddTracksToPlaylistRequest& req) {
+   // Get the playlist we want to update
+   sp_playlist* playlist =
+       GetPlaylist(req.playlist_type(), req.playlist_index());
+@@ -649,7 +649,7 @@
+ }
+ 
+ void SpotifyClient::RemoveTracksFromPlaylist(
+-    const pb::spotify::RemoveTracksFromPlaylistRequest& req) {
++    const cpb::spotify::RemoveTracksFromPlaylistRequest& req) {
+   // Get the playlist we want to update
+   sp_playlist* playlist =
+       GetPlaylist(req.playlist_type(), req.playlist_index());
+@@ -667,7 +667,7 @@
+ 
+   // WTF: sp_playlist_remove_tracks indexes start from the end for starred
+   // playlist, not from the beginning like other playlists: reverse them
+-  if (req.playlist_type() == pb::spotify::Starred) {
++  if (req.playlist_type() == cpb::spotify::Starred) {
+     int num_tracks = sp_playlist_num_tracks(playlist);
+     for (int i = 0; i < req.track_index_size(); i++) {
+       tracks_indices_array[i] = num_tracks - tracks_indices_array[i] - 1;
+@@ -680,7 +680,7 @@
+   }
+ }
+ 
+-void SpotifyClient::ConvertTrack(sp_track* track, pb::spotify::Track* pb) {
++void SpotifyClient::ConvertTrack(sp_track* track, cpb::spotify::Track* pb) {
+   sp_album* album = sp_track_album(track);
+ 
+   pb->set_starred(sp_track_is_starred(session_, track));
+@@ -713,7 +713,7 @@
+   pb->set_uri(uri);
+ }
+ 
+-void SpotifyClient::ConvertAlbum(sp_album* album, pb::spotify::Track* pb) {
++void SpotifyClient::ConvertAlbum(sp_album* album, cpb::spotify::Track* pb) {
+   pb->set_album(sp_album_name(album));
+   pb->set_year(sp_album_year(album));
+   pb->add_artist(sp_artist_name(sp_album_artist(album)));
+@@ -744,7 +744,7 @@
+ }
+ 
+ void SpotifyClient::ConvertAlbumBrowse(sp_albumbrowse* browse,
+-                                       pb::spotify::Track* pb) {
++                                       cpb::spotify::Track* pb) {
+   pb->set_track(sp_albumbrowse_num_tracks(browse));
+ }
+ 
+@@ -853,7 +853,7 @@
+ 
+     int download_progress = me->GetDownloadProgress(playlist);
+     if (download_progress != -1) {
+-      me->SendDownloadProgress(pb::spotify::UserPlaylist, i, download_progress);
++      me->SendDownloadProgress(cpb::spotify::UserPlaylist, i, download_progress);
+     }
+   }
+ 
+@@ -862,7 +862,7 @@
+   sp_playlist_release(inbox);
+ 
+   if (download_progress != -1) {
+-    me->SendDownloadProgress(pb::spotify::Inbox, -1, download_progress);
++    me->SendDownloadProgress(cpb::spotify::Inbox, -1, download_progress);
+   }
+ 
+   sp_playlist* starred = sp_session_starred_create(session);
+@@ -870,14 +870,14 @@
+   sp_playlist_release(starred);
+ 
+   if (download_progress != -1) {
+-    me->SendDownloadProgress(pb::spotify::Starred, -1, download_progress);
++    me->SendDownloadProgress(cpb::spotify::Starred, -1, download_progress);
+   }
+ }
+ 
+-void SpotifyClient::SendDownloadProgress(pb::spotify::PlaylistType type,
++void SpotifyClient::SendDownloadProgress(cpb::spotify::PlaylistType type,
+                                          int index, int download_progress) {
+-  pb::spotify::Message message;
+-  pb::spotify::SyncPlaylistProgress* progress =
++  cpb::spotify::Message message;
++  cpb::spotify::SyncPlaylistProgress* progress =
+       message.mutable_sync_playlist_progress();
+   progress->mutable_request()->set_type(type);
+   if (index != -1) {
+@@ -903,7 +903,7 @@
+   return -1;
+ }
+ 
+-void SpotifyClient::StartPlayback(const pb::spotify::PlaybackRequest& req) {
++void SpotifyClient::StartPlayback(const cpb::spotify::PlaybackRequest& req) {
+   // Get a link object from the URI
+   sp_link* link = sp_link_create_from_string(req.track_uri().c_str());
+   if (!link) {
+@@ -970,8 +970,8 @@
+ }
+ 
+ void SpotifyClient::SendPlaybackError(const QString& error) {
+-  pb::spotify::Message message;
+-  pb::spotify::PlaybackError* msg = message.mutable_playback_error();
++  cpb::spotify::Message message;
++  cpb::spotify::PlaybackError* msg = message.mutable_playback_error();
+ 
+   msg->set_error(DataCommaSizeFromQString(error));
+   SendMessage(message);
+@@ -984,8 +984,8 @@
+                   << kSpotifyImageIDSize << "bytes):" << id_b64;
+ 
+     // Send an error response straight away
+-    pb::spotify::Message message;
+-    pb::spotify::ImageResponse* msg = message.mutable_image_response();
++    cpb::spotify::Message message;
++    cpb::spotify::ImageResponse* msg = message.mutable_image_response();
+     msg->set_id(DataCommaSizeFromQString(id_b64));
+     SendMessage(message);
+     return;
+@@ -1033,8 +1033,8 @@
+   const void* data = sp_image_data(image, &size);
+ 
+   // Send the response
+-  pb::spotify::Message message;
+-  pb::spotify::ImageResponse* msg = message.mutable_image_response();
++  cpb::spotify::Message message;
++  cpb::spotify::ImageResponse* msg = message.mutable_image_response();
+   msg->set_id(DataCommaSizeFromQString(req->id_b64_));
+   if (data && size) {
+     msg->set_data(data, size);
+@@ -1086,8 +1086,8 @@
+ 
+   QString uri = me->pending_album_browses_.take(result);
+ 
+-  pb::spotify::Message message;
+-  pb::spotify::BrowseAlbumResponse* msg =
++  cpb::spotify::Message message;
++  cpb::spotify::BrowseAlbumResponse* msg =
+       message.mutable_browse_album_response();
+ 
+   msg->set_uri(DataCommaSizeFromQString(uri));
+@@ -1102,7 +1102,7 @@
+ }
+ 
+ void SpotifyClient::BrowseToplist(
+-    const pb::spotify::BrowseToplistRequest& req) {
++    const cpb::spotify::BrowseToplistRequest& req) {
+   sp_toplistbrowse* browse = sp_toplistbrowse_create(
+       session_, SP_TOPLIST_TYPE_TRACKS,  // TODO: Support albums and artists.
+       SP_TOPLIST_REGION_EVERYWHERE,      // TODO: Support other regions.
+@@ -1110,7 +1110,7 @@
+   pending_toplist_browses_[browse] = req;
+ }
+ 
+-void SpotifyClient::SetPaused(const pb::spotify::PauseRequest& req) {
++void SpotifyClient::SetPaused(const cpb::spotify::PauseRequest& req) {
+   sp_session_player_play(session_, !req.paused());
+ }
+ 
+@@ -1125,11 +1125,11 @@
+     return;
+   }
+ 
+-  const pb::spotify::BrowseToplistRequest& request =
++  const cpb::spotify::BrowseToplistRequest& request =
+       me->pending_toplist_browses_.take(result);
+ 
+-  pb::spotify::Message message;
+-  pb::spotify::BrowseToplistResponse* msg =
++  cpb::spotify::Message message;
++  cpb::spotify::BrowseToplistResponse* msg =
+       message.mutable_browse_toplist_response();
+   msg->mutable_request()->CopyFrom(request);
+ 
+@@ -1143,7 +1143,7 @@
+ }
+ 
+ void SpotifyClient::DeviceClosed() {
+-  AbstractMessageHandler<pb::spotify::Message>::DeviceClosed();
++  AbstractMessageHandler<cpb::spotify::Message>::DeviceClosed();
+ 
+   qApp->exit();
+ }
+diff -ur ext/clementine-spotifyblob/spotifyclient.h ext/clementine-spotifyblob/spotifyclient.h
+--- ext/clementine-spotifyblob/spotifyclient.h	2020-09-23 22:34:08.000000000 -0400
++++ ext/clementine-spotifyblob/spotifyclient.h	2021-02-19 12:03:48.233473023 -0500
+@@ -35,7 +35,7 @@
+ class MediaPipeline;
+ class ResponseMessage;
+ 
+-class SpotifyClient : public AbstractMessageHandler<pb::spotify::Message> {
++class SpotifyClient : public AbstractMessageHandler<cpb::spotify::Message> {
+   Q_OBJECT
+ 
+  public:
+@@ -48,7 +48,7 @@
+   void Init(quint16 port);
+ 
+  protected:
+-  void MessageArrived(const pb::spotify::Message& message);
++  void MessageArrived(const cpb::spotify::Message& message);
+   void DeviceClosed();
+ 
+  private slots:
+@@ -56,7 +56,7 @@
+ 
+  private:
+   void SendLoginCompleted(bool success, const QString& error,
+-                          pb::spotify::LoginResponse_Error error_code);
++                          cpb::spotify::LoginResponse_Error error_code);
+   void SendPlaybackError(const QString& error);
+   void SendSearchResponse(sp_search* result);
+ 
+@@ -118,40 +118,40 @@
+       ToplistBrowseComplete(sp_toplistbrowse* result, void* userdata);
+ 
+   // Request handlers.
+-  void Login(const pb::spotify::LoginRequest& req);
+-  void Search(const pb::spotify::SearchRequest& req);
+-  void LoadPlaylist(const pb::spotify::LoadPlaylistRequest& req);
+-  void SyncPlaylist(const pb::spotify::SyncPlaylistRequest& req);
+-  void AddTracksToPlaylist(const pb::spotify::AddTracksToPlaylistRequest& req);
++  void Login(const cpb::spotify::LoginRequest& req);
++  void Search(const cpb::spotify::SearchRequest& req);
++  void LoadPlaylist(const cpb::spotify::LoadPlaylistRequest& req);
++  void SyncPlaylist(const cpb::spotify::SyncPlaylistRequest& req);
++  void AddTracksToPlaylist(const cpb::spotify::AddTracksToPlaylistRequest& req);
+   void RemoveTracksFromPlaylist(
+-      const pb::spotify::RemoveTracksFromPlaylistRequest& req);
+-  void StartPlayback(const pb::spotify::PlaybackRequest& req);
++      const cpb::spotify::RemoveTracksFromPlaylistRequest& req);
++  void StartPlayback(const cpb::spotify::PlaybackRequest& req);
+   void Seek(qint64 offset_nsec);
+   void LoadImage(const QString& id_b64);
+   void BrowseAlbum(const QString& uri);
+-  void BrowseToplist(const pb::spotify::BrowseToplistRequest& req);
+-  void SetPlaybackSettings(const pb::spotify::PlaybackSettings& req);
+-  void SetPaused(const pb::spotify::PauseRequest& req);
++  void BrowseToplist(const cpb::spotify::BrowseToplistRequest& req);
++  void SetPlaybackSettings(const cpb::spotify::PlaybackSettings& req);
++  void SetPaused(const cpb::spotify::PauseRequest& req);
+ 
+   void SendPlaylistList();
+ 
+-  void ConvertTrack(sp_track* track, pb::spotify::Track* pb);
+-  void ConvertAlbum(sp_album* album, pb::spotify::Track* pb);
+-  void ConvertAlbumBrowse(sp_albumbrowse* browse, pb::spotify::Track* pb);
++  void ConvertTrack(sp_track* track, cpb::spotify::Track* pb);
++  void ConvertAlbum(sp_album* album, cpb::spotify::Track* pb);
++  void ConvertAlbumBrowse(sp_albumbrowse* browse, cpb::spotify::Track* pb);
+ 
+   // Gets the appropriate sp_playlist* but does not load it.
+-  sp_playlist* GetPlaylist(pb::spotify::PlaylistType type, int user_index);
++  sp_playlist* GetPlaylist(cpb::spotify::PlaylistType type, int user_index);
+ 
+  private:
+   struct PendingLoadPlaylist {
+-    pb::spotify::LoadPlaylistRequest request_;
++    cpb::spotify::LoadPlaylistRequest request_;
+     sp_playlist* playlist_;
+     QList<sp_track*> tracks_;
+     bool offline_sync;
+   };
+ 
+   struct PendingPlaybackRequest {
+-    pb::spotify::PlaybackRequest request_;
++    cpb::spotify::PlaybackRequest request_;
+     sp_link* link_;
+     sp_track* track_;
+ 
+@@ -170,7 +170,7 @@
+   void TryPlaybackAgain(const PendingPlaybackRequest& req);
+   void TryImageAgain(sp_image* image);
+   int GetDownloadProgress(sp_playlist* playlist);
+-  void SendDownloadProgress(pb::spotify::PlaylistType type, int index,
++  void SendDownloadProgress(cpb::spotify::PlaylistType type, int index,
+                             int download_progress);
+ 
+   QByteArray api_key_;
+@@ -190,9 +190,9 @@
+   QList<PendingPlaybackRequest> pending_playback_requests_;
+   QList<PendingImageRequest> pending_image_requests_;
+   QMap<sp_image*, int> image_callbacks_registered_;
+-  QMap<sp_search*, pb::spotify::SearchRequest> pending_searches_;
++  QMap<sp_search*, cpb::spotify::SearchRequest> pending_searches_;
+   QMap<sp_albumbrowse*, QString> pending_album_browses_;
+-  QMap<sp_toplistbrowse*, pb::spotify::BrowseToplistRequest>
++  QMap<sp_toplistbrowse*, cpb::spotify::BrowseToplistRequest>
+       pending_toplist_browses_;
+ 
+   QMap<sp_search*, QList<sp_albumbrowse*>> pending_search_album_browses_;
+diff -ur ext/clementine-tagreader/tagreaderworker.cpp ext/clementine-tagreader/tagreaderworker.cpp
+--- ext/clementine-tagreader/tagreaderworker.cpp	2020-09-23 22:34:08.000000000 -0400
++++ ext/clementine-tagreader/tagreaderworker.cpp	2021-02-19 12:03:48.234473027 -0500
+@@ -25,10 +25,10 @@
+ #include <QUrl>
+ 
+ TagReaderWorker::TagReaderWorker(QIODevice* socket, QObject* parent)
+-    : AbstractMessageHandler<pb::tagreader::Message>(socket, parent) {}
++    : AbstractMessageHandler<cpb::tagreader::Message>(socket, parent) {}
+ 
+-void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
+-  pb::tagreader::Message reply;
++void TagReaderWorker::MessageArrived(const cpb::tagreader::Message& message) {
++  cpb::tagreader::Message reply;
+ 
+ #if 0
+   // Crash every few requests
+@@ -68,7 +68,7 @@
+                                                          data.size());
+   } else if (message.has_read_cloud_file_request()) {
+ #ifdef HAVE_GOOGLE_DRIVE
+-    const pb::tagreader::ReadCloudFileRequest& req =
++    const cpb::tagreader::ReadCloudFileRequest& req =
+         message.read_cloud_file_request();
+     if (!tag_reader_.ReadCloudFile(
+             QUrl::fromEncoded(QByteArray(req.download_url().data(),
+@@ -86,7 +86,7 @@
+ }
+ 
+ void TagReaderWorker::DeviceClosed() {
+-  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
++  AbstractMessageHandler<cpb::tagreader::Message>::DeviceClosed();
+ 
+   qApp->exit();
+ }
+diff -ur ext/clementine-tagreader/tagreaderworker.h ext/clementine-tagreader/tagreaderworker.h
+--- ext/clementine-tagreader/tagreaderworker.h	2020-09-23 22:34:08.000000000 -0400
++++ ext/clementine-tagreader/tagreaderworker.h	2021-02-19 12:03:48.234473027 -0500
+@@ -23,12 +23,12 @@
+ #include "tagreadermessages.pb.h"
+ #include "core/messagehandler.h"
+ 
+-class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
++class TagReaderWorker : public AbstractMessageHandler<cpb::tagreader::Message> {
+  public:
+   TagReaderWorker(QIODevice* socket, QObject* parent = NULL);
+ 
+  protected:
+-  void MessageArrived(const pb::tagreader::Message& message);
++  void MessageArrived(const cpb::tagreader::Message& message);
+   void DeviceClosed();
+ 
+  private:
+diff -ur ext/libclementine-remote/remotecontrolmessages.proto ext/libclementine-remote/remotecontrolmessages.proto
+--- ext/libclementine-remote/remotecontrolmessages.proto	2020-09-23 22:34:08.000000000 -0400
++++ ext/libclementine-remote/remotecontrolmessages.proto	2021-02-19 12:03:48.234473027 -0500
+@@ -20,7 +20,7 @@
+ 
+ syntax = "proto2";
+ 
+-package pb.remote;
++package cpb.remote;
+ 
+ // The supported message types
+ enum MsgType {
+diff -ur ext/libclementine-spotifyblob/spotifymessages.proto ext/libclementine-spotifyblob/spotifymessages.proto
+--- ext/libclementine-spotifyblob/spotifymessages.proto	2020-09-23 22:34:08.000000000 -0400
++++ ext/libclementine-spotifyblob/spotifymessages.proto	2021-02-19 12:03:48.234473027 -0500
+@@ -20,7 +20,7 @@
+ 
+ syntax = "proto2";
+ 
+-package pb.spotify;
++package cpb.spotify;
+ 
+ message LoginRequest {
+   required string username = 1;
+diff -ur ext/libclementine-tagreader/gmereader.cpp ext/libclementine-tagreader/gmereader.cpp
+--- ext/libclementine-tagreader/gmereader.cpp	2020-09-23 22:34:08.000000000 -0400
++++ ext/libclementine-tagreader/gmereader.cpp	2021-02-19 12:03:48.234473027 -0500
+@@ -20,7 +20,7 @@
+ }
+ 
+ void GME::ReadFile(const QFileInfo& file_info,
+-                   pb::tagreader::SongMetadata* song_info) {
++                   cpb::tagreader::SongMetadata* song_info) {
+   if (file_info.completeSuffix().endsWith("spc"))
+     SPC::Read(file_info, song_info);
+   if (file_info.completeSuffix().endsWith("vgm"))
+@@ -28,7 +28,7 @@
+ }
+ 
+ void GME::SPC::Read(const QFileInfo& file_info,
+-                    pb::tagreader::SongMetadata* song_info) {
++                    cpb::tagreader::SongMetadata* song_info) {
+   QFile file(file_info.filePath());
+   if (!file.open(QIODevice::ReadOnly)) return;
+ 
+@@ -137,7 +137,7 @@
+   }
+ 
+   song_info->set_valid(true);
+-  song_info->set_type(pb::tagreader::SongMetadata_Type_SPC);
++  song_info->set_type(cpb::tagreader::SongMetadata_Type_SPC);
+ }
+ 
+ qint16 GME::SPC::GetNextMemAddressAlign32bit(qint16 input) {
+@@ -157,7 +157,7 @@
+ }
+ 
+ void GME::VGM::Read(const QFileInfo& file_info,
+-                    pb::tagreader::SongMetadata* song_info) {
++                    cpb::tagreader::SongMetadata* song_info) {
+   QFile file(file_info.filePath());
+   if (!file.open(QIODevice::ReadOnly)) return;
+ 
+@@ -206,7 +206,7 @@
+   song_info->set_year(strings[8].left(4).toInt());
+   song_info->set_length_nanosec(length * kNsecPerMsec);
+   song_info->set_valid(true);
+-  song_info->set_type(pb::tagreader::SongMetadata_Type_VGM);
++  song_info->set_type(cpb::tagreader::SongMetadata_Type_VGM);
+ }
+ 
+ bool GME::VGM::GetPlaybackLength(const QByteArray& sample_count_bytes,
+diff -ur ext/libclementine-tagreader/gmereader.h ext/libclementine-tagreader/gmereader.h
+--- ext/libclementine-tagreader/gmereader.h	2020-09-23 22:34:08.000000000 -0400
++++ ext/libclementine-tagreader/gmereader.h	2021-02-19 12:03:48.235473030 -0500
+@@ -10,7 +10,7 @@
+ namespace GME {
+ bool IsSupportedFormat(const QFileInfo& file_info);
+ void ReadFile(const QFileInfo& file_info,
+-              pb::tagreader::SongMetadata* song_info);
++              cpb::tagreader::SongMetadata* song_info);
+ 
+ namespace SPC {
+ /* SPC SPEC:
+@@ -42,7 +42,7 @@
+ 
+ enum xID6_TYPE { Length = 0x0, String = 0x1, Integer = 0x4 };
+ 
+-void Read(const QFileInfo& file_info, pb::tagreader::SongMetadata* song_info);
++void Read(const QFileInfo& file_info, cpb::tagreader::SongMetadata* song_info);
+ qint16 GetNextMemAddressAlign32bit(qint16 input);
+ quint64 ConvertSPCStringToNum(const QByteArray& arr);
+ }  // namespace SPC
+@@ -58,7 +58,7 @@
+ const int SAMPLE_TIMEBASE = 44100;
+ const int GST_GME_LOOP_TIME_MS = 8000;
+ 
+-void Read(const QFileInfo& file_info, pb::tagreader::SongMetadata* song_info);
++void Read(const QFileInfo& file_info, cpb::tagreader::SongMetadata* song_info);
+ /* Takes in two QByteArrays, expected to be 4 bytes long. Desired length
+  * is returned via output parameter out_length. Returns false on error. */
+ bool GetPlaybackLength(const QByteArray& sample_count_bytes,
+diff -ur ext/libclementine-tagreader/tagreader.cpp ext/libclementine-tagreader/tagreader.cpp
+--- ext/libclementine-tagreader/tagreader.cpp	2020-09-23 22:34:08.000000000 -0400
++++ ext/libclementine-tagreader/tagreader.cpp	2021-02-19 12:03:48.235473030 -0500
+@@ -143,7 +143,7 @@
+ 
+ }  // namespace
+ 
+-void TagReader::GuessArtistAndTitle(pb::tagreader::SongMetadata* song) const {
++void TagReader::GuessArtistAndTitle(cpb::tagreader::SongMetadata* song) const {
+   QString artist = QString::fromStdString(song->artist());
+   QString title = QString::fromStdString(song->title());
+   const QString bn = QString::fromStdString(song->basefilename());
+@@ -171,7 +171,7 @@
+ }
+ 
+ void TagReader::GuessAlbum(const QFileInfo& info,
+-                           pb::tagreader::SongMetadata* song) const {
++                           cpb::tagreader::SongMetadata* song) const {
+   QString album = QString::fromStdString(song->album());
+   if (!album.isEmpty()) return;
+   const QString str_dir = info.absoluteDir().absolutePath();
+@@ -191,7 +191,7 @@
+     : factory_(new TagLibFileRefFactory), kEmbeddedCover("(embedded)") {}
+ 
+ void TagReader::ReadFile(const QString& filename,
+-                         pb::tagreader::SongMetadata* song) const {
++                         cpb::tagreader::SongMetadata* song) const {
+   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
+   const QFileInfo info(filename);
+ 
+@@ -674,7 +674,7 @@
+ }
+ 
+ void TagReader::ParseFMPSFrame(const QString& name, const QString& value,
+-                               pb::tagreader::SongMetadata* song) const {
++                               cpb::tagreader::SongMetadata* song) const {
+   qLog(Debug) << "Parsing FMPSFrame" << name << ", " << value;
+   FMPSParser parser;
+   if (!parser.Parse(value) || parser.is_empty()) return;
+@@ -717,7 +717,7 @@
+ void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap& map,
+                             const QTextCodec* codec, QString* disc,
+                             QString* compilation,
+-                            pb::tagreader::SongMetadata* song) const {
++                            cpb::tagreader::SongMetadata* song) const {
+   if (!map["COMPOSER"].isEmpty())
+     Decode(map["COMPOSER"].front(), codec, song->mutable_composer());
+   if (!map["PERFORMER"].isEmpty())
+@@ -774,7 +774,7 @@
+ 
+ void TagReader::SetVorbisComments(
+     TagLib::Ogg::XiphComment* vorbis_comments,
+-    const pb::tagreader::SongMetadata& song) const {
++    const cpb::tagreader::SongMetadata& song) const {
+   vorbis_comments->addField("COMPOSER",
+                             StdStringToTaglibString(song.composer()), true);
+   vorbis_comments->addField("PERFORMER",
+@@ -810,7 +810,7 @@
+ 
+ void TagReader::SetFMPSStatisticsVorbisComments(
+     TagLib::Ogg::XiphComment* vorbis_comments,
+-    const pb::tagreader::SongMetadata& song) const {
++    const cpb::tagreader::SongMetadata& song) const {
+   if (song.playcount())
+     vorbis_comments->addField("FMPS_PLAYCOUNT",
+                               TagLib::String::number(song.playcount()), true);
+@@ -822,54 +822,54 @@
+ 
+ void TagReader::SetFMPSRatingVorbisComments(
+     TagLib::Ogg::XiphComment* vorbis_comments,
+-    const pb::tagreader::SongMetadata& song) const {
++    const cpb::tagreader::SongMetadata& song) const {
+   vorbis_comments->addField(
+       "FMPS_RATING", QStringToTaglibString(QString::number(song.rating())),
+       true);
+ }
+ 
+-pb::tagreader::SongMetadata_Type TagReader::GuessFileType(
++cpb::tagreader::SongMetadata_Type TagReader::GuessFileType(
+     TagLib::FileRef* fileref) const {
+ #ifdef TAGLIB_WITH_ASF
+   if (dynamic_cast<TagLib::ASF::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_ASF;
++    return cpb::tagreader::SongMetadata_Type_ASF;
+ #endif
+   if (dynamic_cast<TagLib::FLAC::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_FLAC;
++    return cpb::tagreader::SongMetadata_Type_FLAC;
+ #ifdef TAGLIB_WITH_MP4
+   if (dynamic_cast<TagLib::MP4::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_MP4;
++    return cpb::tagreader::SongMetadata_Type_MP4;
+ #endif
+   if (dynamic_cast<TagLib::MPC::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_MPC;
++    return cpb::tagreader::SongMetadata_Type_MPC;
+   if (dynamic_cast<TagLib::MPEG::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_MPEG;
++    return cpb::tagreader::SongMetadata_Type_MPEG;
+   if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_OGGFLAC;
++    return cpb::tagreader::SongMetadata_Type_OGGFLAC;
+   if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_OGGSPEEX;
++    return cpb::tagreader::SongMetadata_Type_OGGSPEEX;
+   if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_OGGVORBIS;
++    return cpb::tagreader::SongMetadata_Type_OGGVORBIS;
+ #ifdef TAGLIB_HAS_OPUS
+   if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_OGGOPUS;
++    return cpb::tagreader::SongMetadata_Type_OGGOPUS;
+ #endif
+   if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_AIFF;
++    return cpb::tagreader::SongMetadata_Type_AIFF;
+   if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_WAV;
++    return cpb::tagreader::SongMetadata_Type_WAV;
+   if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_TRUEAUDIO;
++    return cpb::tagreader::SongMetadata_Type_TRUEAUDIO;
+   if (dynamic_cast<TagLib::WavPack::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_WAVPACK;
++    return cpb::tagreader::SongMetadata_Type_WAVPACK;
+   if (dynamic_cast<TagLib::APE::File*>(fileref->file()))
+-    return pb::tagreader::SongMetadata_Type_APE;
++    return cpb::tagreader::SongMetadata_Type_APE;
+ 
+-  return pb::tagreader::SongMetadata_Type_UNKNOWN;
++  return cpb::tagreader::SongMetadata_Type_UNKNOWN;
+ }
+ 
+ bool TagReader::SaveFile(const QString& filename,
+-                         const pb::tagreader::SongMetadata& song) const {
++                         const cpb::tagreader::SongMetadata& song) const {
+   if (filename.isNull()) return false;
+ 
+   qLog(Debug) << "Saving tags to" << filename;
+@@ -986,7 +986,7 @@
+ }
+ 
+ bool TagReader::SaveSongStatisticsToFile(
+-    const QString& filename, const pb::tagreader::SongMetadata& song) const {
++    const QString& filename, const cpb::tagreader::SongMetadata& song) const {
+   if (filename.isNull()) return false;
+ 
+   qLog(Debug) << "Saving song statistics tags to" << filename;
+@@ -1083,7 +1083,7 @@
+ }
+ 
+ bool TagReader::SaveSongRatingToFile(
+-    const QString& filename, const pb::tagreader::SongMetadata& song) const {
++    const QString& filename, const cpb::tagreader::SongMetadata& song) const {
+   if (filename.isNull()) return false;
+ 
+   qLog(Debug) << "Saving song rating tags to" << filename;
+@@ -1427,7 +1427,7 @@
+ bool TagReader::ReadCloudFile(const QUrl& download_url, const QString& title,
+                               int size, const QString& mime_type,
+                               const QString& authorisation_header,
+-                              pb::tagreader::SongMetadata* song) const {
++                              cpb::tagreader::SongMetadata* song) const {
+   qLog(Debug) << "Loading tags from" << title;
+ 
+   std::unique_ptr<CloudStream> stream(
+@@ -1488,7 +1488,7 @@
+       song->set_year(tag->tag()->year());
+     }
+ 
+-    song->set_type(pb::tagreader::SongMetadata_Type_STREAM);
++    song->set_type(cpb::tagreader::SongMetadata_Type_STREAM);
+ 
+     if (tag->audioProperties()) {
+       song->set_length_nanosec(tag->audioProperties()->length() * kNsecPerSec);
+diff -ur ext/libclementine-tagreader/tagreader.h ext/libclementine-tagreader/tagreader.h
+--- ext/libclementine-tagreader/tagreader.h	2020-09-23 22:34:08.000000000 -0400
++++ ext/libclementine-tagreader/tagreader.h	2021-02-19 12:03:48.235473030 -0500
+@@ -57,16 +57,16 @@
+   TagReader();
+ 
+   void ReadFile(const QString& filename,
+-                pb::tagreader::SongMetadata* song) const;
++                cpb::tagreader::SongMetadata* song) const;
+   bool SaveFile(const QString& filename,
+-                const pb::tagreader::SongMetadata& song) const;
++                const cpb::tagreader::SongMetadata& song) const;
+   // Returns false if something went wrong; returns true otherwise (might
+   // returns true if the file exists but nothing has been written inside because
+   // statistics tag format is not supported for this kind of file)
+   bool SaveSongStatisticsToFile(const QString& filename,
+-                                const pb::tagreader::SongMetadata& song) const;
++                                const cpb::tagreader::SongMetadata& song) const;
+   bool SaveSongRatingToFile(const QString& filename,
+-                            const pb::tagreader::SongMetadata& song) const;
++                            const cpb::tagreader::SongMetadata& song) const;
+ 
+   bool IsMediaFile(const QString& filename) const;
+   QByteArray LoadEmbeddedArt(const QString& filename) const;
+@@ -74,7 +74,7 @@
+ #ifdef HAVE_GOOGLE_DRIVE
+   bool ReadCloudFile(const QUrl& download_url, const QString& title, int size,
+                      const QString& mime_type, const QString& access_token,
+-                     pb::tagreader::SongMetadata* song) const;
++                     cpb::tagreader::SongMetadata* song) const;
+ #endif  // HAVE_GOOGLE_DRIVE
+ 
+   static void Decode(const TagLib::String& tag, const QTextCodec* codec,
+@@ -83,23 +83,23 @@
+                      std::string* output);
+ 
+   void ParseFMPSFrame(const QString& name, const QString& value,
+-                      pb::tagreader::SongMetadata* song) const;
++                      cpb::tagreader::SongMetadata* song) const;
+   void ParseOggTag(const TagLib::Ogg::FieldListMap& map,
+                    const QTextCodec* codec, QString* disc, QString* compilation,
+-                   pb::tagreader::SongMetadata* song) const;
++                   cpb::tagreader::SongMetadata* song) const;
+   void SetVorbisComments(TagLib::Ogg::XiphComment* vorbis_comments,
+-                         const pb::tagreader::SongMetadata& song) const;
++                         const cpb::tagreader::SongMetadata& song) const;
+   void SetFMPSStatisticsVorbisComments(
+       TagLib::Ogg::XiphComment* vorbis_comments,
+-      const pb::tagreader::SongMetadata& song) const;
++      const cpb::tagreader::SongMetadata& song) const;
+   void SetFMPSRatingVorbisComments(
+       TagLib::Ogg::XiphComment* vorbis_comments,
+-      const pb::tagreader::SongMetadata& song) const;
++      const cpb::tagreader::SongMetadata& song) const;
+ 
+-  void GuessArtistAndTitle(pb::tagreader::SongMetadata* song) const;
+-  void GuessAlbum(const QFileInfo &info, pb::tagreader::SongMetadata* song) const;
++  void GuessArtistAndTitle(cpb::tagreader::SongMetadata* song) const;
++  void GuessAlbum(const QFileInfo &info, cpb::tagreader::SongMetadata* song) const;
+ 
+-  pb::tagreader::SongMetadata_Type GuessFileType(
++  cpb::tagreader::SongMetadata_Type GuessFileType(
+       TagLib::FileRef* fileref) const;
+ 
+   void SetUserTextFrame(const QString& description, const QString& value,
+diff -ur ext/libclementine-tagreader/tagreadermessages.proto ext/libclementine-tagreader/tagreadermessages.proto
+--- ext/libclementine-tagreader/tagreadermessages.proto	2020-09-23 22:34:08.000000000 -0400
++++ ext/libclementine-tagreader/tagreadermessages.proto	2021-02-19 12:03:48.235473030 -0500
+@@ -1,6 +1,6 @@
+ syntax = "proto2";
+ 
+-package pb.tagreader;
++package cpb.tagreader;
+ 
+ message SongMetadata {
+   enum Type {
+diff -ur src/core/song.cpp src/core/song.cpp
+--- src/core/song.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/core/song.cpp	2021-02-19 12:03:48.236473033 -0500
+@@ -526,7 +526,7 @@
+   return codec->toUnicode(tag.toUtf8());
+ }
+ 
+-void Song::InitFromProtobuf(const pb::tagreader::SongMetadata& pb) {
++void Song::InitFromProtobuf(const cpb::tagreader::SongMetadata& pb) {
+   d->init_from_file_ = true;
+   d->valid_ = pb.valid();
+   d->title_ = QStringFromStdString(pb.title());
+@@ -575,7 +575,7 @@
+   InitArtManual();
+ }
+ 
+-void Song::ToProtobuf(pb::tagreader::SongMetadata* pb) const {
++void Song::ToProtobuf(cpb::tagreader::SongMetadata* pb) const {
+   const QByteArray url(d->url_.toEncoded());
+ 
+   pb->set_valid(d->valid_);
+@@ -610,7 +610,7 @@
+   pb->set_filesize(d->filesize_);
+   pb->set_suspicious_tags(d->suspicious_tags_);
+   pb->set_art_automatic(DataCommaSizeFromQString(d->art_automatic_));
+-  pb->set_type(static_cast<pb::tagreader::SongMetadata_Type>(d->filetype_));
++  pb->set_type(static_cast<cpb::tagreader::SongMetadata_Type>(d->filetype_));
+ }
+ 
+ void Song::InitFromQuery(const SqlRow& q, bool reliable_metadata, int col) {
+diff -ur src/core/song.h src/core/song.h
+--- src/core/song.h	2020-09-23 22:34:08.000000000 -0400
++++ src/core/song.h	2021-02-19 12:04:03.092521906 -0500
+@@ -37,11 +37,11 @@
+ #include "config.h"
+ #include "engines/engine_fwd.h"
+ 
+-namespace pb {
++namespace cpb {
+ namespace tagreader {
+ class SongMetadata;
+ }  // namespace tagreader
+-}  // namespace pb
++}  // namespace cpb
+ 
+ class QSqlQuery;
+ class QUrl;
+@@ -123,7 +123,7 @@
+             qint64 length_nanosec);
+   void Init(const QString& title, const QString& artist, const QString& album,
+             qint64 beginning, qint64 end);
+-  void InitFromProtobuf(const pb::tagreader::SongMetadata& pb);
++  void InitFromProtobuf(const cpb::tagreader::SongMetadata& pb);
+   void InitFromQuery(const SqlRow& query, bool reliable_metadata, int col = 0);
+   void InitFromFilePartial(
+       const QString& filename);  // Just store the filename: incomplete but fast
+@@ -159,7 +159,7 @@
+   void ToLastFM(lastfm::Track* track, bool prefer_album_artist) const;
+ #endif
+   void ToXesam(QVariantMap* map) const;
+-  void ToProtobuf(pb::tagreader::SongMetadata* pb) const;
++  void ToProtobuf(cpb::tagreader::SongMetadata* pb) const;
+ 
+   // Simple accessors
+   bool is_valid() const;
+diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
+--- src/core/tagreaderclient.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/core/tagreaderclient.cpp	2021-02-19 12:03:48.236473033 -0500
+@@ -58,8 +58,8 @@
+ }
+ 
+ TagReaderReply* TagReaderClient::ReadFile(const QString& filename) {
+-  pb::tagreader::Message message;
+-  pb::tagreader::ReadFileRequest* req = message.mutable_read_file_request();
++  cpb::tagreader::Message message;
++  cpb::tagreader::ReadFileRequest* req = message.mutable_read_file_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(filename));
+ 
+@@ -68,8 +68,8 @@
+ 
+ TagReaderReply* TagReaderClient::SaveFile(const QString& filename,
+                                           const Song& metadata) {
+-  pb::tagreader::Message message;
+-  pb::tagreader::SaveFileRequest* req = message.mutable_save_file_request();
++  cpb::tagreader::Message message;
++  cpb::tagreader::SaveFileRequest* req = message.mutable_save_file_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(filename));
+   metadata.ToProtobuf(req->mutable_metadata());
+@@ -78,8 +78,8 @@
+ }
+ 
+ TagReaderReply* TagReaderClient::UpdateSongStatistics(const Song& metadata) {
+-  pb::tagreader::Message message;
+-  pb::tagreader::SaveSongStatisticsToFileRequest* req =
++  cpb::tagreader::Message message;
++  cpb::tagreader::SaveSongStatisticsToFileRequest* req =
+       message.mutable_save_song_statistics_to_file_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(metadata.url().toLocalFile()));
+@@ -96,8 +96,8 @@
+ }
+ 
+ TagReaderReply* TagReaderClient::UpdateSongRating(const Song& metadata) {
+-  pb::tagreader::Message message;
+-  pb::tagreader::SaveSongRatingToFileRequest* req =
++  cpb::tagreader::Message message;
++  cpb::tagreader::SaveSongRatingToFileRequest* req =
+       message.mutable_save_song_rating_to_file_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(metadata.url().toLocalFile()));
+@@ -114,8 +114,8 @@
+ }
+ 
+ TagReaderReply* TagReaderClient::IsMediaFile(const QString& filename) {
+-  pb::tagreader::Message message;
+-  pb::tagreader::IsMediaFileRequest* req =
++  cpb::tagreader::Message message;
++  cpb::tagreader::IsMediaFileRequest* req =
+       message.mutable_is_media_file_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(filename));
+@@ -124,8 +124,8 @@
+ }
+ 
+ TagReaderReply* TagReaderClient::LoadEmbeddedArt(const QString& filename) {
+-  pb::tagreader::Message message;
+-  pb::tagreader::LoadEmbeddedArtRequest* req =
++  cpb::tagreader::Message message;
++  cpb::tagreader::LoadEmbeddedArtRequest* req =
+       message.mutable_load_embedded_art_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(filename));
+@@ -136,8 +136,8 @@
+ TagReaderReply* TagReaderClient::ReadCloudFile(
+     const QUrl& download_url, const QString& title, int size,
+     const QString& mime_type, const QString& authorisation_header) {
+-  pb::tagreader::Message message;
+-  pb::tagreader::ReadCloudFileRequest* req =
++  cpb::tagreader::Message message;
++  cpb::tagreader::ReadCloudFileRequest* req =
+       message.mutable_read_cloud_file_request();
+ 
+   const QString url_string = download_url.toEncoded();
+diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
+--- src/core/tagreaderclient.h	2020-09-23 22:34:08.000000000 -0400
++++ src/core/tagreaderclient.h	2021-02-19 12:03:48.236473033 -0500
+@@ -37,7 +37,7 @@
+  public:
+   explicit TagReaderClient(QObject* parent = nullptr);
+ 
+-  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
++  typedef AbstractMessageHandler<cpb::tagreader::Message> HandlerType;
+   typedef HandlerType::ReplyType ReplyType;
+ 
+   static const char* kWorkerExecutableName;
+@@ -78,7 +78,7 @@
+   static TagReaderClient* sInstance;
+ 
+   WorkerPool<HandlerType>* worker_pool_;
+-  QList<pb::tagreader::Message> message_queue_;
++  QList<cpb::tagreader::Message> message_queue_;
+ };
+ 
+ typedef TagReaderClient::ReplyType TagReaderReply;
+diff -ur src/globalsearch/spotifysearchprovider.cpp src/globalsearch/spotifysearchprovider.cpp
+--- src/globalsearch/spotifysearchprovider.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/globalsearch/spotifysearchprovider.cpp	2021-02-19 12:03:48.236473033 -0500
+@@ -49,16 +49,16 @@
+   if (!service_->IsBlobInstalled()) return nullptr;
+ 
+   server_ = service_->server();
+-  connect(server_, SIGNAL(SearchResults(pb::spotify::SearchResponse)),
+-          SLOT(SearchFinishedSlot(pb::spotify::SearchResponse)));
++  connect(server_, SIGNAL(SearchResults(cpb::spotify::SearchResponse)),
++          SLOT(SearchFinishedSlot(cpb::spotify::SearchResponse)));
+   connect(server_, SIGNAL(ImageLoaded(QString, QImage)),
+           SLOT(ArtLoadedSlot(QString, QImage)));
+   connect(server_, SIGNAL(destroyed()), SLOT(ServerDestroyed()));
+-  connect(server_, SIGNAL(StarredLoaded(pb::spotify::LoadPlaylistResponse)),
+-          SLOT(SuggestionsLoaded(pb::spotify::LoadPlaylistResponse)));
++  connect(server_, SIGNAL(StarredLoaded(cpb::spotify::LoadPlaylistResponse)),
++          SLOT(SuggestionsLoaded(cpb::spotify::LoadPlaylistResponse)));
+   connect(server_,
+-          SIGNAL(ToplistBrowseResults(pb::spotify::BrowseToplistResponse)),
+-          SLOT(SuggestionsLoaded(pb::spotify::BrowseToplistResponse)));
++          SIGNAL(ToplistBrowseResults(cpb::spotify::BrowseToplistResponse)),
++          SLOT(SuggestionsLoaded(cpb::spotify::BrowseToplistResponse)));
+ 
+   return server_;
+ }
+@@ -82,7 +82,7 @@
+ }
+ 
+ void SpotifySearchProvider::SearchFinishedSlot(
+-    const pb::spotify::SearchResponse& response) {
++    const cpb::spotify::SearchResponse& response) {
+   QString query_string = QString::fromUtf8(response.request().query().c_str());
+   QMap<QString, PendingState>::iterator it = queries_.find(query_string);
+   if (it == queries_.end()) return;
+@@ -107,7 +107,7 @@
+   ResultList ret;
+ 
+   for (int i = 0; i < response.album_size(); ++i) {
+-    const pb::spotify::Album& album = response.album(i);
++    const cpb::spotify::Album& album = response.album(i);
+ 
+     QHash<QString, int> artist_count;
+     QString majority_artist;
+@@ -153,7 +153,7 @@
+   }
+ 
+   for (int i = 0; i < response.result_size(); ++i) {
+-    const pb::spotify::Track& track = response.result(i);
++    const cpb::spotify::Track& track = response.result(i);
+ 
+     // Check this track/album against tracks we've already seen
+     // in the album results, and skip if it's a duplicate
+@@ -211,7 +211,7 @@
+ }
+ 
+ void SpotifySearchProvider::AddSuggestionFromTrack(
+-    const pb::spotify::Track& track) {
++    const cpb::spotify::Track& track) {
+   if (!track.title().empty()) {
+     suggestions_.insert(QString::fromUtf8(track.title().c_str()));
+   }
+@@ -226,7 +226,7 @@
+ }
+ 
+ void SpotifySearchProvider::AddSuggestionFromAlbum(
+-    const pb::spotify::Album& album) {
++    const cpb::spotify::Album& album) {
+   AddSuggestionFromTrack(album.metadata());
+   for (int i = 0; i < album.track_size(); ++i) {
+     AddSuggestionFromTrack(album.track(i));
+@@ -234,14 +234,14 @@
+ }
+ 
+ void SpotifySearchProvider::SuggestionsLoaded(
+-    const pb::spotify::LoadPlaylistResponse& playlist) {
++    const cpb::spotify::LoadPlaylistResponse& playlist) {
+   for (int i = 0; i < playlist.track_size(); ++i) {
+     AddSuggestionFromTrack(playlist.track(i));
+   }
+ }
+ 
+ void SpotifySearchProvider::SuggestionsLoaded(
+-    const pb::spotify::BrowseToplistResponse& response) {
++    const cpb::spotify::BrowseToplistResponse& response) {
+   for (int i = 0; i < response.track_size(); ++i) {
+     AddSuggestionFromTrack(response.track(i));
+   }
+diff -ur src/globalsearch/spotifysearchprovider.h src/globalsearch/spotifysearchprovider.h
+--- src/globalsearch/spotifysearchprovider.h	2020-09-23 22:34:08.000000000 -0400
++++ src/globalsearch/spotifysearchprovider.h	2021-02-19 12:03:48.237473037 -0500
+@@ -41,17 +41,17 @@
+ 
+  private slots:
+   void ServerDestroyed();
+-  void SearchFinishedSlot(const pb::spotify::SearchResponse& response);
++  void SearchFinishedSlot(const cpb::spotify::SearchResponse& response);
+   void ArtLoadedSlot(const QString& id, const QImage& image);
+-  void SuggestionsLoaded(const pb::spotify::LoadPlaylistResponse& response);
+-  void SuggestionsLoaded(const pb::spotify::BrowseToplistResponse& response);
++  void SuggestionsLoaded(const cpb::spotify::LoadPlaylistResponse& response);
++  void SuggestionsLoaded(const cpb::spotify::BrowseToplistResponse& response);
+ 
+  private:
+   SpotifyServer* server();
+ 
+   void LoadSuggestions();
+-  void AddSuggestionFromTrack(const pb::spotify::Track& track);
+-  void AddSuggestionFromAlbum(const pb::spotify::Album& album);
++  void AddSuggestionFromTrack(const cpb::spotify::Track& track);
++  void AddSuggestionFromAlbum(const cpb::spotify::Album& album);
+ 
+  private:
+   SpotifyServer* server_;
+diff -ur src/internet/core/cloudfileservice.cpp src/internet/core/cloudfileservice.cpp
+--- src/internet/core/cloudfileservice.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/internet/core/cloudfileservice.cpp	2021-02-19 12:03:48.237473037 -0500
+@@ -192,14 +192,14 @@
+                                    indexing_task_max_);
+   }
+ 
+-  const pb::tagreader::ReadCloudFileResponse& message =
++  const cpb::tagreader::ReadCloudFileResponse& message =
+       reply->message().read_cloud_file_response();
+   if (!message.has_metadata() || !message.metadata().filesize()) {
+     qLog(Debug) << "Failed to tag:" << metadata.url();
+     return;
+   }
+ 
+-  pb::tagreader::SongMetadata metadata_pb;
++  cpb::tagreader::SongMetadata metadata_pb;
+   metadata.ToProtobuf(&metadata_pb);
+   metadata_pb.MergeFrom(message.metadata());
+ 
+diff -ur src/internet/spotify/spotifyserver.cpp src/internet/spotify/spotifyserver.cpp
+--- src/internet/spotify/spotifyserver.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/internet/spotify/spotifyserver.cpp	2021-02-19 12:03:48.237473037 -0500
+@@ -31,7 +31,7 @@
+ #include "spotifymessages.pb.h"
+ 
+ SpotifyServer::SpotifyServer(QObject* parent)
+-    : AbstractMessageHandler<pb::spotify::Message>(nullptr, parent),
++    : AbstractMessageHandler<cpb::spotify::Message>(nullptr, parent),
+       server_(new QTcpServer(this)),
+       logged_in_(false) {
+   connect(server_, SIGNAL(newConnection()), SLOT(NewConnection()));
+@@ -52,7 +52,7 @@
+   qLog(Info) << "Connection from port" << socket->peerPort();
+ 
+   // Send any login messages that were queued before the client connected
+-  for (const pb::spotify::Message& message : queued_login_messages_) {
++  for (const cpb::spotify::Message& message : queued_login_messages_) {
+     SendOrQueueMessage(message);
+   }
+   queued_login_messages_.clear();
+@@ -61,10 +61,10 @@
+   disconnect(server_, SIGNAL(newConnection()), this, 0);
+ }
+ 
+-void SpotifyServer::SendOrQueueMessage(const pb::spotify::Message& message) {
++void SpotifyServer::SendOrQueueMessage(const cpb::spotify::Message& message) {
+   const bool is_login_message = message.has_login_request();
+ 
+-  QList<pb::spotify::Message>* queue =
++  QList<cpb::spotify::Message>* queue =
+       is_login_message ? &queued_login_messages_ : &queued_messages_;
+ 
+   if (!device_ || (!is_login_message && !logged_in_)) {
+@@ -75,11 +75,11 @@
+ }
+ 
+ void SpotifyServer::Login(const QString& username, const QString& password,
+-                          pb::spotify::Bitrate bitrate,
++                          cpb::spotify::Bitrate bitrate,
+                           bool volume_normalisation) {
+-  pb::spotify::Message message;
++  cpb::spotify::Message message;
+ 
+-  pb::spotify::LoginRequest* request = message.mutable_login_request();
++  cpb::spotify::LoginRequest* request = message.mutable_login_request();
+   request->set_username(DataCommaSizeFromQString(username));
+   if (!password.isEmpty()) {
+     request->set_password(DataCommaSizeFromQString(password));
+@@ -91,11 +91,11 @@
+   SendOrQueueMessage(message);
+ }
+ 
+-void SpotifyServer::SetPlaybackSettings(pb::spotify::Bitrate bitrate,
++void SpotifyServer::SetPlaybackSettings(cpb::spotify::Bitrate bitrate,
+                                         bool volume_normalisation) {
+-  pb::spotify::Message message;
++  cpb::spotify::Message message;
+ 
+-  pb::spotify::PlaybackSettings* request =
++  cpb::spotify::PlaybackSettings* request =
+       message.mutable_set_playback_settings_request();
+   request->set_bitrate(bitrate);
+   request->set_volume_normalisation(volume_normalisation);
+@@ -103,14 +103,14 @@
+   SendOrQueueMessage(message);
+ }
+ 
+-void SpotifyServer::MessageArrived(const pb::spotify::Message& message) {
++void SpotifyServer::MessageArrived(const cpb::spotify::Message& message) {
+   if (message.has_login_response()) {
+-    const pb::spotify::LoginResponse& response = message.login_response();
++    const cpb::spotify::LoginResponse& response = message.login_response();
+     logged_in_ = response.success();
+ 
+     if (response.success()) {
+       // Send any messages that were queued before the client logged in
+-      for (const pb::spotify::Message& message : queued_messages_) {
++      for (const cpb::spotify::Message& message : queued_messages_) {
+         SendOrQueueMessage(message);
+       }
+       queued_messages_.clear();
+@@ -122,19 +122,19 @@
+   } else if (message.has_playlists_updated()) {
+     emit PlaylistsUpdated(message.playlists_updated());
+   } else if (message.has_load_playlist_response()) {
+-    const pb::spotify::LoadPlaylistResponse& response =
++    const cpb::spotify::LoadPlaylistResponse& response =
+         message.load_playlist_response();
+ 
+     switch (response.request().type()) {
+-      case pb::spotify::Inbox:
++      case cpb::spotify::Inbox:
+         emit InboxLoaded(response);
+         break;
+ 
+-      case pb::spotify::Starred:
++      case cpb::spotify::Starred:
+         emit StarredLoaded(response);
+         break;
+ 
+-      case pb::spotify::UserPlaylist:
++      case cpb::spotify::UserPlaylist:
+         emit UserPlaylistLoaded(response);
+         break;
+     }
+@@ -143,7 +143,7 @@
+   } else if (message.has_search_response()) {
+     emit SearchResults(message.search_response());
+   } else if (message.has_image_response()) {
+-    const pb::spotify::ImageResponse& response = message.image_response();
++    const cpb::spotify::ImageResponse& response = message.image_response();
+     const QString id = QStringFromStdString(response.id());
+ 
+     if (response.has_data()) {
+@@ -162,9 +162,9 @@
+   }
+ }
+ 
+-void SpotifyServer::LoadPlaylist(pb::spotify::PlaylistType type, int index) {
+-  pb::spotify::Message message;
+-  pb::spotify::LoadPlaylistRequest* req =
++void SpotifyServer::LoadPlaylist(cpb::spotify::PlaylistType type, int index) {
++  cpb::spotify::Message message;
++  cpb::spotify::LoadPlaylistRequest* req =
+       message.mutable_load_playlist_request();
+ 
+   req->set_type(type);
+@@ -175,10 +175,10 @@
+   SendOrQueueMessage(message);
+ }
+ 
+-void SpotifyServer::SyncPlaylist(pb::spotify::PlaylistType type, int index,
++void SpotifyServer::SyncPlaylist(cpb::spotify::PlaylistType type, int index,
+                                  bool offline) {
+-  pb::spotify::Message message;
+-  pb::spotify::SyncPlaylistRequest* req =
++  cpb::spotify::Message message;
++  cpb::spotify::SyncPlaylistRequest* req =
+       message.mutable_sync_playlist_request();
+   req->mutable_request()->set_type(type);
+   if (index != -1) {
+@@ -189,40 +189,40 @@
+   SendOrQueueMessage(message);
+ }
+ 
+-void SpotifyServer::SyncInbox() { SyncPlaylist(pb::spotify::Inbox, -1, true); }
++void SpotifyServer::SyncInbox() { SyncPlaylist(cpb::spotify::Inbox, -1, true); }
+ 
+ void SpotifyServer::SyncStarred() {
+-  SyncPlaylist(pb::spotify::Starred, -1, true);
++  SyncPlaylist(cpb::spotify::Starred, -1, true);
+ }
+ 
+ void SpotifyServer::SyncUserPlaylist(int index) {
+   Q_ASSERT(index >= 0);
+-  SyncPlaylist(pb::spotify::UserPlaylist, index, true);
++  SyncPlaylist(cpb::spotify::UserPlaylist, index, true);
+ }
+ 
+-void SpotifyServer::LoadInbox() { LoadPlaylist(pb::spotify::Inbox); }
++void SpotifyServer::LoadInbox() { LoadPlaylist(cpb::spotify::Inbox); }
+ 
+-void SpotifyServer::LoadStarred() { LoadPlaylist(pb::spotify::Starred); }
++void SpotifyServer::LoadStarred() { LoadPlaylist(cpb::spotify::Starred); }
+ 
+ void SpotifyServer::LoadUserPlaylist(int index) {
+   Q_ASSERT(index >= 0);
+-  LoadPlaylist(pb::spotify::UserPlaylist, index);
++  LoadPlaylist(cpb::spotify::UserPlaylist, index);
+ }
+ 
+ void SpotifyServer::AddSongsToStarred(const QList<QUrl>& songs_urls) {
+-  AddSongsToPlaylist(pb::spotify::Starred, songs_urls);
++  AddSongsToPlaylist(cpb::spotify::Starred, songs_urls);
+ }
+ 
+ void SpotifyServer::AddSongsToUserPlaylist(int playlist_index,
+                                            const QList<QUrl>& songs_urls) {
+-  AddSongsToPlaylist(pb::spotify::UserPlaylist, songs_urls, playlist_index);
++  AddSongsToPlaylist(cpb::spotify::UserPlaylist, songs_urls, playlist_index);
+ }
+ 
+ void SpotifyServer::AddSongsToPlaylist(
+-    const pb::spotify::PlaylistType playlist_type,
++    const cpb::spotify::PlaylistType playlist_type,
+     const QList<QUrl>& songs_urls, int playlist_index) {
+-  pb::spotify::Message message;
+-  pb::spotify::AddTracksToPlaylistRequest* req =
++  cpb::spotify::Message message;
++  cpb::spotify::AddTracksToPlaylistRequest* req =
+       message.mutable_add_tracks_to_playlist();
+   req->set_playlist_type(playlist_type);
+   req->set_playlist_index(playlist_index);
+@@ -234,23 +234,23 @@
+ 
+ void SpotifyServer::RemoveSongsFromStarred(
+     const QList<int>& songs_indices_to_remove) {
+-  RemoveSongsFromPlaylist(pb::spotify::Starred, songs_indices_to_remove);
++  RemoveSongsFromPlaylist(cpb::spotify::Starred, songs_indices_to_remove);
+ }
+ 
+ void SpotifyServer::RemoveSongsFromUserPlaylist(
+     int playlist_index, const QList<int>& songs_indices_to_remove) {
+-  RemoveSongsFromPlaylist(pb::spotify::UserPlaylist, songs_indices_to_remove,
++  RemoveSongsFromPlaylist(cpb::spotify::UserPlaylist, songs_indices_to_remove,
+                           playlist_index);
+ }
+ 
+ void SpotifyServer::RemoveSongsFromPlaylist(
+-    const pb::spotify::PlaylistType playlist_type,
++    const cpb::spotify::PlaylistType playlist_type,
+     const QList<int>& songs_indices_to_remove, int playlist_index) {
+-  pb::spotify::Message message;
+-  pb::spotify::RemoveTracksFromPlaylistRequest* req =
++  cpb::spotify::Message message;
++  cpb::spotify::RemoveTracksFromPlaylistRequest* req =
+       message.mutable_remove_tracks_from_playlist();
+   req->set_playlist_type(playlist_type);
+-  if (playlist_type == pb::spotify::UserPlaylist) {
++  if (playlist_type == cpb::spotify::UserPlaylist) {
+     req->set_playlist_index(playlist_index);
+   }
+   for (int song_index : songs_indices_to_remove) {
+@@ -260,8 +260,8 @@
+ }
+ 
+ void SpotifyServer::StartPlayback(const QString& uri, quint16 port) {
+-  pb::spotify::Message message;
+-  pb::spotify::PlaybackRequest* req = message.mutable_playback_request();
++  cpb::spotify::Message message;
++  cpb::spotify::PlaybackRequest* req = message.mutable_playback_request();
+ 
+   req->set_track_uri(DataCommaSizeFromQString(uri));
+   req->set_media_port(port);
+@@ -269,16 +269,16 @@
+ }
+ 
+ void SpotifyServer::Seek(qint64 offset_nsec) {
+-  pb::spotify::Message message;
+-  pb::spotify::SeekRequest* req = message.mutable_seek_request();
++  cpb::spotify::Message message;
++  cpb::spotify::SeekRequest* req = message.mutable_seek_request();
+ 
+   req->set_offset_nsec(offset_nsec);
+   SendOrQueueMessage(message);
+ }
+ 
+ void SpotifyServer::Search(const QString& text, int limit, int limit_album) {
+-  pb::spotify::Message message;
+-  pb::spotify::SearchRequest* req = message.mutable_search_request();
++  cpb::spotify::Message message;
++  cpb::spotify::SearchRequest* req = message.mutable_search_request();
+ 
+   req->set_query(DataCommaSizeFromQString(text));
+   req->set_limit(limit);
+@@ -287,34 +287,34 @@
+ }
+ 
+ void SpotifyServer::LoadImage(const QString& id) {
+-  pb::spotify::Message message;
+-  pb::spotify::ImageRequest* req = message.mutable_image_request();
++  cpb::spotify::Message message;
++  cpb::spotify::ImageRequest* req = message.mutable_image_request();
+ 
+   req->set_id(DataCommaSizeFromQString(id));
+   SendOrQueueMessage(message);
+ }
+ 
+ void SpotifyServer::AlbumBrowse(const QString& uri) {
+-  pb::spotify::Message message;
+-  pb::spotify::BrowseAlbumRequest* req = message.mutable_browse_album_request();
++  cpb::spotify::Message message;
++  cpb::spotify::BrowseAlbumRequest* req = message.mutable_browse_album_request();
+ 
+   req->set_uri(DataCommaSizeFromQString(uri));
+   SendOrQueueMessage(message);
+ }
+ 
+ void SpotifyServer::LoadToplist() {
+-  pb::spotify::Message message;
+-  pb::spotify::BrowseToplistRequest* req =
++  cpb::spotify::Message message;
++  cpb::spotify::BrowseToplistRequest* req =
+       message.mutable_browse_toplist_request();
+-  req->set_type(pb::spotify::BrowseToplistRequest::Tracks);
+-  req->set_region(pb::spotify::BrowseToplistRequest::Everywhere);
++  req->set_type(cpb::spotify::BrowseToplistRequest::Tracks);
++  req->set_region(cpb::spotify::BrowseToplistRequest::Everywhere);
+ 
+   SendOrQueueMessage(message);
+ }
+ 
+ void SpotifyServer::SetPaused(const bool paused) {
+-  pb::spotify::Message message;
+-  pb::spotify::PauseRequest* req = message.mutable_pause_request();
++  cpb::spotify::Message message;
++  cpb::spotify::PauseRequest* req = message.mutable_pause_request();
+   req->set_paused(paused);
+   SendOrQueueMessage(message);
+ }
+diff -ur src/internet/spotify/spotifyserver.h src/internet/spotify/spotifyserver.h
+--- src/internet/spotify/spotifyserver.h	2020-09-23 22:34:08.000000000 -0400
++++ src/internet/spotify/spotifyserver.h	2021-02-19 12:03:48.237473037 -0500
+@@ -31,7 +31,7 @@
+ class QTcpServer;
+ class QTcpSocket;
+ 
+-class SpotifyServer : public AbstractMessageHandler<pb::spotify::Message> {
++class SpotifyServer : public AbstractMessageHandler<cpb::spotify::Message> {
+   Q_OBJECT
+ 
+  public:
+@@ -39,7 +39,7 @@
+ 
+   void Init();
+   void Login(const QString& username, const QString& password,
+-             pb::spotify::Bitrate bitrate, bool volume_normalisation);
++             cpb::spotify::Bitrate bitrate, bool volume_normalisation);
+ 
+   void LoadStarred();
+   void SyncStarred();
+@@ -56,7 +56,7 @@
+   void Search(const QString& text, int limit, int limit_album = 0);
+   void LoadImage(const QString& id);
+   void AlbumBrowse(const QString& uri);
+-  void SetPlaybackSettings(pb::spotify::Bitrate bitrate,
++  void SetPlaybackSettings(cpb::spotify::Bitrate bitrate,
+                            bool volume_normalisation);
+   void LoadToplist();
+   void SetPaused(const bool paused);
+@@ -69,43 +69,43 @@
+ 
+  signals:
+   void LoginCompleted(bool success, const QString& error,
+-                      pb::spotify::LoginResponse_Error error_code);
+-  void PlaylistsUpdated(const pb::spotify::Playlists& playlists);
++                      cpb::spotify::LoginResponse_Error error_code);
++  void PlaylistsUpdated(const cpb::spotify::Playlists& playlists);
+ 
+-  void StarredLoaded(const pb::spotify::LoadPlaylistResponse& response);
+-  void InboxLoaded(const pb::spotify::LoadPlaylistResponse& response);
+-  void UserPlaylistLoaded(const pb::spotify::LoadPlaylistResponse& response);
++  void StarredLoaded(const cpb::spotify::LoadPlaylistResponse& response);
++  void InboxLoaded(const cpb::spotify::LoadPlaylistResponse& response);
++  void UserPlaylistLoaded(const cpb::spotify::LoadPlaylistResponse& response);
+   void PlaybackError(const QString& message);
+-  void SearchResults(const pb::spotify::SearchResponse& response);
++  void SearchResults(const cpb::spotify::SearchResponse& response);
+   void ImageLoaded(const QString& id, const QImage& image);
+-  void SyncPlaylistProgress(const pb::spotify::SyncPlaylistProgress& progress);
+-  void AlbumBrowseResults(const pb::spotify::BrowseAlbumResponse& response);
+-  void ToplistBrowseResults(const pb::spotify::BrowseToplistResponse& response);
++  void SyncPlaylistProgress(const cpb::spotify::SyncPlaylistProgress& progress);
++  void AlbumBrowseResults(const cpb::spotify::BrowseAlbumResponse& response);
++  void ToplistBrowseResults(const cpb::spotify::BrowseToplistResponse& response);
+ 
+  protected:
+-  void MessageArrived(const pb::spotify::Message& message);
++  void MessageArrived(const cpb::spotify::Message& message);
+ 
+  private slots:
+   void NewConnection();
+ 
+  private:
+-  void LoadPlaylist(pb::spotify::PlaylistType type, int index = -1);
+-  void SyncPlaylist(pb::spotify::PlaylistType type, int index, bool offline);
+-  void AddSongsToPlaylist(const pb::spotify::PlaylistType playlist_type,
++  void LoadPlaylist(cpb::spotify::PlaylistType type, int index = -1);
++  void SyncPlaylist(cpb::spotify::PlaylistType type, int index, bool offline);
++  void AddSongsToPlaylist(const cpb::spotify::PlaylistType playlist_type,
+                           const QList<QUrl>& songs_urls,
+                           // Used iff type is user_playlist
+                           int playlist_index = -1);
+-  void RemoveSongsFromPlaylist(const pb::spotify::PlaylistType playlist_type,
++  void RemoveSongsFromPlaylist(const cpb::spotify::PlaylistType playlist_type,
+                                const QList<int>& songs_indices_to_remove,
+                                // Used iff type is user_playlist
+                                int playlist_index = -1);
+-  void SendOrQueueMessage(const pb::spotify::Message& message);
++  void SendOrQueueMessage(const cpb::spotify::Message& message);
+ 
+   QTcpServer* server_;
+   bool logged_in_;
+ 
+-  QList<pb::spotify::Message> queued_login_messages_;
+-  QList<pb::spotify::Message> queued_messages_;
++  QList<cpb::spotify::Message> queued_login_messages_;
++  QList<cpb::spotify::Message> queued_messages_;
+ };
+ 
+ #endif  // INTERNET_SPOTIFY_SPOTIFYSERVER_H_
+diff -ur src/internet/spotify/spotifyservice.cpp src/internet/spotify/spotifyservice.cpp
+--- src/internet/spotify/spotifyservice.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/internet/spotify/spotifyservice.cpp	2021-02-19 12:03:48.238473040 -0500
+@@ -85,7 +85,7 @@
+       search_box_(new SearchBoxWidget(this)),
+       search_delay_(new QTimer(this)),
+       login_state_(LoginState_OtherError),
+-      bitrate_(pb::spotify::Bitrate320k),
++      bitrate_(cpb::spotify::Bitrate320k),
+       volume_normalisation_(false) {
+ // Build the search path for the binary blob.
+ // Look for one distributed alongside clementine first, then check in the
+@@ -174,7 +174,7 @@
+ 
+ void SpotifyService::LoginCompleted(
+     bool success, const QString& error,
+-    pb::spotify::LoginResponse_Error error_code) {
++    cpb::spotify::LoginResponse_Error error_code) {
+   if (login_task_id_) {
+     app_->task_manager()->SetTaskFinished(login_task_id_);
+     login_task_id_ = 0;
+@@ -185,19 +185,19 @@
+     QString error_copy(error);
+ 
+     switch (error_code) {
+-      case pb::spotify::LoginResponse_Error_BadUsernameOrPassword:
++      case cpb::spotify::LoginResponse_Error_BadUsernameOrPassword:
+         login_state_ = LoginState_BadCredentials;
+         break;
+ 
+-      case pb::spotify::LoginResponse_Error_UserBanned:
++      case cpb::spotify::LoginResponse_Error_UserBanned:
+         login_state_ = LoginState_Banned;
+         break;
+ 
+-      case pb::spotify::LoginResponse_Error_UserNeedsPremium:
++      case cpb::spotify::LoginResponse_Error_UserNeedsPremium:
+         login_state_ = LoginState_NoPremium;
+         break;
+ 
+-      case pb::spotify::LoginResponse_Error_ReloginFailed:
++      case cpb::spotify::LoginResponse_Error_ReloginFailed:
+         if (login_state_ == LoginState_LoggedIn) {
+           // This is the first time the relogin has failed - show a message this
+           // time only.
+@@ -247,8 +247,8 @@
+ 
+   login_state_ =
+       LoginState(s.value("login_state", LoginState_OtherError).toInt());
+-  bitrate_ = static_cast<pb::spotify::Bitrate>(
+-      s.value("bitrate", pb::spotify::Bitrate320k).toInt());
++  bitrate_ = static_cast<cpb::spotify::Bitrate>(
++      s.value("bitrate", cpb::spotify::Bitrate320k).toInt());
+   volume_normalisation_ = s.value("volume_normalisation", false).toBool();
+ 
+   if (server_ && blob_process_) {
+@@ -267,29 +267,29 @@
+ 
+   connect(
+       server_,
+-      SIGNAL(LoginCompleted(bool, QString, pb::spotify::LoginResponse_Error)),
+-      SLOT(LoginCompleted(bool, QString, pb::spotify::LoginResponse_Error)));
+-  connect(server_, SIGNAL(PlaylistsUpdated(pb::spotify::Playlists)),
+-          SLOT(PlaylistsUpdated(pb::spotify::Playlists)));
+-  connect(server_, SIGNAL(InboxLoaded(pb::spotify::LoadPlaylistResponse)),
+-          SLOT(InboxLoaded(pb::spotify::LoadPlaylistResponse)));
+-  connect(server_, SIGNAL(StarredLoaded(pb::spotify::LoadPlaylistResponse)),
+-          SLOT(StarredLoaded(pb::spotify::LoadPlaylistResponse)));
++      SIGNAL(LoginCompleted(bool, QString, cpb::spotify::LoginResponse_Error)),
++      SLOT(LoginCompleted(bool, QString, cpb::spotify::LoginResponse_Error)));
++  connect(server_, SIGNAL(PlaylistsUpdated(cpb::spotify::Playlists)),
++          SLOT(PlaylistsUpdated(cpb::spotify::Playlists)));
++  connect(server_, SIGNAL(InboxLoaded(cpb::spotify::LoadPlaylistResponse)),
++          SLOT(InboxLoaded(cpb::spotify::LoadPlaylistResponse)));
++  connect(server_, SIGNAL(StarredLoaded(cpb::spotify::LoadPlaylistResponse)),
++          SLOT(StarredLoaded(cpb::spotify::LoadPlaylistResponse)));
+   connect(server_,
+-          SIGNAL(UserPlaylistLoaded(pb::spotify::LoadPlaylistResponse)),
+-          SLOT(UserPlaylistLoaded(pb::spotify::LoadPlaylistResponse)));
++          SIGNAL(UserPlaylistLoaded(cpb::spotify::LoadPlaylistResponse)),
++          SLOT(UserPlaylistLoaded(cpb::spotify::LoadPlaylistResponse)));
+   connect(server_, SIGNAL(PlaybackError(QString)),
+           SIGNAL(StreamError(QString)));
+-  connect(server_, SIGNAL(SearchResults(pb::spotify::SearchResponse)),
+-          SLOT(SearchResults(pb::spotify::SearchResponse)));
++  connect(server_, SIGNAL(SearchResults(cpb::spotify::SearchResponse)),
++          SLOT(SearchResults(cpb::spotify::SearchResponse)));
+   connect(server_, SIGNAL(ImageLoaded(QString, QImage)),
+           SIGNAL(ImageLoaded(QString, QImage)));
+   connect(server_,
+-          SIGNAL(SyncPlaylistProgress(pb::spotify::SyncPlaylistProgress)),
+-          SLOT(SyncPlaylistProgress(pb::spotify::SyncPlaylistProgress)));
++          SIGNAL(SyncPlaylistProgress(cpb::spotify::SyncPlaylistProgress)),
++          SLOT(SyncPlaylistProgress(cpb::spotify::SyncPlaylistProgress)));
+   connect(server_,
+-          SIGNAL(ToplistBrowseResults(pb::spotify::BrowseToplistResponse)),
+-          SLOT(ToplistLoaded(pb::spotify::BrowseToplistResponse)));
++          SIGNAL(ToplistBrowseResults(cpb::spotify::BrowseToplistResponse)),
++          SLOT(ToplistLoaded(cpb::spotify::BrowseToplistResponse)));
+ 
+   server_->Init();
+ 
+@@ -432,7 +432,7 @@
+   root_->appendRow(inbox_);
+ }
+ 
+-void SpotifyService::PlaylistsUpdated(const pb::spotify::Playlists& response) {
++void SpotifyService::PlaylistsUpdated(const cpb::spotify::Playlists& response) {
+   if (login_task_id_) {
+     app_->task_manager()->SetTaskFinished(login_task_id_);
+     login_task_id_ = 0;
+@@ -463,7 +463,7 @@
+   playlists_.clear();
+ 
+   for (int i = 0; i < response.playlist_size(); ++i) {
+-    const pb::spotify::Playlists::Playlist& msg = response.playlist(i);
++    const cpb::spotify::Playlists::Playlist& msg = response.playlist(i);
+ 
+     QString playlist_title = QStringFromStdString(msg.name());
+     if (!msg.is_mine()) {
+@@ -490,13 +490,13 @@
+ }
+ 
+ bool SpotifyService::DoPlaylistsDiffer(
+-    const pb::spotify::Playlists& response) const {
++    const cpb::spotify::Playlists& response) const {
+   if (playlists_.count() != response.playlist_size()) {
+     return true;
+   }
+ 
+   for (int i = 0; i < response.playlist_size(); ++i) {
+-    const pb::spotify::Playlists::Playlist& msg = response.playlist(i);
++    const cpb::spotify::Playlists::Playlist& msg = response.playlist(i);
+     const QStandardItem* item = PlaylistBySpotifyIndex(msg.index());
+ 
+     if (!item) {
+@@ -516,21 +516,21 @@
+ }
+ 
+ void SpotifyService::InboxLoaded(
+-    const pb::spotify::LoadPlaylistResponse& response) {
++    const cpb::spotify::LoadPlaylistResponse& response) {
+   if (inbox_) {
+     FillPlaylist(inbox_, response);
+   }
+ }
+ 
+ void SpotifyService::StarredLoaded(
+-    const pb::spotify::LoadPlaylistResponse& response) {
++    const cpb::spotify::LoadPlaylistResponse& response) {
+   if (starred_) {
+     FillPlaylist(starred_, response);
+   }
+ }
+ 
+ void SpotifyService::ToplistLoaded(
+-    const pb::spotify::BrowseToplistResponse& response) {
++    const cpb::spotify::BrowseToplistResponse& response) {
+   if (toplist_) {
+     FillPlaylist(toplist_, response.track());
+   }
+@@ -546,7 +546,7 @@
+ }
+ 
+ void SpotifyService::UserPlaylistLoaded(
+-    const pb::spotify::LoadPlaylistResponse& response) {
++    const cpb::spotify::LoadPlaylistResponse& response) {
+   // Find a playlist with this index
+   QStandardItem* item =
+       PlaylistBySpotifyIndex(response.request().user_playlist_index());
+@@ -557,7 +557,7 @@
+ 
+ void SpotifyService::FillPlaylist(
+     QStandardItem* item,
+-    const google::protobuf::RepeatedPtrField<pb::spotify::Track>& tracks) {
++    const google::protobuf::RepeatedPtrField<cpb::spotify::Track>& tracks) {
+   if (item->hasChildren()) item->removeRows(0, item->rowCount());
+ 
+   for (int i = 0; i < tracks.size(); ++i) {
+@@ -571,12 +571,12 @@
+ }
+ 
+ void SpotifyService::FillPlaylist(
+-    QStandardItem* item, const pb::spotify::LoadPlaylistResponse& response) {
++    QStandardItem* item, const cpb::spotify::LoadPlaylistResponse& response) {
+   qLog(Debug) << "Filling playlist:" << item->text();
+   FillPlaylist(item, response.track());
+ }
+ 
+-void SpotifyService::SongFromProtobuf(const pb::spotify::Track& track,
++void SpotifyService::SongFromProtobuf(const cpb::spotify::Track& track,
+                                       Song* song) {
+   song->set_rating(track.starred() ? 1.0 : 0.0);
+   song->set_title(QStringFromStdString(track.title()));
+@@ -747,7 +747,7 @@
+ }
+ 
+ void SpotifyService::SearchResults(
+-    const pb::spotify::SearchResponse& response) {
++    const cpb::spotify::SearchResponse& response) {
+   if (QStringFromStdString(response.request().query()) != pending_search_) {
+     qLog(Debug) << "Old search result for"
+                 << QStringFromStdString(response.request().query())
+@@ -888,17 +888,17 @@
+ }
+ 
+ void SpotifyService::SyncPlaylistProgress(
+-    const pb::spotify::SyncPlaylistProgress& progress) {
++    const cpb::spotify::SyncPlaylistProgress& progress) {
+   qLog(Debug) << "Sync progress:" << progress.sync_progress();
+   int task_id = -1;
+   switch (progress.request().type()) {
+-    case pb::spotify::Inbox:
++    case cpb::spotify::Inbox:
+       task_id = inbox_sync_id_;
+       break;
+-    case pb::spotify::Starred:
++    case cpb::spotify::Starred:
+       task_id = starred_sync_id_;
+       break;
+-    case pb::spotify::UserPlaylist: {
++    case cpb::spotify::UserPlaylist: {
+       QMap<int, int>::const_iterator it = playlist_sync_ids_.constFind(
+           progress.request().user_playlist_index());
+       if (it != playlist_sync_ids_.constEnd()) {
+@@ -916,7 +916,7 @@
+   app_->task_manager()->SetTaskProgress(task_id, progress.sync_progress(), 100);
+   if (progress.sync_progress() == 100) {
+     app_->task_manager()->SetTaskFinished(task_id);
+-    if (progress.request().type() == pb::spotify::UserPlaylist) {
++    if (progress.request().type() == cpb::spotify::UserPlaylist) {
+       playlist_sync_ids_.remove(task_id);
+     }
+   }
+diff -ur src/internet/spotify/spotifyservice.h src/internet/spotify/spotifyservice.h
+--- src/internet/spotify/spotifyservice.h	2020-09-23 22:34:08.000000000 -0400
++++ src/internet/spotify/spotifyservice.h	2021-02-19 12:03:48.238473040 -0500
+@@ -93,7 +93,7 @@
+   LoginState login_state() const { return login_state_; }
+   bool IsLoggedIn() const { return login_state_ == LoginState_LoggedIn; }
+ 
+-  static void SongFromProtobuf(const pb::spotify::Track& track, Song* song);
++  static void SongFromProtobuf(const cpb::spotify::Track& track, Song* song);
+ 
+  signals:
+   void BlobStateChanged();
+@@ -109,9 +109,9 @@
+   void StartBlobProcess();
+   void FillPlaylist(
+       QStandardItem* item,
+-      const google::protobuf::RepeatedPtrField<pb::spotify::Track>& tracks);
++      const google::protobuf::RepeatedPtrField<cpb::spotify::Track>& tracks);
+   void FillPlaylist(QStandardItem* item,
+-                    const pb::spotify::LoadPlaylistResponse& response);
++                    const cpb::spotify::LoadPlaylistResponse& response);
+   void AddSongsToUserPlaylist(int playlist_index,
+                               const QList<QUrl>& songs_urls);
+   void AddSongsToStarred(const QList<QUrl>& songs_urls);
+@@ -123,26 +123,26 @@
+   void InitSearch();
+   void ClearSearchResults();
+   QStandardItem* PlaylistBySpotifyIndex(int index) const;
+-  bool DoPlaylistsDiffer(const pb::spotify::Playlists& response) const;
++  bool DoPlaylistsDiffer(const cpb::spotify::Playlists& response) const;
+ 
+  private slots:
+   void EnsureServerCreated(const QString& username = QString(),
+                            const QString& password = QString());
+   void BlobProcessError(QProcess::ProcessError error);
+   void LoginCompleted(bool success, const QString& error,
+-                      pb::spotify::LoginResponse_Error error_code);
++                      cpb::spotify::LoginResponse_Error error_code);
+   void AddCurrentSongToUserPlaylist(QAction* action);
+   void AddCurrentSongToStarredPlaylist();
+   void RemoveSongsFromUserPlaylist(int playlist_index,
+                                    const QList<int>& songs_indices_to_remove);
+   void RemoveSongsFromStarred(const QList<int>& songs_indices_to_remove);
+-  void PlaylistsUpdated(const pb::spotify::Playlists& response);
+-  void InboxLoaded(const pb::spotify::LoadPlaylistResponse& response);
+-  void StarredLoaded(const pb::spotify::LoadPlaylistResponse& response);
+-  void UserPlaylistLoaded(const pb::spotify::LoadPlaylistResponse& response);
+-  void SearchResults(const pb::spotify::SearchResponse& response);
+-  void SyncPlaylistProgress(const pb::spotify::SyncPlaylistProgress& progress);
+-  void ToplistLoaded(const pb::spotify::BrowseToplistResponse& response);
++  void PlaylistsUpdated(const cpb::spotify::Playlists& response);
++  void InboxLoaded(const cpb::spotify::LoadPlaylistResponse& response);
++  void StarredLoaded(const cpb::spotify::LoadPlaylistResponse& response);
++  void UserPlaylistLoaded(const cpb::spotify::LoadPlaylistResponse& response);
++  void SearchResults(const cpb::spotify::SearchResponse& response);
++  void SyncPlaylistProgress(const cpb::spotify::SyncPlaylistProgress& progress);
++  void ToplistLoaded(const cpb::spotify::BrowseToplistResponse& response);
+   void GetCurrentSongUrlToShare() const;
+   void GetCurrentPlaylistUrlToShare() const;
+ 
+@@ -188,7 +188,7 @@
+   QMap<int, int> playlist_sync_ids_;
+ 
+   LoginState login_state_;
+-  pb::spotify::Bitrate bitrate_;
++  cpb::spotify::Bitrate bitrate_;
+   bool volume_normalisation_;
+ };
+ 
+diff -ur src/internet/spotify/spotifysettingspage.cpp src/internet/spotify/spotifysettingspage.cpp
+--- src/internet/spotify/spotifysettingspage.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/internet/spotify/spotifysettingspage.cpp	2021-02-19 12:03:48.238473040 -0500
+@@ -59,9 +59,9 @@
+   ui_->login_state->AddCredentialField(ui_->password);
+   ui_->login_state->AddCredentialGroup(ui_->account_group);
+ 
+-  ui_->bitrate->addItem("96 " + tr("kbps"), pb::spotify::Bitrate96k);
+-  ui_->bitrate->addItem("160 " + tr("kbps"), pb::spotify::Bitrate160k);
+-  ui_->bitrate->addItem("320 " + tr("kbps"), pb::spotify::Bitrate320k);
++  ui_->bitrate->addItem("96 " + tr("kbps"), cpb::spotify::Bitrate96k);
++  ui_->bitrate->addItem("160 " + tr("kbps"), cpb::spotify::Bitrate160k);
++  ui_->bitrate->addItem("320 " + tr("kbps"), cpb::spotify::Bitrate320k);
+ 
+   BlobStateChanged();
+ }
+@@ -108,7 +108,7 @@
+   validated_ = false;
+ 
+   ui_->bitrate->setCurrentIndex(ui_->bitrate->findData(
+-      s.value("bitrate", pb::spotify::Bitrate320k).toInt()));
++      s.value("bitrate", cpb::spotify::Bitrate320k).toInt()));
+   ui_->volume_normalisation->setChecked(
+       s.value("volume_normalisation", false).toBool());
+ 
+diff -ur src/main.cpp src/main.cpp
+--- src/main.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/main.cpp	2021-02-19 12:03:48.238473040 -0500
+@@ -191,7 +191,7 @@
+       "304c6f756e67652e6d786dba012a28414c42554d2920476f74616e2050726f6a65637"
+       "4202d20416d6269656e74204c6f756e67652e6d786dc001c7a7efd104c801bad685e4"
+       "04d001eeca32");
+-  pb::tagreader::Message message;
++  cpb::tagreader::Message message;
+   message.ParseFromArray(data.constData(), data.size());
+ }
+ 
+diff -ur src/networkremote/incomingdataparser.cpp src/networkremote/incomingdataparser.cpp
+--- src/networkremote/incomingdataparser.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/networkremote/incomingdataparser.cpp	2021-02-19 12:03:48.239473043 -0500
+@@ -97,99 +97,99 @@
+ 
+ bool IncomingDataParser::close_connection() { return close_connection_; }
+ 
+-void IncomingDataParser::Parse(const pb::remote::Message& msg) {
++void IncomingDataParser::Parse(const cpb::remote::Message& msg) {
+   close_connection_ = false;
+ 
+   RemoteClient* client = qobject_cast<RemoteClient*>(sender());
+ 
+   // Now check what's to do
+   switch (msg.type()) {
+-    case pb::remote::CONNECT:
++    case cpb::remote::CONNECT:
+       ClientConnect(msg, client);
+       break;
+-    case pb::remote::DISCONNECT:
++    case cpb::remote::DISCONNECT:
+       close_connection_ = true;
+       break;
+-    case pb::remote::REQUEST_PLAYLISTS:
++    case cpb::remote::REQUEST_PLAYLISTS:
+       SendPlaylists(msg);
+       break;
+-    case pb::remote::REQUEST_PLAYLIST_SONGS:
++    case cpb::remote::REQUEST_PLAYLIST_SONGS:
+       GetPlaylistSongs(msg);
+       break;
+-    case pb::remote::SET_VOLUME:
++    case cpb::remote::SET_VOLUME:
+       emit SetVolume(msg.request_set_volume().volume());
+       break;
+-    case pb::remote::PLAY:
++    case cpb::remote::PLAY:
+       emit Play();
+       break;
+-    case pb::remote::PLAYPAUSE:
++    case cpb::remote::PLAYPAUSE:
+       emit PlayPause();
+       break;
+-    case pb::remote::PAUSE:
++    case cpb::remote::PAUSE:
+       emit Pause();
+       break;
+-    case pb::remote::STOP:
++    case cpb::remote::STOP:
+       emit Stop();
+       break;
+-    case pb::remote::STOP_AFTER:
++    case cpb::remote::STOP_AFTER:
+       emit StopAfterCurrent();
+       break;
+-    case pb::remote::NEXT:
++    case cpb::remote::NEXT:
+       emit Next();
+       break;
+-    case pb::remote::PREVIOUS:
++    case cpb::remote::PREVIOUS:
+       emit Previous();
+       break;
+-    case pb::remote::CHANGE_SONG:
++    case cpb::remote::CHANGE_SONG:
+       ChangeSong(msg);
+       break;
+-    case pb::remote::SHUFFLE_PLAYLIST:
++    case cpb::remote::SHUFFLE_PLAYLIST:
+       emit ShuffleCurrent();
+       break;
+-    case pb::remote::REPEAT:
++    case cpb::remote::REPEAT:
+       SetRepeatMode(msg.repeat());
+       break;
+-    case pb::remote::SHUFFLE:
++    case cpb::remote::SHUFFLE:
+       SetShuffleMode(msg.shuffle());
+       break;
+-    case pb::remote::SET_TRACK_POSITION:
++    case cpb::remote::SET_TRACK_POSITION:
+       emit SeekTo(msg.request_set_track_position().position());
+       break;
+-    case pb::remote::INSERT_URLS:
++    case cpb::remote::INSERT_URLS:
+       InsertUrls(msg);
+       break;
+-    case pb::remote::REMOVE_SONGS:
++    case cpb::remote::REMOVE_SONGS:
+       RemoveSongs(msg);
+       break;
+-    case pb::remote::OPEN_PLAYLIST:
++    case cpb::remote::OPEN_PLAYLIST:
+       OpenPlaylist(msg);
+       break;
+-    case pb::remote::CLOSE_PLAYLIST:
++    case cpb::remote::CLOSE_PLAYLIST:
+       ClosePlaylist(msg);
+       break;
+-    case pb::remote::LOVE:
++    case cpb::remote::LOVE:
+       emit Love();
+       break;
+-    case pb::remote::BAN:
++    case cpb::remote::BAN:
+       emit Ban();
+       break;
+-    case pb::remote::GET_LYRICS:
++    case cpb::remote::GET_LYRICS:
+       emit GetLyrics();
+       break;
+-    case pb::remote::DOWNLOAD_SONGS:
++    case cpb::remote::DOWNLOAD_SONGS:
+       client->song_sender()->SendSongs(msg.request_download_songs());
+       break;
+-    case pb::remote::SONG_OFFER_RESPONSE:
++    case cpb::remote::SONG_OFFER_RESPONSE:
+       client->song_sender()->ResponseSongOffer(
+           msg.response_song_offer().accepted());
+       break;
+-    case pb::remote::GET_LIBRARY:
++    case cpb::remote::GET_LIBRARY:
+       emit SendLibrary(client);
+       break;
+-    case pb::remote::RATE_SONG:
++    case cpb::remote::RATE_SONG:
+       RateSong(msg);
+       break;
+-    case pb::remote::GLOBAL_SEARCH:
++    case cpb::remote::GLOBAL_SEARCH:
+       GlobalSearch(client, msg);
+       break;
+     default:
+@@ -197,13 +197,13 @@
+   }
+ }
+ 
+-void IncomingDataParser::GetPlaylistSongs(const pb::remote::Message& msg) {
++void IncomingDataParser::GetPlaylistSongs(const cpb::remote::Message& msg) {
+   emit SendPlaylistSongs(msg.request_playlist_songs().id());
+ }
+ 
+-void IncomingDataParser::ChangeSong(const pb::remote::Message& msg) {
++void IncomingDataParser::ChangeSong(const cpb::remote::Message& msg) {
+   // Get the first entry and check if there is a song
+-  const pb::remote::RequestChangeSong& request = msg.request_change_song();
++  const cpb::remote::RequestChangeSong& request = msg.request_change_song();
+ 
+   // Check if we need to change the playlist
+   if (request.playlist_id() != app_->playlist_manager()->active_id()) {
+@@ -227,18 +227,18 @@
+   }
+ }
+ 
+-void IncomingDataParser::SetRepeatMode(const pb::remote::Repeat& repeat) {
++void IncomingDataParser::SetRepeatMode(const cpb::remote::Repeat& repeat) {
+   switch (repeat.repeat_mode()) {
+-    case pb::remote::Repeat_Off:
++    case cpb::remote::Repeat_Off:
+       emit SetRepeatMode(PlaylistSequence::Repeat_Off);
+       break;
+-    case pb::remote::Repeat_Track:
++    case cpb::remote::Repeat_Track:
+       emit SetRepeatMode(PlaylistSequence::Repeat_Track);
+       break;
+-    case pb::remote::Repeat_Album:
++    case cpb::remote::Repeat_Album:
+       emit SetRepeatMode(PlaylistSequence::Repeat_Album);
+       break;
+-    case pb::remote::Repeat_Playlist:
++    case cpb::remote::Repeat_Playlist:
+       emit SetRepeatMode(PlaylistSequence::Repeat_Playlist);
+       break;
+     default:
+@@ -246,18 +246,18 @@
+   }
+ }
+ 
+-void IncomingDataParser::SetShuffleMode(const pb::remote::Shuffle& shuffle) {
++void IncomingDataParser::SetShuffleMode(const cpb::remote::Shuffle& shuffle) {
+   switch (shuffle.shuffle_mode()) {
+-    case pb::remote::Shuffle_Off:
++    case cpb::remote::Shuffle_Off:
+       emit SetShuffleMode(PlaylistSequence::Shuffle_Off);
+       break;
+-    case pb::remote::Shuffle_All:
++    case cpb::remote::Shuffle_All:
+       emit SetShuffleMode(PlaylistSequence::Shuffle_All);
+       break;
+-    case pb::remote::Shuffle_InsideAlbum:
++    case cpb::remote::Shuffle_InsideAlbum:
+       emit SetShuffleMode(PlaylistSequence::Shuffle_InsideAlbum);
+       break;
+-    case pb::remote::Shuffle_Albums:
++    case cpb::remote::Shuffle_Albums:
+       emit SetShuffleMode(PlaylistSequence::Shuffle_Albums);
+       break;
+     default:
+@@ -265,8 +265,8 @@
+   }
+ }
+ 
+-void IncomingDataParser::InsertUrls(const pb::remote::Message& msg) {
+-  const pb::remote::RequestInsertUrls& request = msg.request_insert_urls();
++void IncomingDataParser::InsertUrls(const cpb::remote::Message& msg) {
++  const cpb::remote::RequestInsertUrls& request = msg.request_insert_urls();
+ 
+   // Insert plain urls without metadata
+   if (!request.urls().empty()) {
+@@ -292,8 +292,8 @@
+   }
+ }
+ 
+-void IncomingDataParser::RemoveSongs(const pb::remote::Message& msg) {
+-  const pb::remote::RequestRemoveSongs& request = msg.request_remove_songs();
++void IncomingDataParser::RemoveSongs(const cpb::remote::Message& msg) {
++  const cpb::remote::RequestRemoveSongs& request = msg.request_remove_songs();
+ 
+   // Extract urls
+   QList<int> songs;
+@@ -305,7 +305,7 @@
+   emit RemoveSongs(request.playlist_id(), songs);
+ }
+ 
+-void IncomingDataParser::ClientConnect(const pb::remote::Message& msg,
++void IncomingDataParser::ClientConnect(const cpb::remote::Message& msg,
+                                        RemoteClient* client) {
+   // Always sned the Clementine infos
+   emit SendClementineInfo();
+@@ -321,7 +321,7 @@
+   }
+ }
+ 
+-void IncomingDataParser::SendPlaylists(const pb::remote::Message& msg) {
++void IncomingDataParser::SendPlaylists(const cpb::remote::Message& msg) {
+   if (!msg.has_request_playlists() ||
+       !msg.request_playlists().include_closed()) {
+     emit SendAllActivePlaylists();
+@@ -330,27 +330,27 @@
+   }
+ }
+ 
+-void IncomingDataParser::OpenPlaylist(const pb::remote::Message& msg) {
++void IncomingDataParser::OpenPlaylist(const cpb::remote::Message& msg) {
+   emit Open(msg.request_open_playlist().playlist_id());
+ }
+ 
+-void IncomingDataParser::ClosePlaylist(const pb::remote::Message& msg) {
++void IncomingDataParser::ClosePlaylist(const cpb::remote::Message& msg) {
+   emit Close(msg.request_close_playlist().playlist_id());
+ }
+ 
+-void IncomingDataParser::RateSong(const pb::remote::Message& msg) {
++void IncomingDataParser::RateSong(const cpb::remote::Message& msg) {
+   double rating = (double)msg.request_rate_song().rating();
+   emit RateCurrentSong(rating);
+ }
+ 
+ void IncomingDataParser::GlobalSearch(RemoteClient* client,
+-                                      const pb::remote::Message& msg) {
++                                      const cpb::remote::Message& msg) {
+   emit DoGlobalSearch(QStringFromStdString(msg.request_global_search().query()),
+                       client);
+ }
+ 
+ Song IncomingDataParser::CreateSongFromProtobuf(
+-    const pb::remote::SongMetadata& pb) {
++    const cpb::remote::SongMetadata& pb) {
+   Song song;
+   song.Init(QStringFromStdString(pb.title()), QStringFromStdString(pb.artist()),
+             QStringFromStdString(pb.album()), pb.length() * kNsecPerSec);
+diff -ur src/networkremote/incomingdataparser.h src/networkremote/incomingdataparser.h
+--- src/networkremote/incomingdataparser.h	2020-09-23 22:34:08.000000000 -0400
++++ src/networkremote/incomingdataparser.h	2021-02-19 12:03:48.239473043 -0500
+@@ -16,7 +16,7 @@
+   bool close_connection();
+ 
+  public slots:
+-  void Parse(const pb::remote::Message& msg);
++  void Parse(const cpb::remote::Message& msg);
+   void ReloadSettings();
+ 
+  signals:
+@@ -61,20 +61,20 @@
+   bool close_connection_;
+   MainWindow::PlaylistAddBehaviour doubleclick_playlist_addmode_;
+ 
+-  void GetPlaylistSongs(const pb::remote::Message& msg);
+-  void ChangeSong(const pb::remote::Message& msg);
+-  void SetRepeatMode(const pb::remote::Repeat& repeat);
+-  void SetShuffleMode(const pb::remote::Shuffle& shuffle);
+-  void InsertUrls(const pb::remote::Message& msg);
+-  void RemoveSongs(const pb::remote::Message& msg);
+-  void ClientConnect(const pb::remote::Message& msg, RemoteClient* client);
+-  void SendPlaylists(const pb::remote::Message& msg);
+-  void OpenPlaylist(const pb::remote::Message& msg);
+-  void ClosePlaylist(const pb::remote::Message& msg);
+-  void RateSong(const pb::remote::Message& msg);
+-  void GlobalSearch(RemoteClient* client, const pb::remote::Message& msg);
++  void GetPlaylistSongs(const cpb::remote::Message& msg);
++  void ChangeSong(const cpb::remote::Message& msg);
++  void SetRepeatMode(const cpb::remote::Repeat& repeat);
++  void SetShuffleMode(const cpb::remote::Shuffle& shuffle);
++  void InsertUrls(const cpb::remote::Message& msg);
++  void RemoveSongs(const cpb::remote::Message& msg);
++  void ClientConnect(const cpb::remote::Message& msg, RemoteClient* client);
++  void SendPlaylists(const cpb::remote::Message& msg);
++  void OpenPlaylist(const cpb::remote::Message& msg);
++  void ClosePlaylist(const cpb::remote::Message& msg);
++  void RateSong(const cpb::remote::Message& msg);
++  void GlobalSearch(RemoteClient* client, const cpb::remote::Message& msg);
+ 
+-  Song CreateSongFromProtobuf(const pb::remote::SongMetadata& pb);
++  Song CreateSongFromProtobuf(const cpb::remote::SongMetadata& pb);
+ };
+ 
+ #endif  // INCOMINGDATAPARSER_H
+diff -ur src/networkremote/networkremote.cpp src/networkremote/networkremote.cpp
+--- src/networkremote/networkremote.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/networkremote/networkremote.cpp	2021-02-19 12:03:48.239473043 -0500
+@@ -214,8 +214,8 @@
+     clients_.push_back(client);
+ 
+     // Connect the signal to parse data
+-    connect(client, SIGNAL(Parse(pb::remote::Message)),
+-            incoming_data_parser_.get(), SLOT(Parse(pb::remote::Message)));
++    connect(client, SIGNAL(Parse(cpb::remote::Message)),
++            incoming_data_parser_.get(), SLOT(Parse(cpb::remote::Message)));
+   }
+ }
+ 
+diff -ur src/networkremote/outgoingdatacreator.cpp src/networkremote/outgoingdatacreator.cpp
+--- src/networkremote/outgoingdatacreator.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/networkremote/outgoingdatacreator.cpp	2021-02-19 12:03:48.239473043 -0500
+@@ -144,7 +144,7 @@
+   return nullptr;
+ }
+ 
+-void OutgoingDataCreator::SendDataToClients(pb::remote::Message* msg) {
++void OutgoingDataCreator::SendDataToClients(cpb::remote::Message* msg) {
+   // Check if we have clients to send data to
+   if (clients_->empty()) {
+     return;
+@@ -172,11 +172,11 @@
+ 
+ void OutgoingDataCreator::SendClementineInfo() {
+   // Create the general message and set the message type
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::INFO);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::INFO);
+ 
+   // Now add the message specific data
+-  pb::remote::ResponseClementineInfo* info =
++  cpb::remote::ResponseClementineInfo* info =
+       msg.mutable_response_clementine_info();
+   SetEngineState(info);
+ 
+@@ -188,20 +188,20 @@
+ }
+ 
+ void OutgoingDataCreator::SetEngineState(
+-    pb::remote::ResponseClementineInfo* msg) {
++    cpb::remote::ResponseClementineInfo* msg) {
+   switch (app_->player()->GetState()) {
+     case Engine::Idle:
+-      msg->set_state(pb::remote::Idle);
++      msg->set_state(cpb::remote::Idle);
+       break;
+     case Engine::Error:
+     case Engine::Empty:
+-      msg->set_state(pb::remote::Empty);
++      msg->set_state(cpb::remote::Empty);
+       break;
+     case Engine::Playing:
+-      msg->set_state(pb::remote::Playing);
++      msg->set_state(cpb::remote::Playing);
+       break;
+     case Engine::Paused:
+-      msg->set_state(pb::remote::Paused);
++      msg->set_state(cpb::remote::Paused);
+       break;
+   }
+ }
+@@ -212,10 +212,10 @@
+   int active_playlist = app_->playlist_manager()->active_id();
+ 
+   // Create message
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::PLAYLISTS);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::PLAYLISTS);
+ 
+-  pb::remote::ResponsePlaylists* playlists = msg.mutable_response_playlists();
++  cpb::remote::ResponsePlaylists* playlists = msg.mutable_response_playlists();
+ 
+   // Get all playlists, even ones that are hidden in the UI.
+   for (const PlaylistBackend::Playlist& p :
+@@ -224,7 +224,7 @@
+     int item_count = playlist_open ? app_playlists.at(p.id)->rowCount() : 0;
+ 
+     // Create a new playlist
+-    pb::remote::Playlist* playlist = playlists->add_playlist();
++    cpb::remote::Playlist* playlist = playlists->add_playlist();
+     playlist->set_name(DataCommaSizeFromQString(p.name));
+     playlist->set_id(p.id);
+     playlist->set_active((p.id == active_playlist));
+@@ -241,10 +241,10 @@
+   int active_playlist = app_->playlist_manager()->active_id();
+ 
+   // Create message
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::PLAYLISTS);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::PLAYLISTS);
+ 
+-  pb::remote::ResponsePlaylists* playlists = msg.mutable_response_playlists();
++  cpb::remote::ResponsePlaylists* playlists = msg.mutable_response_playlists();
+ 
+   QListIterator<Playlist*> it(app_playlists);
+   while (it.hasNext()) {
+@@ -253,7 +253,7 @@
+     QString playlist_name = app_->playlist_manager()->GetPlaylistName(p->id());
+ 
+     // Create a new playlist
+-    pb::remote::Playlist* playlist = playlists->add_playlist();
++    cpb::remote::Playlist* playlist = playlists->add_playlist();
+     playlist->set_name(DataCommaSizeFromQString(playlist_name));
+     playlist->set_id(p->id());
+     playlist->set_active((p->id() == active_playlist));
+@@ -269,8 +269,8 @@
+   SendPlaylistSongs(playlist->id());
+ 
+   // Send the changed message after sending the playlist songs
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::ACTIVE_PLAYLIST_CHANGED);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::ACTIVE_PLAYLIST_CHANGED);
+   msg.mutable_response_active_changed()->set_id(playlist->id());
+   SendDataToClients(&msg);
+ }
+@@ -322,8 +322,8 @@
+   SendRepeatMode(app_->playlist_manager()->sequence()->repeat_mode());
+ 
+   // We send all first data
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::FIRST_DATA_SENT_COMPLETE);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::FIRST_DATA_SENT_COMPLETE);
+   SendDataToClients(&msg);
+ }
+ 
+@@ -342,8 +342,8 @@
+ 
+ void OutgoingDataCreator::SendSongMetadata() {
+   // Create the message
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::CURRENT_METAINFO);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::CURRENT_METAINFO);
+ 
+   // If there is no song, create an empty node, otherwise fill it with data
+   int i = app_->playlist_manager()->active()->current_row();
+@@ -355,7 +355,7 @@
+ 
+ void OutgoingDataCreator::CreateSong(const Song& song, const QImage& art,
+                                      const int index,
+-                                     pb::remote::SongMetadata* song_metadata) {
++                                     cpb::remote::SongMetadata* song_metadata) {
+   if (song.is_valid()) {
+     song_metadata->set_id(song.id());
+     song_metadata->set_index(index);
+@@ -381,7 +381,7 @@
+         DataCommaSizeFromQString(song.art_automatic()));
+     song_metadata->set_art_manual(DataCommaSizeFromQString(song.art_manual()));
+     song_metadata->set_type(
+-        static_cast<::pb::remote::SongMetadata_Type>(song.filetype()));
++        static_cast<::cpb::remote::SongMetadata_Type>(song.filetype()));
+ 
+     // Append coverart
+     if (!art.isNull()) {
+@@ -407,8 +407,8 @@
+ 
+ void OutgoingDataCreator::VolumeChanged(int volume) {
+   // Create the message
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::SET_VOLUME);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::SET_VOLUME);
+   msg.mutable_request_set_volume()->set_volume(volume);
+   SendDataToClients(&msg);
+ }
+@@ -422,15 +422,15 @@
+   }
+ 
+   // Create the message and the playlist
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::PLAYLIST_SONGS);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::PLAYLIST_SONGS);
+ 
+   // Create the Response message
+-  pb::remote::ResponsePlaylistSongs* pb_response_playlist_songs =
++  cpb::remote::ResponsePlaylistSongs* pb_response_playlist_songs =
+       msg.mutable_response_playlist_songs();
+ 
+   // Create a new playlist
+-  pb::remote::Playlist* pb_playlist =
++  cpb::remote::Playlist* pb_playlist =
+       pb_response_playlist_songs->mutable_requested_playlist();
+   pb_playlist->set_id(id);
+ 
+@@ -441,7 +441,7 @@
+   QImage null_img;
+   while (it.hasNext()) {
+     Song song = it.next();
+-    pb::remote::SongMetadata* pb_song = pb_response_playlist_songs->add_songs();
++    cpb::remote::SongMetadata* pb_song = pb_response_playlist_songs->add_songs();
+     CreateSong(song, null_img, index, pb_song);
+     ++index;
+   }
+@@ -462,23 +462,23 @@
+   }
+   last_state_ = state;
+ 
+-  pb::remote::Message msg;
++  cpb::remote::Message msg;
+ 
+   switch (state) {
+     case Engine::Playing:
+-      msg.set_type(pb::remote::PLAY);
++      msg.set_type(cpb::remote::PLAY);
+       track_position_timer_->start(1000);
+       break;
+     case Engine::Paused:
+-      msg.set_type(pb::remote::PAUSE);
++      msg.set_type(cpb::remote::PAUSE);
+       track_position_timer_->stop();
+       break;
+     case Engine::Empty:
+-      msg.set_type(pb::remote::STOP);  // Empty is called when player stopped
++      msg.set_type(cpb::remote::STOP);  // Empty is called when player stopped
+       track_position_timer_->stop();
+       break;
+     default:
+-      msg.set_type(pb::remote::STOP);
++      msg.set_type(cpb::remote::STOP);
+       track_position_timer_->stop();
+       break;
+   };
+@@ -487,27 +487,27 @@
+ }
+ 
+ void OutgoingDataCreator::SendRepeatMode(PlaylistSequence::RepeatMode mode) {
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::REPEAT);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::REPEAT);
+ 
+   switch (mode) {
+     case PlaylistSequence::Repeat_Off:
+-      msg.mutable_repeat()->set_repeat_mode(pb::remote::Repeat_Off);
++      msg.mutable_repeat()->set_repeat_mode(cpb::remote::Repeat_Off);
+       break;
+     case PlaylistSequence::Repeat_Track:
+-      msg.mutable_repeat()->set_repeat_mode(pb::remote::Repeat_Track);
++      msg.mutable_repeat()->set_repeat_mode(cpb::remote::Repeat_Track);
+       break;
+     case PlaylistSequence::Repeat_Album:
+-      msg.mutable_repeat()->set_repeat_mode(pb::remote::Repeat_Album);
++      msg.mutable_repeat()->set_repeat_mode(cpb::remote::Repeat_Album);
+       break;
+     case PlaylistSequence::Repeat_Playlist:
+-      msg.mutable_repeat()->set_repeat_mode(pb::remote::Repeat_Playlist);
++      msg.mutable_repeat()->set_repeat_mode(cpb::remote::Repeat_Playlist);
+       break;
+     case PlaylistSequence::Repeat_OneByOne:
+-      msg.mutable_repeat()->set_repeat_mode(pb::remote::Repeat_OneByOne);
++      msg.mutable_repeat()->set_repeat_mode(cpb::remote::Repeat_OneByOne);
+       break;
+     case PlaylistSequence::Repeat_Intro:
+-      msg.mutable_repeat()->set_repeat_mode(pb::remote::Repeat_Intro);
++      msg.mutable_repeat()->set_repeat_mode(cpb::remote::Repeat_Intro);
+       break;
+   }
+ 
+@@ -515,21 +515,21 @@
+ }
+ 
+ void OutgoingDataCreator::SendShuffleMode(PlaylistSequence::ShuffleMode mode) {
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::SHUFFLE);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::SHUFFLE);
+ 
+   switch (mode) {
+     case PlaylistSequence::Shuffle_Off:
+-      msg.mutable_shuffle()->set_shuffle_mode(pb::remote::Shuffle_Off);
++      msg.mutable_shuffle()->set_shuffle_mode(cpb::remote::Shuffle_Off);
+       break;
+     case PlaylistSequence::Shuffle_All:
+-      msg.mutable_shuffle()->set_shuffle_mode(pb::remote::Shuffle_All);
++      msg.mutable_shuffle()->set_shuffle_mode(cpb::remote::Shuffle_All);
+       break;
+     case PlaylistSequence::Shuffle_InsideAlbum:
+-      msg.mutable_shuffle()->set_shuffle_mode(pb::remote::Shuffle_InsideAlbum);
++      msg.mutable_shuffle()->set_shuffle_mode(cpb::remote::Shuffle_InsideAlbum);
+       break;
+     case PlaylistSequence::Shuffle_Albums:
+-      msg.mutable_shuffle()->set_shuffle_mode(pb::remote::Shuffle_Albums);
++      msg.mutable_shuffle()->set_shuffle_mode(cpb::remote::Shuffle_Albums);
+       break;
+   }
+ 
+@@ -537,14 +537,14 @@
+ }
+ 
+ void OutgoingDataCreator::SendKeepAlive() {
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::KEEP_ALIVE);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::KEEP_ALIVE);
+   SendDataToClients(&msg);
+ }
+ 
+ void OutgoingDataCreator::UpdateTrackPosition() {
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::UPDATE_TRACK_POSITION);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::UPDATE_TRACK_POSITION);
+ 
+   int position = std::floor(
+       float(app_->player()->engine()->position_nanosec()) / kNsecPerSec + 0.5);
+@@ -561,10 +561,10 @@
+ }
+ 
+ void OutgoingDataCreator::DisconnectAllClients() {
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::DISCONNECT);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::DISCONNECT);
+   msg.mutable_response_disconnect()->set_reason_disconnect(
+-      pb::remote::Server_Shutdown);
++      cpb::remote::Server_Shutdown);
+   SendDataToClients(&msg);
+ }
+ 
+@@ -572,9 +572,9 @@
+ 
+ void OutgoingDataCreator::SendLyrics(int id,
+                                      const SongInfoFetcher::Result& result) {
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::LYRICS);
+-  pb::remote::ResponseLyrics* response = msg.mutable_response_lyrics();
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::LYRICS);
++  cpb::remote::ResponseLyrics* response = msg.mutable_response_lyrics();
+ 
+   for (const CollapsibleInfoPane::Data& data : result.info_) {
+     // If the size is zero, do not send the provider
+@@ -582,7 +582,7 @@
+         qobject_cast<UltimateLyricsLyric*>(data.content_object_);
+     if (editor->toPlainText().length() == 0) continue;
+ 
+-    pb::remote::Lyric* lyric = response->mutable_lyrics()->Add();
++    cpb::remote::Lyric* lyric = response->mutable_lyrics()->Add();
+ 
+     lyric->set_id(DataCommaSizeFromQString(data.id_));
+     lyric->set_title(DataCommaSizeFromQString(data.title_));
+@@ -623,10 +623,10 @@
+   file.open(QIODevice::ReadOnly);
+ 
+   QByteArray data;
+-  pb::remote::Message msg;
+-  pb::remote::ResponseLibraryChunk* chunk =
++  cpb::remote::Message msg;
++  cpb::remote::ResponseLibraryChunk* chunk =
+       msg.mutable_response_library_chunk();
+-  msg.set_type(pb::remote::LIBRARY_CHUNK);
++  msg.set_type(cpb::remote::LIBRARY_CHUNK);
+ 
+   // Calculate the number of chunks
+   int chunk_count = qRound((file.size() / kFileChunkSize) + 0.5);
+@@ -674,14 +674,14 @@
+   global_search_result_map_.insert(id, request);
+ 
+   // Send status message
+-  pb::remote::Message msg;
+-  pb::remote::ResponseGlobalSearchStatus* status =
++  cpb::remote::Message msg;
++  cpb::remote::ResponseGlobalSearchStatus* status =
+       msg.mutable_response_global_search_status();
+ 
+-  msg.set_type(pb::remote::GLOBAL_SEARCH_STATUS);
++  msg.set_type(cpb::remote::GLOBAL_SEARCH_STATUS);
+   status->set_id(id);
+   status->set_query(DataCommaSizeFromQString(query));
+-  status->set_status(pb::remote::GlobalSearchStarted);
++  status->set_status(cpb::remote::GlobalSearchStarted);
+ 
+   client->SendData(&msg);
+ 
+@@ -696,11 +696,11 @@
+   RemoteClient* client = search_request.client_;
+   QImage null_img;
+ 
+-  pb::remote::Message msg;
+-  pb::remote::ResponseGlobalSearch* response =
++  cpb::remote::Message msg;
++  cpb::remote::ResponseGlobalSearch* response =
+       msg.mutable_response_global_search();
+ 
+-  msg.set_type(pb::remote::GLOBAL_SEARCH_RESULT);
++  msg.set_type(cpb::remote::GLOBAL_SEARCH_RESULT);
+   response->set_id(search_request.id_);
+   response->set_query(DataCommaSizeFromQString(search_request.query_));
+   response->set_search_provider(
+@@ -715,7 +715,7 @@
+   response->set_search_provider_icon(byte_array.constData(), byte_array.size());
+ 
+   for (const SearchProvider::Result& result : results) {
+-    pb::remote::SongMetadata* pb_song = response->add_song_metadata();
++    cpb::remote::SongMetadata* pb_song = response->add_song_metadata();
+     CreateSong(result.metadata_, null_img, 0, pb_song);
+   }
+ 
+@@ -731,14 +731,14 @@
+   GlobalSearchRequest req = global_search_result_map_.take(id);
+ 
+   // Send status message
+-  pb::remote::Message msg;
+-  pb::remote::ResponseGlobalSearchStatus* status =
++  cpb::remote::Message msg;
++  cpb::remote::ResponseGlobalSearchStatus* status =
+       msg.mutable_response_global_search_status();
+ 
+-  msg.set_type(pb::remote::GLOBAL_SEARCH_STATUS);
++  msg.set_type(cpb::remote::GLOBAL_SEARCH_STATUS);
+   status->set_id(req.id_);
+   status->set_query(DataCommaSizeFromQString(req.query_));
+-  status->set_status(pb::remote::GlobalSearchFinished);
++  status->set_status(cpb::remote::GlobalSearchFinished);
+ 
+   req.client_->SendData(&msg);
+ 
+diff -ur src/networkremote/outgoingdatacreator.h src/networkremote/outgoingdatacreator.h
+--- src/networkremote/outgoingdatacreator.h	2020-09-23 22:34:08.000000000 -0400
++++ src/networkremote/outgoingdatacreator.h	2021-02-19 12:03:48.239473043 -0500
+@@ -49,7 +49,7 @@
+   void SetClients(QList<RemoteClient*>* clients);
+ 
+   static void CreateSong(const Song& song, const QImage& art, const int index,
+-                         pb::remote::SongMetadata* song_metadata);
++                         cpb::remote::SongMetadata* song_metadata);
+ 
+  public slots:
+   void SendClementineInfo();
+@@ -102,8 +102,8 @@
+ 
+   QMap<int, GlobalSearchRequest> global_search_result_map_;
+ 
+-  void SendDataToClients(pb::remote::Message* msg);
+-  void SetEngineState(pb::remote::ResponseClementineInfo* msg);
++  void SendDataToClients(cpb::remote::Message* msg);
++  void SetEngineState(cpb::remote::ResponseClementineInfo* msg);
+   void CheckEnabledProviders();
+   SongInfoProvider* ProviderByName(const QString& name) const;
+ };
+diff -ur src/networkremote/remoteclient.cpp src/networkremote/remoteclient.cpp
+--- src/networkremote/remoteclient.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/networkremote/remoteclient.cpp	2021-02-19 12:03:48.240473046 -0500
+@@ -103,33 +103,33 @@
+ }
+ 
+ void RemoteClient::ParseMessage(const QByteArray& data) {
+-  pb::remote::Message msg;
++  cpb::remote::Message msg;
+   if (!msg.ParseFromArray(data.constData(), data.size())) {
+     qLog(Info) << "Couldn't parse data";
+     return;
+   }
+ 
+-  if (msg.type() == pb::remote::CONNECT && use_auth_code_) {
++  if (msg.type() == cpb::remote::CONNECT && use_auth_code_) {
+     if (msg.request_connect().auth_code() != auth_code_) {
+-      DisconnectClient(pb::remote::Wrong_Auth_Code);
++      DisconnectClient(cpb::remote::Wrong_Auth_Code);
+       return;
+     } else {
+       authenticated_ = true;
+     }
+   }
+ 
+-  if (msg.type() == pb::remote::CONNECT) {
++  if (msg.type() == cpb::remote::CONNECT) {
+     setDownloader(msg.request_connect().downloader());
+     qDebug() << "Downloader" << downloader_;
+   }
+ 
+   // Check if downloads are allowed
+-  if (msg.type() == pb::remote::DOWNLOAD_SONGS && !allow_downloads_) {
+-    DisconnectClient(pb::remote::Download_Forbidden);
++  if (msg.type() == cpb::remote::DOWNLOAD_SONGS && !allow_downloads_) {
++    DisconnectClient(cpb::remote::Download_Forbidden);
+     return;
+   }
+ 
+-  if (msg.type() == pb::remote::DISCONNECT) {
++  if (msg.type() == cpb::remote::DISCONNECT) {
+     client_->abort();
+     qDebug() << "Client disconnected";
+     return;
+@@ -137,7 +137,7 @@
+ 
+   // Check if the client has sent the correct auth code
+   if (!authenticated_) {
+-    DisconnectClient(pb::remote::Not_Authenticated);
++    DisconnectClient(cpb::remote::Not_Authenticated);
+     return;
+   }
+ 
+@@ -145,9 +145,9 @@
+   emit Parse(msg);
+ }
+ 
+-void RemoteClient::DisconnectClient(pb::remote::ReasonDisconnect reason) {
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::DISCONNECT);
++void RemoteClient::DisconnectClient(cpb::remote::ReasonDisconnect reason) {
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::DISCONNECT);
+ 
+   msg.mutable_response_disconnect()->set_reason_disconnect(reason);
+   SendDataToClient(&msg);
+@@ -158,7 +158,7 @@
+ }
+ 
+ // Sends data to client without check if authenticated
+-void RemoteClient::SendDataToClient(pb::remote::Message* msg) {
++void RemoteClient::SendDataToClient(cpb::remote::Message* msg) {
+   // Set the default version
+   msg->set_version(msg->default_instance().version());
+ 
+@@ -185,7 +185,7 @@
+   }
+ }
+ 
+-void RemoteClient::SendData(pb::remote::Message* msg) {
++void RemoteClient::SendData(cpb::remote::Message* msg) {
+   // Check if client is authenticated before sending the data
+   if (authenticated_) {
+     SendDataToClient(msg);
+diff -ur src/networkremote/remoteclient.h src/networkremote/remoteclient.h
+--- src/networkremote/remoteclient.h	2020-09-23 22:34:08.000000000 -0400
++++ src/networkremote/remoteclient.h	2021-02-19 12:03:48.240473046 -0500
+@@ -16,11 +16,11 @@
+   ~RemoteClient();
+ 
+   // This method checks if client is authenticated before sending the data
+-  void SendData(pb::remote::Message* msg);
++  void SendData(cpb::remote::Message* msg);
+   QAbstractSocket::SocketState State();
+   void setDownloader(bool downloader);
+   bool isDownloader() { return downloader_; }
+-  void DisconnectClient(pb::remote::ReasonDisconnect reason);
++  void DisconnectClient(cpb::remote::ReasonDisconnect reason);
+ 
+   SongSender* song_sender() { return song_sender_; }
+ 
+@@ -28,13 +28,13 @@
+   void IncomingData();
+ 
+  signals:
+-  void Parse(const pb::remote::Message& msg);
++  void Parse(const cpb::remote::Message& msg);
+ 
+  private:
+   void ParseMessage(const QByteArray& data);
+ 
+   // Sends data to client without check if authenticated
+-  void SendDataToClient(pb::remote::Message* msg);
++  void SendDataToClient(cpb::remote::Message* msg);
+ 
+   Application* app_;
+ 
+diff -ur src/networkremote/songsender.cpp src/networkremote/songsender.cpp
+--- src/networkremote/songsender.cpp	2020-09-23 22:34:08.000000000 -0400
++++ src/networkremote/songsender.cpp	2021-02-19 12:03:48.240473046 -0500
+@@ -67,29 +67,29 @@
+   transcoder_->Cancel();
+ }
+ 
+-void SongSender::SendSongs(const pb::remote::RequestDownloadSongs& request) {
++void SongSender::SendSongs(const cpb::remote::RequestDownloadSongs& request) {
+   Song current_song;
+   if (app_->player()->GetCurrentItem()) {
+     current_song = app_->player()->GetCurrentItem()->Metadata();
+   }
+ 
+   switch (request.download_item()) {
+-    case pb::remote::CurrentItem: {
++    case cpb::remote::CurrentItem: {
+       if (current_song.is_valid()) {
+         DownloadItem item(current_song, 1, 1);
+         download_queue_.append(item);
+       }
+       break;
+     }
+-    case pb::remote::ItemAlbum:
++    case cpb::remote::ItemAlbum:
+       if (current_song.is_valid()) {
+         SendAlbum(current_song);
+       }
+       break;
+-    case pb::remote::APlaylist:
++    case cpb::remote::APlaylist:
+       SendPlaylist(request.playlist_id());
+       break;
+-    case pb::remote::Urls:
++    case cpb::remote::Urls:
+       SendUrls(request);
+       break;
+     default:
+@@ -139,10 +139,10 @@
+ 
+ void SongSender::SendTranscoderStatus() {
+   // Send a message to the remote that we are converting files
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::TRANSCODING_FILES);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::TRANSCODING_FILES);
+ 
+-  pb::remote::ResponseTranscoderStatus* status =
++  cpb::remote::ResponseTranscoderStatus* status =
+       msg.mutable_response_transcoder_status();
+   status->set_processed(transcoder_map_.count());
+   status->set_total(total_transcode_);
+@@ -161,10 +161,10 @@
+ }
+ 
+ void SongSender::SendTotalFileSize() {
+-  pb::remote::Message msg;
+-  msg.set_type(pb::remote::DOWNLOAD_TOTAL_SIZE);
++  cpb::remote::Message msg;
++  msg.set_type(cpb::remote::DOWNLOAD_TOTAL_SIZE);
+ 
+-  pb::remote::ResponseDownloadTotalSize* response =
++  cpb::remote::ResponseDownloadTotalSize* response =
+       msg.mutable_response_download_total_size();
+ 
+   response->set_file_count(download_queue_.size());
+@@ -186,16 +186,16 @@
+ }
+ 
+ void SongSender::OfferNextSong() {
+-  pb::remote::Message msg;
++  cpb::remote::Message msg;
+ 
+   if (download_queue_.isEmpty()) {
+-    msg.set_type(pb::remote::DOWNLOAD_QUEUE_EMPTY);
++    msg.set_type(cpb::remote::DOWNLOAD_QUEUE_EMPTY);
+   } else {
+     // Get the item and send the single song
+     DownloadItem item = download_queue_.head();
+ 
+-    msg.set_type(pb::remote::SONG_FILE_CHUNK);
+-    pb::remote::ResponseSongFileChunk* chunk =
++    msg.set_type(cpb::remote::SONG_FILE_CHUNK);
++    cpb::remote::ResponseSongFileChunk* chunk =
+         msg.mutable_response_song_file_chunk();
+ 
+     // Open the file
+@@ -247,10 +247,10 @@
+   file.open(QIODevice::ReadOnly);
+ 
+   QByteArray data;
+-  pb::remote::Message msg;
+-  pb::remote::ResponseSongFileChunk* chunk =
++  cpb::remote::Message msg;
++  cpb::remote::ResponseSongFileChunk* chunk =
+       msg.mutable_response_song_file_chunk();
+-  msg.set_type(pb::remote::SONG_FILE_CHUNK);
++  msg.set_type(cpb::remote::SONG_FILE_CHUNK);
+ 
+   QImage null_image;
+ 
+@@ -275,7 +275,7 @@
+     // what file it receives.
+     if (chunk_number == 1) {
+       int i = app_->playlist_manager()->active()->current_row();
+-      pb::remote::SongMetadata* song_metadata =
++      cpb::remote::SongMetadata* song_metadata =
+           msg.mutable_response_song_file_chunk()->mutable_song_metadata();
+       OutgoingDataCreator::CreateSong(download_item.song_, null_image, i,
+                                       song_metadata);
+@@ -346,7 +346,7 @@
+   }
+ }
+ 
+-void SongSender::SendUrls(const pb::remote::RequestDownloadSongs& request) {
++void SongSender::SendUrls(const cpb::remote::RequestDownloadSongs& request) {
+   SongList song_list;
+ 
+   // First gather all valid songs
+diff -ur src/networkremote/songsender.h src/networkremote/songsender.h
+--- src/networkremote/songsender.h	2020-09-23 22:34:08.000000000 -0400
++++ src/networkremote/songsender.h	2021-02-19 12:03:48.240473046 -0500
+@@ -30,7 +30,7 @@
+   static const quint32 kFileChunkSize;
+ 
+  public slots:
+-  void SendSongs(const pb::remote::RequestDownloadSongs& request);
++  void SendSongs(const cpb::remote::RequestDownloadSongs& request);
+   void ResponseSongOffer(bool accepted);
+ 
+  private slots:
+@@ -53,7 +53,7 @@
+   void SendSingleSong(DownloadItem download_item);
+   void SendAlbum(const Song& song);
+   void SendPlaylist(int playlist_id);
+-  void SendUrls(const pb::remote::RequestDownloadSongs& request);
++  void SendUrls(const cpb::remote::RequestDownloadSongs& request);
+   void OfferNextSong();
+   void SendTotalFileSize();
+   void TranscodeLosslessFiles();
+diff -ur tests/song_test.cpp tests/song_test.cpp
+--- tests/song_test.cpp	2020-09-23 22:34:08.000000000 -0400
++++ tests/song_test.cpp	2021-02-19 12:03:48.240473046 -0500
+@@ -45,7 +45,7 @@
+   static Song ReadSongFromFile(const QString& filename) {
+     TagReader tag_reader;
+     Song song;
+-    ::pb::tagreader::SongMetadata pb_song;
++    ::cpb::tagreader::SongMetadata pb_song;
+ 
+     // We need to init protobuf object from a Song object, to have default
+     // values initialized correctly. For example, Song's rating is -1 by
+@@ -59,7 +59,7 @@
+ 
+   static void WriteSongToFile(const Song& song, const QString& filename) {
+     TagReader tag_reader;
+-    ::pb::tagreader::SongMetadata pb_song;
++    ::cpb::tagreader::SongMetadata pb_song;
+     song.ToProtobuf(&pb_song);
+     tag_reader.SaveFile(filename, pb_song);
+   }
+@@ -67,14 +67,14 @@
+   static void WriteSongStatisticsToFile(const Song& song,
+                                         const QString& filename) {
+     TagReader tag_reader;
+-    ::pb::tagreader::SongMetadata pb_song;
++    ::cpb::tagreader::SongMetadata pb_song;
+     song.ToProtobuf(&pb_song);
+     tag_reader.SaveSongStatisticsToFile(filename, pb_song);
+   }
+ 
+   static void WriteSongRatingToFile(const Song& song, const QString& filename) {
+     TagReader tag_reader;
+-    ::pb::tagreader::SongMetadata pb_song;
++    ::cpb::tagreader::SongMetadata pb_song;
+     song.ToProtobuf(&pb_song);
+     tag_reader.SaveSongRatingToFile(filename, pb_song);
+   }
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index b00547e9fd3b..2dd01e2ed330 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.4.0rc1
-revision=3
+revision=4
 _fullver=$version-343-gb49afcc5b
 wrksrc=${pkgname}-${_fullver}
 build_style=cmake

From f708a1847d8f03a48c8fa8b14277f57a2ab871ea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:48 -0500
Subject: [PATCH 1920/3458] libArcus: update to 4.8.0.

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

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 7d4fa49fbfe1..9f82e09d2ed6 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.7.1
-revision=3
+version=4.8.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libArcus"
 distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=ba35ebecf4112ccfbe2b493c0e10e0276e85e0d449ce82cfa7590165b801facf
+checksum=f5a7234506c89a36adccdab2a3c410a75aaaa9e7c7f9533db834881c59001677
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 28ddc5599905282b8863fdcf03f5a2a562abdc83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:48 -0500
Subject: [PATCH 1921/3458] cura-engine: update to 4.8.0.

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

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index e60be59391bc..5760846a2d21 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.7.1
-revision=2
+version=4.8.0
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/CuraEngine"
 distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=7e1e408f269a604418f37575ba8ef5f69323bebc4dd7f3091c1c2e9b000ffcbf
+checksum=752977fbe48653743b9f1a6e25e6d1f061513b7cf1cd4f0105b233595e8a15ff
 
 post_install() {
 	vlicense LICENSE

From e760fbea3068c01306d9d0ce4ccad843e2ce5b50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:29:06 -0500
Subject: [PATCH 1922/3458] cura: update to 4.8.0.

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

diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 7ebd118bd80f..8ab7664381b3 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,7 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.7.1
-revision=2
+version=4.8.0
+revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}
@@ -16,4 +16,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Cura"
 distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=1c09552de062ffbe0b2715e983e82c1ac9582aaaa649abfd27c7f82ff59fcf94
+checksum=3f59a53f9d5ba820153401f5f2e9921be843df7677ef4d2b3316bfd08a402cc2

From 5dba9ef0f24f50332f9941725cde7a22da85941e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:48 -0500
Subject: [PATCH 1923/3458] grpc: revbump for protobuf26

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

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3b..3145eb533b1b 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.35.0
-revision=1
+revision=2
 _abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON

From a245c0417f3bd3dfdc259070e7ef6155849e22ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:48 -0500
Subject: [PATCH 1924/3458] hyperion: revbump for protobuf26

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

diff --git a/srcpkgs/hyperion/template b/srcpkgs/hyperion/template
index eac663a6bb3e..a7f946d28fb0 100644
--- a/srcpkgs/hyperion/template
+++ b/srcpkgs/hyperion/template
@@ -1,7 +1,7 @@
 # Template file for 'hyperion'
 pkgname=hyperion
 version=1.03.2
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DUSE_SYSTEM_PROTO_LIBS=ON -DENABLE_QT5=ON
  -DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc -DENABLE_AMLOGIC=ON

From 6f4cce3ec2920568fd14dacb42bd6db279b7fe8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:48 -0500
Subject: [PATCH 1925/3458] kismet: revbump for protobuf26

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

diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index 8d313193e6d7..47a030fd7ec3 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
 # Template file for 'kismet'
 pkgname=kismet
 version=2020.12.R3
-revision=1
+revision=2
 _realver="${version//./-}"
 wrksrc="${pkgname}-${_realver}"
 build_style=gnu-configure

From e03baf94fb018795b5b98bee5ea347bfcbadd4da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:49 -0500
Subject: [PATCH 1926/3458] libcompizconfig: revbump for protobuf26

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

diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template
index 5dae2a0bf028..abc906e7028a 100644
--- a/srcpkgs/libcompizconfig/template
+++ b/srcpkgs/libcompizconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'libcompizconfig'
 pkgname=libcompizconfig
 version=0.8.18
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake intltool libtool pkg-config protobuf"

From 87aad69b51c5482f50518ba424b9764d2a085eca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:49 -0500
Subject: [PATCH 1927/3458] litecoin: update to 0.18.1.

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

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd88514..a46278b0c126 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'litecoin'
 pkgname=litecoin
-version=0.17.1
-revision=7
+version=0.18.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
  --disable-tests --with-libressl"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.litecoin.org/"
 distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"
-checksum=6e05514a480990f1ff1e7c81b5443d741f4016c03ab5c1ef44bf4b169af88bee
+checksum=2d67cba11adc5890b9698ccddeb68dd3c2ff6af19bf3ed0f1c719348b914042f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools protobuf"

From 0be7ba49bf85285ab4437954f13c097ef907dc5f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:49 -0500
Subject: [PATCH 1928/3458] mixxx: revbump for protobuf26

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

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596f..18cf683fcf5d 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=6
+revision=7
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 374ae97922e0fe07986e11cf44cd68233671a5cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:49 -0500
Subject: [PATCH 1929/3458] mosh: revbump for protobuf26

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

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd843..651cd9de60b7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=19
+revision=20
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
 makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"

From 8f792e02348088a653449992182a613461b1aa27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:49 -0500
Subject: [PATCH 1930/3458] mozc: revbump for protobuf26

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

diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 9eb3a230384d..71d32eb5b9cd 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -1,7 +1,7 @@
 # Template file for 'mozc'
 pkgname=mozc
 version=2.23.2815.102
-revision=9
+revision=10
 create_wrksrc=yes
 build_wrksrc=mozc/src
 hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel python which"

From 9265aa7d2b6749f5e666712d4e944175396ddbaf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:49 -0500
Subject: [PATCH 1931/3458] mumble: revbump for protobuf26

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

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf8..d63df7bd4c15 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=1
+revision=2
 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

From a4f004c684711becc66fe7361fdaa6657f1732fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:49 -0500
Subject: [PATCH 1932/3458] nsjail: revbump for protobuf26

---
 srcpkgs/nsjail/template | 4 ++--
 srcpkgs/nsjail/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nsjail/update

diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index 056bc8a2d150..5c0c4fe86a4a 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
 # Template file for 'nsjail'
 pkgname=nsjail
 version=3.0
-revision=3
+revision=4
 build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf which"
 makedepends="libnl3-devel protobuf-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://nsjail.com"
 distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz
-https://github.com/google/kafel/archive/8e69b8efae415cde3debffbb1e379d9e7a16835a.tar.gz"
+ https://github.com/google/kafel/archive/8e69b8efae415cde3debffbb1e379d9e7a16835a.tar.gz"
 checksum="cfa66d3ed136b2e221752287b95e544915e8a6760aa866f023b604d14a374919
  4a6c9a1a70ed99bbed767adc106081b017a3090307ea88cc7e329b82daa1373b"
 
diff --git a/srcpkgs/nsjail/update b/srcpkgs/nsjail/update
new file mode 100644
index 000000000000..89729b202596
--- /dev/null
+++ b/srcpkgs/nsjail/update
@@ -0,0 +1,2 @@
+site="https://github.com/google/nsjail/tags"
+pattern="archive/\K[0-9.]+(?=.tar.gz)"

From b811be86dad882a10f2d7e7987257647c43342b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:50 -0500
Subject: [PATCH 1933/3458] protobuf-c: revbump for protobuf26

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

diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template
index 5d32692a1d6b..d0180c0a2303 100644
--- a/srcpkgs/protobuf-c/template
+++ b/srcpkgs/protobuf-c/template
@@ -1,7 +1,7 @@
 # Template file for 'protobuf-c'
 pkgname=protobuf-c
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="$(vopt_enable protoc)"
 hostmakedepends="pkg-config protobuf"

From d1153e15fe1577cf8f1943be6e5859435fb033bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:50 -0500
Subject: [PATCH 1934/3458] python3-protobuf: update to 3.15.0.

---
 srcpkgs/python3-protobuf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index eb4752e186d9..7dbd630c8a92 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.14.0
+version=3.15.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=1d63eb389347293d8915fb47bee0951c7b5dab522a4a60118b9a18f33e21f8ce
+checksum=e9f13fadb15b80e4a83ef5d9fa44e19243b1e2d96e84ee2228ca305180ca059e
 
 build_options="cppext"
 build_options_default="cppext"
@@ -23,6 +23,10 @@ if [ "$build_option_cppext" ]; then
 	makedepends+=" python3-devel protobuf-devel"
 fi
 
+do_check() {
+	echo "skipping check: package ships with no tests"
+}
+
 post_install() {
 	sed -n 1,29p google/protobuf/__init__.py >LICENSE
 	vlicense LICENSE

From 48aa1c698b5d97b7bbdfb8ce6d8377ff85caa62a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:50 -0500
Subject: [PATCH 1935/3458] strawberry: update to 0.8.4.

---
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ++++++++++++++++++
 srcpkgs/strawberry/template                   |   6 +-
 2 files changed, 350 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
new file mode 100644
index 000000000000..5a9946116ac1
--- /dev/null
+++ b/srcpkgs/strawberry/patches/pb_namespace.patch
@@ -0,0 +1,347 @@
+diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
+--- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
++++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
+@@ -146,34 +146,34 @@
+ 
+ }
+ 
+-pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
++spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
+ 
+-  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
+-  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
+-  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
+-  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
+-  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
+-  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
+-  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
+-  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
+-  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
+-  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
+-  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
+-  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
+-  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
+-  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
++  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
++  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
++  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
++  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
++  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
++  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
++  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
++  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
++  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
++  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
++  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
++  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
++  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
++  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
+ #ifdef HAVE_TAGLIB_DSFFILE
+-  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
++  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
+ #endif
+ #ifdef HAVE_TAGLIB_DSDIFFFILE
+-  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
++  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
+ #endif
+ 
+-  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
++  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
+ 
+ }
+ 
+-void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
++void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
+ 
+   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
+   const QFileInfo info(filename);
+@@ -435,7 +435,7 @@
+ 
+ }
+ 
+-void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
++void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
+ 
+   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
+   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
+@@ -459,7 +459,7 @@
+ 
+ }
+ 
+-void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
++void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
+ 
+   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
+   if (it != map.end()) {
+@@ -503,7 +503,7 @@
+ 
+ }
+ 
+-void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
++void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
+ 
+   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
+   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
+@@ -521,7 +521,7 @@
+ 
+ }
+ 
+-bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
++bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
+ 
+   if (filename.isEmpty()) return false;
+ 
+@@ -608,7 +608,7 @@
+   return result;
+ }
+ 
+-void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
++void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
+ 
+   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
+   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
+diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
+--- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
++++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
+@@ -51,10 +51,10 @@
+   ~TagReader();
+ 
+   bool IsMediaFile(const QString &filename) const;
+-  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
++  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
+ 
+-  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
+-  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
++  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
++  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
+ 
+   QByteArray LoadEmbeddedArt(const QString &filename) const;
+   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
+@@ -62,11 +62,11 @@
+   static void Decode(const TagLib::String &tag, std::string *output);
+   static void Decode(const QString &tag, std::string *output);
+ 
+-  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
+-  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
++  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
++  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
+ 
+-  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
+-  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
++  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
++  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
+ 
+   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
+   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
+diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
+--- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
++++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
+@@ -1,6 +1,6 @@
+ syntax = "proto2";
+ 
+-package pb.tagreader;
++package spb.tagreader;
+ 
+ message SongMetadata {
+ 
+diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
+--- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
++++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
+@@ -27,13 +27,13 @@
+ #include "tagreaderworker.h"
+ 
+ TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
+-  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
++  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
+ {
+ }
+ 
+-void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
++void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
+ 
+-  pb::tagreader::Message reply;
++  spb::tagreader::Message reply;
+ 
+   if (message.has_read_file_request()) {
+     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
+@@ -55,7 +55,7 @@
+ 
+ 
+ void TagReaderWorker::DeviceClosed() {
+-  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
++  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
+ 
+   qApp->exit();
+ }
+diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
+--- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
++++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
+@@ -28,12 +28,12 @@
+ 
+ class QIODevice;
+ 
+-class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
++class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
+ public:
+   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
+ 
+ protected:
+-  void MessageArrived(const pb::tagreader::Message &message) override;
++  void MessageArrived(const spb::tagreader::Message &message) override;
+   void DeviceClosed() override;
+ 
+ private:
+diff -ur src/core/song.cpp src/core/song.cpp
+--- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
++++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
+@@ -744,7 +744,7 @@
+   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
+ }
+ 
+-void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
++void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
+ 
+   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
+ 
+@@ -791,7 +791,7 @@
+ 
+ }
+ 
+-void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
++void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
+ 
+   const QByteArray url(d->url_.toEncoded());
+   const QByteArray art_automatic(d->art_automatic_.toEncoded());
+@@ -826,7 +826,7 @@
+   pb->set_filesize(d->filesize_);
+   pb->set_suspicious_tags(d->suspicious_tags_);
+   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
+-  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
++  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
+ 
+ }
+ 
+diff -ur src/core/song.h src/core/song.h
+--- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
++++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
+@@ -44,11 +44,11 @@
+ struct SimpleMetaBundle;
+ }  // namespace Engine
+ 
+-namespace pb {
++namespace spb {
+ namespace tagreader {
+ class SongMetadata;
+ }  // namespace tagreader
+-}  // namespace pb
++}  // namespace spb
+ 
+ #ifdef HAVE_LIBGPOD
+ struct _Itdb_Track;
+@@ -155,7 +155,7 @@
+   // Constructors
+   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
+   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
+-  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
++  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
+   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
+   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
+   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
+@@ -180,7 +180,7 @@
+   void BindToQuery(QSqlQuery *query) const;
+   void BindToFtsQuery(QSqlQuery *query) const;
+   void ToXesam(QVariantMap *map) const;
+-  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
++  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
+ 
+   // Simple accessors
+   bool is_valid() const;
+diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
+--- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
++++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
+@@ -71,8 +71,8 @@
+ 
+ TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
+ 
+-  pb::tagreader::Message message;
+-  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
++  spb::tagreader::Message message;
++  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(filename));
+ 
+@@ -82,8 +82,8 @@
+ 
+ TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
+ 
+-  pb::tagreader::Message message;
+-  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
++  spb::tagreader::Message message;
++  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(filename));
+   metadata.ToProtobuf(req->mutable_metadata());
+@@ -96,8 +96,8 @@
+ 
+ TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
+ 
+-  pb::tagreader::Message message;
+-  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
++  spb::tagreader::Message message;
++  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(filename));
+ 
+@@ -107,8 +107,8 @@
+ 
+ TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
+ 
+-  pb::tagreader::Message message;
+-  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
++  spb::tagreader::Message message;
++  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
+ 
+   req->set_filename(DataCommaSizeFromQString(filename));
+ 
+diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
+--- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
++++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
+@@ -44,7 +44,7 @@
+  public:
+   explicit TagReaderClient(QObject *parent = nullptr);
+ 
+-  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
++  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
+   typedef HandlerType::ReplyType ReplyType;
+ 
+   static const char *kWorkerExecutableName;
+@@ -78,7 +78,7 @@
+   static TagReaderClient *sInstance;
+ 
+   WorkerPool<HandlerType> *worker_pool_;
+-  QList<pb::tagreader::Message> message_queue_;
++  QList<spb::tagreader::Message> message_queue_;
+   QThread *original_thread_;
+ };
+ 
+diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
+--- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
++++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
+@@ -44,7 +44,7 @@
+   static Song ReadSongFromFile(const QString& filename) {
+     TagReader tag_reader;
+     Song song;
+-    ::pb::tagreader::SongMetadata pb_song;
++    ::spb::tagreader::SongMetadata pb_song;
+ 
+     // We need to init protobuf object from a Song object, to have default values initialized correctly.
+     song.ToProtobuf(&pb_song);
+@@ -55,7 +55,7 @@
+ 
+   static void WriteSongToFile(const Song& song, const QString& filename) {
+     TagReader tag_reader;
+-    ::pb::tagreader::SongMetadata pb_song;
++    ::spb::tagreader::SongMetadata pb_song;
+     song.ToProtobuf(&pb_song);
+     tag_reader.SaveFile(filename, pb_song);
+   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 9693ec2f4ba8..2621799c3421 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.3
-revision=2
+version=0.8.4
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
@@ -15,4 +15,4 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=838238d43cdeaa63cf920e09b8d51507be75fa0ab0252c5e0a3a34eb18ba1c90
+checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b

From 430db346db68005d4ca0df130091f1b352b48ebe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:50 -0500
Subject: [PATCH 1936/3458] sysdig: revbump for protobuf26

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

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d25..68299848713b 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

From c5715fd53ac3a0ee95631bc8db1c6ec69ea4ae2b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:50 -0500
Subject: [PATCH 1937/3458] usbguard: revbump for protobuf26

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

diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index f2259087eb98..3bf73f4a8677 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
 # Template file for 'usbguard'
 pkgname=usbguard
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
 conf_files="/etc/usbguard/*"

From 28da8eb66e57b5d7dbbfdc830feb5f9d9bb533a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:50 -0500
Subject: [PATCH 1938/3458] vlc: revbump for protobuf26

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

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index fe29870ac996..59b55648245f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.12
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread

From fa8d42cb1662ee0b708400f21b343f49ffb56cc7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 19 Feb 2021 09:08:50 -0500
Subject: [PATCH 1939/3458] zbackup: revbump for protobuf26

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

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf5..a8573d40b77c 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,7 +1,7 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=20
+revision=21
 build_style=cmake
 hostmakedepends="protobuf"
 makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"

From 87ab052b86e8b945656963e653c98dfb6d6a0b4d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 19 Feb 2021 19:38:59 +0300
Subject: [PATCH 1940/3458] cointop: update to 1.6.2

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

diff --git a/srcpkgs/cointop/template b/srcpkgs/cointop/template
index 87ce490415b5..af44c8f1c910 100644
--- a/srcpkgs/cointop/template
+++ b/srcpkgs/cointop/template
@@ -1,6 +1,6 @@
 # Template file for 'cointop'
 pkgname=cointop
-version=1.6.0
+version=1.6.2
 revision=1
 build_style=go
 go_import_path="github.com/miguelmota/${pkgname}"
@@ -9,4 +9,4 @@ maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/miguelmota/cointop"
 distfiles="https://github.com/miguelmota/cointop/archive/v${version}.tar.gz"
-checksum=42f007173b2d0fc61d6364da6bfc53da5cb3a4f8288cc8bfffd53964a96fd8c2
+checksum=1dad6400ea342db7a5915065788a4177221269a12ba1669bed50cdee9c97dd64

From af569059932be5fcb6cba4955154d242fc009689 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 20 Feb 2021 17:23:20 +0300
Subject: [PATCH 1941/3458] grub-btrfs-runit: use posix shell for the service

---
 srcpkgs/grub-btrfs/files/grub-btrfs/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/run b/srcpkgs/grub-btrfs/files/grub-btrfs/run
index 3ee376330278..ce2d930b26e8 100755
--- a/srcpkgs/grub-btrfs/files/grub-btrfs/run
+++ b/srcpkgs/grub-btrfs/files/grub-btrfs/run
@@ -5,7 +5,7 @@ exec 2>&1
 
 if [ -d "${SNAPSHOTS_PATH}" ]
 then
-	exec wendy ${OPTS} -m 960 -w "${SNAPSHOTS_PATH}" bash -c \
+	exec wendy ${OPTS} -m 960 -w "${SNAPSHOTS_PATH}" sh -c \
 	 'if [ -s "/boot/grub/grub-btrfs.cfg" ]; then /etc/grub.d/41_snapshots-btrfs; else update-grub; fi'
 else
   exit 1

From 5453236163b220a69e92b25f686937b550475d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 20 Feb 2021 17:04:59 +0100
Subject: [PATCH 1942/3458] projectM: remove wrong #include "Intrinsics.h"

Try to fix the build of dependencies by removing an obviously wrong
include from Common.hpp
---
 srcpkgs/projectM/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index ac15d2a7a758..534823f1834a 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,7 +1,7 @@
 # Template file for 'projectM'
 pkgname=projectM
 version=3.1.11
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--datadir=/usr/libexec --enable-qt --enable-pulseaudio
@@ -27,6 +27,8 @@ post_install() {
 	# fix location of desktop files
 	vmkdir usr/share
 	mv $DESTDIR/usr/libexec/{applications,icons} $DESTDIR/usr/share
+	vsed -i $DESTDIR/usr/include/libprojectM/Common.hpp \
+		-e '/#include "Intrinsics.h"/d'
 }
 
 projectM-devel_package() {

From f7d890b618db2d57abef2de10ea67dc1b77f6317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 20 Feb 2021 18:12:52 +0100
Subject: [PATCH 1943/3458] qmmp: revbump for projectM-3.1.11

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

diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index 3757bed23eb0..8988affd2836 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
 # Template file for 'qmmp'
 pkgname=qmmp
 version=1.4.4
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"

From d7991963844e7615d0e71b8f0e24f3b04b165d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 20 Feb 2021 16:56:46 +0100
Subject: [PATCH 1944/3458] exiftool: update to 12.19.

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

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 4b3e06ad4eab..99b22bf5cb6b 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.18
+version=12.19
 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=56814e537652d2d0f84bd891a8f3ab5f9f5a47743ef58cd0a18a1f9a02fc3404
+checksum=0243027f1086ca810b4510356cc90e969ae3779025f4e2eff844c425ba952176

From 76d81818591d5e2bb15b3cc43f462f4864bbbea9 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 19 Feb 2021 21:04:06 +0100
Subject: [PATCH 1945/3458] detox: update to 1.4.1.

---
 ...etox-1.2.0.fix-invalid-memory-access.patch | 23 -------------------
 srcpkgs/detox/template                        |  4 ++--
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/detox/patches/detox-1.2.0.fix-invalid-memory-access.patch

diff --git a/srcpkgs/detox/patches/detox-1.2.0.fix-invalid-memory-access.patch b/srcpkgs/detox/patches/detox-1.2.0.fix-invalid-memory-access.patch
deleted file mode 100644
index df6f7f8a82fb..000000000000
--- a/srcpkgs/detox/patches/detox-1.2.0.fix-invalid-memory-access.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/parse_options.c.dt
-+++ src/parse_options.c
-@@ -178,15 +178,17 @@ struct detox_options *parse_options_geto
- 	main_options->files = malloc(sizeof(char *) * 10);
- 
- 	i = 0;
--	max = 0;
-+	max = 10;
- 
- 	if (optind < argc) {
- 		while (optind < argc) {
--			main_options->files[i++] = strdup(argv[optind]);
--			if (i > max) {
-+                        /* not enough space for the next file and
-+                           possible ending NULL -> realloc */
-+			if (i + 2 > max) {
- 				main_options->files = realloc(main_options->files, sizeof(char *) * (10 + max));
- 				max += 10;
- 			}
-+			main_options->files[i++] = strdup(argv[optind]);
- 
- 			optind++;
- 		}
diff --git a/srcpkgs/detox/template b/srcpkgs/detox/template
index 6d02ea19904b..dd21cdc36276 100644
--- a/srcpkgs/detox/template
+++ b/srcpkgs/detox/template
@@ -1,6 +1,6 @@
 # Template file for 'detox'
 pkgname=detox
-version=1.3.3
+version=1.4.1
 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=d57b6b8909046e66e2d992c126aba59c350d8aebfae55937397ef0b88abb4ae0
+checksum=fd71aa31abc82b1ec8b7ce996cd70062939e9c165b106f395beced3706c5ea17
 
 pre_configure() {
 	autoreconf --install

From 24c5127515a43d610e0d79888e1d9b0522470e66 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Fri, 19 Feb 2021 19:41:38 -0600
Subject: [PATCH 1946/3458] python3-aniso8601: update to 9.0.0.

---
 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 436adeedfa94..6b820944a6eb 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.1
+version=9.0.0
 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=be08b19c19ca527af722f2d4ba4dc569db292ec96f7de963746df4bb0bff9250
+checksum=1c38967317cf761d2ccd908a9d4b654eace289d7bddfb586594e85911956af86
 
 post_install() {
 	vlicense LICENSE

From 0bbfe122d7b09c160ab8cf0a5ed5e9ee341a23f7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 20 Feb 2021 12:02:51 -0600
Subject: [PATCH 1947/3458] ytmdl: add missing dependency

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

diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index 75602d5c3a95..500686b1e46a 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,14 +1,15 @@
 # Template file for 'ytmdl'
 pkgname=ytmdl
 version=2021.01.14
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 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-rich python3-musicbrainzngs"
+ python3-pyDes python3-simber python3-rich python3-musicbrainzngs
+ python3-typing_extensions"
 short_desc="Get songs from youtube in mp3 format with all tags from itunes"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 4faf6d3afc592ee089d0b33141a86e77efa59dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 20 Feb 2021 16:35:31 +0100
Subject: [PATCH 1948/3458] doomretro: update to 4.0.3.

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

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 529bc1b5eacc..7f9c8350e3f9 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.0.2
+version=4.0.3
 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=17e808ace40291d08d1c65f387bd82e5964aa14429ec5ce90356ac8d80c6b45f
+checksum=0c356204285479db8989139639e1dd16c1116a804fa5e320fe1f669084c820d7

From 18fcbef55f9fec5a7f0117a3c20a7723b225d898 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 20 Feb 2021 11:57:09 -0600
Subject: [PATCH 1949/3458] python3-Ropper: update to 1.13.6.

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

diff --git a/srcpkgs/python3-Ropper/template b/srcpkgs/python3-Ropper/template
index 88f5b4523e0f..59cab9a85e42 100644
--- a/srcpkgs/python3-Ropper/template
+++ b/srcpkgs/python3-Ropper/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-Ropper'
 pkgname=python3-Ropper
-version=1.13.5
-revision=2
+version=1.13.6
+revision=1
 wrksrc="Ropper-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="capstone-python3 python3-filebytes keystone-python3"
+checkdepends="python3-pytest $depends"
 short_desc="Find gadgets to build rop chains for different architectures"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://scoding.de/ropper/"
 distfiles="https://github.com/sashs/Ropper/archive/v${version}.tar.gz"
-checksum=b32329495645a6e0a8c1b2c4f4e330295a05b82eb8a5965051ad5c73e89bf371
+checksum=a897597e323b3a83820db7e8ced386c398990cec99d67373eb83e8eafe4ff126
 
 post_install() {
 	vlicense COPYING

From 3ba0ae7c6e610d539f7fcd2965bef6975d709beb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 20 Feb 2021 12:55:06 -0600
Subject: [PATCH 1950/3458] New package: python3-commonmark-0.9.1

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

diff --git a/srcpkgs/python3-commonmark/template b/srcpkgs/python3-commonmark/template
new file mode 100644
index 000000000000..e09637ce8bb1
--- /dev/null
+++ b/srcpkgs/python3-commonmark/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-commonmark'
+pkgname=python3-commonmark
+version=0.9.1
+revision=1
+wrksrc="commonmark-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+checkdepends="python3-wheel python3-flake8 python3-hypothesis python3-colorama"
+short_desc="Parser for the CommonMark Markdown spec"
+maintainer="Andrew Benson <abenson@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/rtfd/commonmark.py"
+distfiles="${PYPI_SITE}/c/commonmark/commonmark-${version}.tar.gz"
+checksum=452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60
+
+post_extract() {
+	vsed -i commonmark/tests/run_spec_tests.py -e \
+	 "/^import sys$/a sys.path.append('$wrksrc/build/lib')"
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 7a6ed17b562d06a6b6eed6bf5b628819e8bd3aa5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 20 Feb 2021 11:58:59 -0600
Subject: [PATCH 1951/3458] python3-rich: update to 9.11.0.

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

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 5bc8426f438f..3d1ce246e4fc 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,16 +1,19 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=9.10.0
+version=9.11.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
+depends="python3-typing_extensions python3-Pygments python3-commonmark
+ python3-colorama"
+checkdepends="python3-wheel $depends"
 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=e0f2db62a52536ee32f6f584a47536465872cae2b94887cf1f080fb9eaa13eb2
+checksum=f8f08fdac6bd67dc2dd7fe976da702d748487aa9eb5d050c48b2321bc67ed659
 
 post_install() {
 	vlicense LICENSE

From 4405ea27b988063cdb0ea532b9ab3e9378767713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 16:12:01 -0300
Subject: [PATCH 1952/3458] spotifyd: fix runtime crash.

Issue in unsafe code led to a runtime panic if compiled with Rust 1.48
or newer.

Relevant information: https://github.com/Spotifyd/spotifyd/issues/719

Fixes #28285
---
 srcpkgs/spotifyd/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b1..d805510b9af1 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,7 +1,7 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
@@ -35,6 +35,10 @@ case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="https://travis-ci.org/void-linux/void-packages/jobs/636076091" ;;
 esac
 
+post_patch() {
+	vsed -e 's/"with-tremor"//' -i Cargo.toml
+}
+
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.58
 }

From a18fe341aee512f27e1eb5d20e905123cf53a8b4 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 20 Feb 2021 14:47:23 +0300
Subject: [PATCH 1953/3458] trackma: update to 0.8.4

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

diff --git a/srcpkgs/trackma/template b/srcpkgs/trackma/template
index bfa1215b46c5..84105421496f 100644
--- a/srcpkgs/trackma/template
+++ b/srcpkgs/trackma/template
@@ -1,7 +1,7 @@
 # Template file for 'trackma'
 pkgname=trackma
-version=0.8.2
-revision=2
+version=0.8.4
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-urwid python3-gobject"
@@ -10,4 +10,6 @@ maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"
 homepage="http://z411.github.com/trackma"
 distfiles="https://github.com/z411/trackma/archive/v${version}.tar.gz"
-checksum=89e693a39cbbb7d31bf169bd272353c7c3dab2cfc4e5609347d66f88f3ba35ee
+checksum=a718d3ffa175bb66ab105af6df508def2a76fe717f2be4cf2f768279e43a2aaa
+# There is no test to run
+make_check=no

From bcfdb8ce1ddbab00d616077429819a7f33c8a61a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 20 Feb 2021 17:16:02 +0100
Subject: [PATCH 1954/3458] wireguard-dkms: update to 1.0.20210219.

---
 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 59f04c3fe2c7..48b237c45378 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.20210124
+version=1.0.20210219
 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=dac6e68cd4c3db441499850dfa8a70706384a3295f37fda1b839a50b79faef54
+checksum=99d35296b8d847a0d4db97a4dda96b464311a6354e75fe0bef6e7c4578690f00
 
 dkms_modules="wireguard ${version}"
 

From 7f9b04d34ebaba6013fda0981b04dbe8992cbb2b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 20 Feb 2021 17:16:36 +0100
Subject: [PATCH 1955/3458] python3-pyinfra: update to 1.3.6.

---
 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 d70ca72f0ccd..2ff205a56913 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.5
+version=1.3.6
 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=c9081d3c640994cc3efdc5a7ebcfcc9073801beb4e060971014d81c07b4dd04a
+checksum=3c453222a1f35b82fde7628de341616eb4312d0b12346ad5bde034556989d0e3
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 09a8859a37465f06afeb0e0c9dc8f84f42b122f6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 20 Feb 2021 17:18:55 +0100
Subject: [PATCH 1956/3458] ipset: update to 7.11.

---
 srcpkgs/ipset/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index aa0a5c7aa15a..7562fd6fe2ec 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.10
+version=7.11
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -9,9 +9,10 @@ makedepends="libmnl-devel"
 short_desc="Administration tool for IP sets"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
-homepage="http://ipset.netfilter.org/"
-distfiles="${homepage}${pkgname}-${version}.tar.bz2"
-checksum=b24906ba43e2fe322bd41863476761d749a4bddf5ce4c2265ba04b03bc7e9cf6
+homepage="https://ipset.netfilter.org/"
+changelog="https://ipset.netfilter.org/changelog.html"
+distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
+checksum=3151baad30f1d9e317b2ab4f2f5aa7a9f7b4dc11fcf8fe73acd0dc0b5dbabf7d
 
 libipset_package() {
 	short_desc+=" - library files"

From 4327990c2954920a0bf433b9a841b6cc40136eeb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 20 Feb 2021 18:13:38 +0100
Subject: [PATCH 1957/3458] erlang: update to 23.2.5.

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d5..e8d536f6888a 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.2.4
+version=23.2.5
 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=e72aa084907e0f34f932cf00caa33aba93147b0a7c9c35569d6bd1c402f532de
+checksum=00587a60bc97a26060265b201f69dd7059ddd04506f6502e8e78c5f00e1b1db7
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From b12b264a3f0adefc1f92c6fb91719505eb574039 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 20 Feb 2021 21:58:51 +0100
Subject: [PATCH 1958/3458] xtools: update to 0.63.

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

diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index f6b143d8aba1..a9e48dc39cba 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,6 +1,6 @@
 # Template file for 'xtools'
 pkgname=xtools
-version=0.62
+version=0.63
 revision=1
 build_style=gnu-makefile
 depends="bash curl findutils git make spdx-licenses-list xbps"
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://git.vuxu.org/xtools"
 distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
-checksum=befbe27f4b8091f04ab79024b76c0bad15f86a5f5e6f3624648d633b854696df
+checksum=6bc49a536488f3e911317a31f916df9f6778d34685db6aa2d7bd75be07f12995

From a09e7b184715c047d36072d2cac722d333e00114 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 20 Feb 2021 22:03:54 +0100
Subject: [PATCH 1959/3458] git-series: fix build.

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

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 078b691b0cd1..8898e0621db0 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=11
+revision=12
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -12,11 +12,11 @@ license="MIT"
 homepage="https://github.com/git-series/git-series"
 distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
-broken="No longer builds with current Rust (broken url crate)"
 
 post_extract() {
 	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
+	cargo update --package url --precise 1.7.2
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From e808175be89253525ce7be524e51fe88ce6a1991 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 20 Feb 2021 21:49:33 +0000
Subject: [PATCH 1960/3458] terraform: update to 0.14.7.

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

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 1c0eb78a2bc1..b6c3a4e641ec 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.14.6
+version=0.14.7
 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=84b10f2944a5074b3d42fe1c378f2228cb9451691edf46a7870706d5a8b2749c
+checksum=8d411d067d35660f7e2622dacb5be87e108929321b6732c6770ec89ebe07231d

From ad96a042fa54c6e9ac8ab64aed6a88671b7aea37 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 20 Feb 2021 21:53:41 +0000
Subject: [PATCH 1961/3458] terragrunt: update to 0.28.7.

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

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index f8fb232a5c37..45f0b1a575b8 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.28.4
+version=0.28.7
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -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=8ad4fa6e9e9c075a8a04f76117a6ab05a062cd6fe0fd0ed1c23937c7ec272839
+checksum=e84d4ade9ffbc1ca9e0a2b9cf594915a9515d331cfcc65f78b6c36b0cb3b53cc
 
 post_install() {
 	vlicense LICENSE.txt

From 775e5a28a5b95b20d0648a4581d08e078ce45e9c Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 20 Feb 2021 21:56:06 +0000
Subject: [PATCH 1962/3458] packer: update to 1.7.0.

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

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 018c81b5b063..c240a0917d27 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,6 +1,6 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.6.6
+version=1.7.0
 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=76b2108fce383b558717ce42a23b8bce5f7ab81d7cc64d18a5746d87e0454e43
+checksum=9235d5938a055a647b01041c3509b525e038e5bab76147155fcd3fd256f2bafe
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 2ea11ecfcd6b09e13d217b93e947a5ca4a9644e2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 20 Feb 2021 22:03:13 +0000
Subject: [PATCH 1963/3458] git-cola: update to 3.9.

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

diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index e6e7defeab0d..b3d07018934c 100644
--- a/srcpkgs/git-cola/template
+++ b/srcpkgs/git-cola/template
@@ -1,6 +1,6 @@
 # Template file for 'git-cola'
 pkgname=git-cola
-version=3.8
+version=3.9
 revision=1
 build_style=python3-module
 pycompile_dirs="usr/share/git-cola/lib"
@@ -11,4 +11,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-only"
 homepage="https://git-cola.github.io/"
 distfiles="https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"
-checksum=ea482ca32fe142ddba500d2edf3a05f11e31cf193e5d7a944f3fe28c9ab123d4
+checksum=66b62f479ad141322351d62aff76e4882719d08f8f29b35f97d30f355391a54e

From 8699902a604cfbac9aa7ba829695687fb877db25 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 20 Feb 2021 22:04:22 +0000
Subject: [PATCH 1964/3458] diff-pdf: update to 0.5.

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

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 4ab2c9086375..520c2c24e8ba 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
-version=0.4.1
+version=0.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="http://vslavik.github.io/diff-pdf/"
 distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
-checksum=7d4a7f07edc767943edc7f5ea85d1dbaeb75a7760f9f585aba43e4e59aa29bd5
+checksum=0648a8c07127dbf3eed4b0856d1042987b9da9a96dc86ebee62e988af13e4475
 
 pre_configure() {
 	./bootstrap

From f5c9f173a769b688c8c74be0ac0958a7f9b58622 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 20 Feb 2021 22:06:28 +0000
Subject: [PATCH 1965/3458] bitlbee-facebook: update to 1.2.2.

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

diff --git a/srcpkgs/bitlbee-facebook/template b/srcpkgs/bitlbee-facebook/template
index cbdd2398e825..e86bfc0f8ffc 100644
--- a/srcpkgs/bitlbee-facebook/template
+++ b/srcpkgs/bitlbee-facebook/template
@@ -1,6 +1,6 @@
 # Template file for 'bitlbee-facebook'
 pkgname=bitlbee-facebook
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="libtool automake pkg-config glib-devel"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/bitlbee/bitlbee-facebook"
 distfiles="${homepage}/archive/v$version.tar.gz"
-checksum=a5f0a4ce66c682015bc3f9ff2c10e1148f9e3a127f223e6b363e3344dffa238b
+checksum=834297cb2472765e5f31ca0ed64b712b0ca9b7b705409c5454cab891414c4265
 
 pre_configure() {
 	autoreconf -fi

From a3fb8a4553c878918c0132390cd914beed07c43a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 17:12:10 -0500
Subject: [PATCH 1966/3458] shotcut: update to 21.01.29.

---
 srcpkgs/shotcut/patches/QPainterPath.patch | 10 ----------
 srcpkgs/shotcut/patches/melt.patch         | 13 -------------
 srcpkgs/shotcut/template                   | 12 ++++++------
 3 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/shotcut/patches/QPainterPath.patch
 delete mode 100644 srcpkgs/shotcut/patches/melt.patch

diff --git a/srcpkgs/shotcut/patches/QPainterPath.patch b/srcpkgs/shotcut/patches/QPainterPath.patch
deleted file mode 100644
index 29af4672afd8..000000000000
--- a/srcpkgs/shotcut/patches/QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/widgets/scopes/videohistogramscopewidget.cpp	2020-04-12 01:09:54.000000000 +0200
-+++ src/widgets/scopes/videohistogramscopewidget.cpp	2020-09-02 13:05:57.515210925 +0200
-@@ -19,6 +19,7 @@
- #include <Logger.h>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QToolTip>
- 
- const qreal IRE0 = 16;
diff --git a/srcpkgs/shotcut/patches/melt.patch b/srcpkgs/shotcut/patches/melt.patch
deleted file mode 100644
index 8e98e7a27f5b..000000000000
--- a/srcpkgs/shotcut/patches/melt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/jobs/meltjob.cpp b/src/jobs/meltjob.cpp
-index f5390e4..693a089 100644
---- src/jobs/meltjob.cpp
-+++ src/jobs/meltjob.cpp
-@@ -50,7 +50,7 @@ void MeltJob::start()
- #ifdef Q_OS_WIN
-     QFileInfo meltPath(shotcutPath, "qmelt.exe");
- #else
--    QFileInfo meltPath(shotcutPath, "qmelt");
-+    QFileInfo meltPath(shotcutPath, "melt");
- #endif
-     setReadChannel(QProcess::StandardError);
-     QStringList args;
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index 5d746cd229ca..dab37cf9ed5f 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -1,21 +1,21 @@
 # Template file for 'shotcut'
 pkgname=shotcut
-version=20.04.12
+version=21.01.29
 revision=1
 build_style=qmake
 configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
 hostmakedepends="pkg-config qt5-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt-devel mlt-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
- qt5-quickcontrols qt5-webkit-devel qt5-websockets-devel qt5-x11extras-devel
- x264-devel"
-depends="frei0r-plugins qt5-quickcontrols qt5-graphicaleffects"
+ qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
+ qt5-x11extras-devel x264-devel"
+depends="frei0r-plugins qt5-graphicaleffects"
 short_desc="Free, open source, cross-platform video editor"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.shotcut.org"
 distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"
-checksum=c7b8df40e57800667c7ffa65faf6e9d3076af19029eb57327283cc75bb29c194
+checksum=2e55e36d95344758f220b081b1f25f90eb3d0131b0a4af9d65871798079ee961
 
 CXXFLAGS="-DHAVE_LOCALE_H=1"
 
@@ -28,5 +28,5 @@ post_configure() {
 	cd translations
 	qmake-qt5 PREFIX=/usr
 	cd ${wrksrc}
-	sed -i -e 's/^LINK/override LINK/g' translations/Makefile
+	vsed -i -e 's/^LINK/override LINK/g' translations/Makefile
 }

From f8a7422b1320d5410f93fd0389afd52c16449aa3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 17:16:20 -0500
Subject: [PATCH 1967/3458] Revert "libArcus: update to 4.8.0."

The cura/cura-engine/libArcus v4.8.0 toolchain requires some additional
dependencies that are not yet packaged, so go back to a working version
until everything is in order.

This reverts commit 843ef3e34232d5fb4da4b2ce96bea92ddc7137aa.
---
 srcpkgs/libArcus/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 9f82e09d2ed6..b7a5b0f92677 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,8 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.8.0
-revision=1
+reverts=4.8.0_1
+version=4.7.1
+revision=4
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -12,7 +13,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libArcus"
 distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=f5a7234506c89a36adccdab2a3c410a75aaaa9e7c7f9533db834881c59001677
+checksum=ba35ebecf4112ccfbe2b493c0e10e0276e85e0d449ce82cfa7590165b801facf
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 77d5d6ccf00b0ae70a89573d0415a94baa1daf15 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 17:18:19 -0500
Subject: [PATCH 1968/3458] Revert "cura-engine: update to 4.8.0."

The cura/cura-engine/libArcus v4.8.0 toolchain requires some additional
dependencies that are not yet packaged, so go back to a working version
until everything is in order.

This reverts commit 4e1bfd24f041278d006f9bf03eb1ce39e9df151d.
---
 srcpkgs/cura-engine/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 5760846a2d21..439810c1a08f 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,8 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.8.0
-revision=1
+reverts=4.8.0_1
+version=4.7.1
+revision=3
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -12,7 +13,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/CuraEngine"
 distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=752977fbe48653743b9f1a6e25e6d1f061513b7cf1cd4f0105b233595e8a15ff
+checksum=7e1e408f269a604418f37575ba8ef5f69323bebc4dd7f3091c1c2e9b000ffcbf
 
 post_install() {
 	vlicense LICENSE

From f1d37b93a84f36453cc0bf7a04695380545c836e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 17:19:21 -0500
Subject: [PATCH 1969/3458] Revert "cura: update to 4.8.0."

The cura/cura-engine/libArcus v4.8.0 toolchain requires some additional
dependencies that are not yet packaged, so go back to a working version
until everything is in order.

This reverts commit 927081cd8db258b8e4d0e0b7aab37b04dfa0ac5d.
---
 srcpkgs/cura/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 8ab7664381b3..de6e6cf20e19 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,8 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.8.0
-revision=1
+reverts=4.8.0_1
+version=4.7.1
+revision=3
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}
@@ -16,4 +17,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Cura"
 distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=3f59a53f9d5ba820153401f5f2e9921be843df7677ef4d2b3316bfd08a402cc2
+checksum=1c09552de062ffbe0b2715e983e82c1ac9582aaaa649abfd27c7f82ff59fcf94

From 525107efab816cdd2d7e12bf41a7718572c634cf 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, 20 Feb 2021 17:14:29 +0700
Subject: [PATCH 1970/3458] libtool: stop put /usr/lib{32,64} into RPATH

libtool will insert RPATH if $libdir not in sys_lib_dlsearch_path_spec.
libtool's configure will parse /etc/ld.so.conf for this value.

Without this change the original value is:

- glibc: /lib /usr/lib /usr/lib32 /usr/local/lib
- musl: /lib /usr/lib
---
 common/build-style/gnu-configure.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh
index 177dd22c4d1f..8121136cd121 100644
--- a/common/build-style/gnu-configure.sh
+++ b/common/build-style/gnu-configure.sh
@@ -4,12 +4,14 @@
 do_configure() {
 	: ${configure_script:=./configure}
 
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
 	${configure_script} ${configure_args}
 }
 
 do_build() {
 	: ${make_cmd:=make}
 
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
 }
 

From 52053cba9b00f35d3cdf3003facf5390d4170f31 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, 20 Feb 2021 13:23:09 +0700
Subject: [PATCH 1971/3458] ttfautohint: fix cross-build & rpath

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

diff --git a/srcpkgs/ttfautohint/template b/srcpkgs/ttfautohint/template
index 496ddeb92bb6..6096ec06eb44 100644
--- a/srcpkgs/ttfautohint/template
+++ b/srcpkgs/ttfautohint/template
@@ -3,7 +3,8 @@ pkgname=ttfautohint
 version=1.8.3
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+build_helper=qmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake perl"
 makedepends="freetype-devel harfbuzz-devel qt5-devel"
 short_desc="Tools for automated hinting process and finely hand-hinting"
 maintainer="Renato Aguiar <renato@renag.me>"
@@ -11,7 +12,3 @@ license="GPL-2.0-only"
 homepage="https://www.freetype.org/ttfautohint/"
 distfiles="http://download.savannah.gnu.org/releases/freetype/ttfautohint-${version}.tar.gz"
 checksum=87bb4932571ad57536a7cc20b31fd15bc68cb5429977eb43d903fa61617cf87e
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi

From 4ab26a38d835c08059f908832aa0a9ab8cd79341 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, 21 Feb 2021 07:50:37 +0700
Subject: [PATCH 1972/3458] libtool: stop put /usr/lib{32,64} into RPATH

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

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index d8533aac5b6e..b9972df70341 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.6
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz"
 depends="tar sed"

From e97498ae2675fed16c467c6c8c4803f5bad211f5 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 07:06:31 +0700
Subject: [PATCH 1973/3458] sword: build shared lib

---
 common/shlibs          |  1 +
 srcpkgs/libsword       |  1 +
 srcpkgs/sword/template | 19 ++++++++++++-------
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/libsword

diff --git a/common/shlibs b/common/shlibs
index ce0e74cc74e3..eae36d09d1eb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3916,3 +3916,4 @@ 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
+libsword-1.8.1.so libsword-1.8.1_6
diff --git a/srcpkgs/libsword b/srcpkgs/libsword
new file mode 120000
index 000000000000..fec9ffa97fe4
--- /dev/null
+++ b/srcpkgs/libsword
@@ -0,0 +1 @@
+sword
\ No newline at end of file
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index bb2999aa0ed2..13240a993160 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,16 +1,14 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=5
+revision=6
 build_style=gnu-configure
-configure_args="--prefix=/usr --libdir=/usr/lib --without-conf
- --disable-shared --with-icuregex"
+configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
 makedepends="icu-devel clucene-devel libcurl-devel zlib-devel"
-conf_files="/etc/sword.conf"
 short_desc="CrossWire Bible Society's free Bible software project"
 maintainer="Dan Arnfield <dan@arnfield.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://crosswire.org/sword/index.jsp"
 distfiles="https://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-${version}.tar.gz"
 checksum=ce9aa8f721a737f406115d35ff438bd07c829fce1605f0d6dcdabc4318bc5e93
@@ -21,8 +19,14 @@ pre_configure() {
 	./autogen.sh
 }
 
-post_install() {
-	vconf ${FILESDIR}/sword.conf
+libsword_package() {
+	conf_files="/etc/sword.conf"
+	short_desc+=" - libraries"
+	pkg_install() {
+		vconf ${FILESDIR}/sword.conf
+		vmove "usr/lib/libsword-*.so"
+		vmove usr/share
+	}
 }
 
 sword-devel_package() {
@@ -32,5 +36,6 @@ sword-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/libsword.so"
 	}
 }

From 4c0f7232c01a6d902d52723d2638f2c004122921 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 07:49:18 +0700
Subject: [PATCH 1974/3458] bibletime: rebuild with shared sword

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

diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index 5551952adaaa..224881c45516 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -4,7 +4,7 @@
 # to start.
 pkgname=bibletime
 version=3.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl
  -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl"

From d1bff25b27577ca66d2a3e7362c9b7a38bbb3b6a 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:09:48 +0700
Subject: [PATCH 1975/3458] pari: update to 2.13.1.

---
 srcpkgs/pari/template | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index fddb1dfcd5e0..8e2a415913ba 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,6 +1,6 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.0
+version=2.13.1
 revision=1
 build_style=configure
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=c811946de9d2c1ed0e97ff08e80d966f9a0b55848b7688406fab229e3948ba93
+checksum=81ecf7d70ccdaae230165cff627c9ce2ec297b8f22f9f40742279d85f86dfcb1
 
 build_options="x11"
 build_options_default="x11"
@@ -33,15 +33,12 @@ post_patch() {
 	#!/bin/sh
 	echo "${XBPS_TARGET_MACHINE%-musl}-linux"
 	EOF
+
+	# No RPATH please
+	vsed -i -e '/runpathprefix=/s/=.*/=/' config/get_ld
 }
 
 pre_configure() {
-	local _date
-	# Reproducibility
-	# date's wrapper is not available in do_patch
-	_date=$(date +"%b %d %Y")
-	vsed -i -e "s/__DATE__/\"$_date\"/" src/language/paricfg.c
-
 	export LD="$CC"
 	if [ "$CROSS_BUILD" ]; then
 		export RUNTEST="/usr/bin/qemu-$XBPS_TARGET_QEMU_MACHINE-static"

From 938b73550269bd8a55a885b97f22dbb4d8ca8f78 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, 17 Feb 2021 18:22:49 +0700
Subject: [PATCH 1976/3458] vsed: stop collapsing whitespace

MCVE:
	printf '%s  %s\n' a b >afile
	vsed -i -e '/a  b/d' afile

Expect:
- afile should be empty
Actual:
- afile is not empty
---
 common/environment/setup/vsed.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/vsed.sh b/common/environment/setup/vsed.sh
index 092253696cde..5b5bf427c239 100644
--- a/common/environment/setup/vsed.sh
+++ b/common/environment/setup/vsed.sh
@@ -8,7 +8,7 @@
 vsed() {
 	local files=() regexes=() OPTIND OPTSTRING="ie:" has_inline=
 
-	eval set -- $(getopt -s bash "$OPTSTRING" "$@");
+	eval set -- "$(getopt -s bash "$OPTSTRING" "$@")";
 
 	while getopts "$OPTSTRING" opt; do
 		case $opt in

From 8d2148fe63da433bb87afac20fa44b3d16f27fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sat, 20 Feb 2021 21:05:16 +0100
Subject: [PATCH 1977/3458] miniserve: update to 0.10.4

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

diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template
index ec4801b0354c..e9c93967478a 100644
--- a/srcpkgs/miniserve/template
+++ b/srcpkgs/miniserve/template
@@ -1,6 +1,6 @@
 # Template file for 'miniserve'
 pkgname=miniserve
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=cargo
 short_desc="CLI tool to serve files and dirs over HTTP"
@@ -8,7 +8,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/svenstaro/miniserve"
 distfiles="https://github.com/svenstaro/miniserve/archive/v${version}.tar.gz"
-checksum=315f8a96253f831100b13584d6d89207d9fd2a7b53823cea5a1a4e3e84d39593
+checksum=03b8549258deb17759d69ad73047429f8420e3eab7588af086caf14e47c96332
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From e211594c2b42087c1e801e99f0d588dbbdd488e9 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Sat, 20 Feb 2021 19:57:28 +0000
Subject: [PATCH 1978/3458] mousepad: update to 0.5.2.

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

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index b774f2e77430..7f8dec12f036 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,7 +1,7 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.1
-revision=2
+version=0.5.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3d2e277b1ae82dd0f0fa25e27169491fc38c2b70a9a624f2ea472604b317a582
+checksum=30adc5631a4e551df7b3e17ddc1d10e9980080f96518dedccc32170cb18efb8e

From 11debb0a71253fc72be9c656750900328dabf6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 20 Feb 2021 22:22:12 +0100
Subject: [PATCH 1979/3458] restic: update to 0.12.0.

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

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index c7abb19acd36..a0d55c41cae9 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.11.0
+version=0.12.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=73cf434ec93e2e20aa3d593dc5eacb221a71d5ae0943ca59bdffedeaf238a9c6
+checksum=39b615a36a5082209a049cce188f0654c6435f0bc4178b7663672334594f10fe
 
 post_install() {
 	vlicense LICENSE

From 92265822b71a7096701265e22ef4458154846ec8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 20 Feb 2021 11:06:43 +0100
Subject: [PATCH 1980/3458] skim: update to 0.9.4

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

diff --git a/srcpkgs/skim/template b/srcpkgs/skim/template
index 5a60b85b489c..f01073fe210f 100644
--- a/srcpkgs/skim/template
+++ b/srcpkgs/skim/template
@@ -1,6 +1,6 @@
 # Template file for 'skim'
 pkgname=skim
-version=0.9.3
+version=0.9.4
 revision=1
 build_style=cargo
 short_desc="Fuzzy Finder in rust"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/lotabout/skim"
 distfiles="https://github.com/lotabout/skim/archive/v${version}.tar.gz"
-checksum=c4eea49ae3b22896d9d671e4ffa95614e4bed4fa996882b94738490bce863926
+checksum=5ec639c34c7657be4f7f990e9ad0d8d0a7a979eba68daa7c100126ce06702a1b
 
 post_install() {
 	vbin bin/sk-tmux

From cdf9784f6322e2a8a510e13391c2bd43ac6528c1 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Sat, 20 Feb 2021 10:55:26 +0100
Subject: [PATCH 1981/3458] stockfish: update to 13

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

diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index 99d3e95e6f56..1749c9c3692d 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,8 +1,8 @@
 # Template file for 'stockfish'
 pkgname=stockfish
-version=12
-revision=2
-_net_file=nn-82215d0fd0df.nnue
+version=13
+revision=1
+_net_file=nn-62ef826d1a6d.nnue
 wrksrc="Stockfish-sf_${version}"
 build_wrksrc=src
 build_style=gnu-makefile
@@ -15,8 +15,8 @@ license="GPL-3.0-or-later"
 homepage="http://stockfishchess.org/"
 distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz
  https://tests.stockfishchess.org/api/nn/${_net_file}"
-checksum="d1ec11d1cb8dfc5b33bcd6ec89ed0bafb3951cc1690851448a2696caa2022899
- 82215d0fd0df3cde17fc47ac024c5b5736823ec390200abdd705c44660c69ee4"
+checksum="15d14721b3be17c597535bdbb44fb951a1ee948312d90fbf55fa0e52b8b81d62
+ 62ef826d1a6d11b9e814188025aa02a60815c037292e0ef9bbb9bf4f724e5e63"
 skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"

From de4b4947b22054e6eab3ffe6a63a37337dc9ce6f 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, 21 Feb 2021 09:26:30 +0700
Subject: [PATCH 1982/3458] update_check/gnome: also check for 0.* version

---
 common/xbps-src/shutils/update_check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 4ce6129a5110..57077de58b81 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -131,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([13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
+                : ${pattern="\Q$pkgname\E-\K(0|[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)';;

From 3e01d94d418347f3f61f48b471afd369899b3c33 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, 21 Feb 2021 09:32:39 +0700
Subject: [PATCH 1983/3458] gnome-autoar: update to 0.3.0.

CVE-2020-36241
---
 srcpkgs/gnome-autoar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index d60d55f699f5..71d789a4d579 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
-version=0.2.4
+version=0.3.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile"
-hostmakedepends="automake pkg-config glib-devel $(vopt_if gir gobject-introspection)"
+hostmakedepends="automake pkg-config glib-devel"
 makedepends="libarchive-devel gtk+3-devel glib-devel"
 short_desc="Automatic archives creating and extracting library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=0a34c377f8841abbf4c29bc848b301fbd8e4e20c03d7318c777c58432033657a
+checksum=f2c112c0120cca2bf5a82c5b0ac8cba90ce10d21fec78f50a3bc513fdd64586b
 lib32disabled=yes
 
 build_options="gir"

From 80c0fa1ec691c7643858bc937cdec33f364d0fa1 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Feb 2021 17:11:55 +0100
Subject: [PATCH 1984/3458] srw: remove package

Homepage is gone, can't fetch source.
---
 srcpkgs/removed-packages/template    |  1 +
 srcpkgs/srw/patches/musl-fixes.patch | 10 ----------
 srcpkgs/srw/template                 | 17 -----------------
 srcpkgs/srw/update                   |  2 --
 4 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 srcpkgs/srw/patches/musl-fixes.patch
 delete mode 100644 srcpkgs/srw/template
 delete mode 100644 srcpkgs/srw/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2d2338a8b9b6..57b6b45de86c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -232,6 +232,7 @@ replaces="
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
  sqlite-replication<=3.32.3_2
+ srw<=0.7_1
  tagainijisho<=1.0.3_1
  tlsdate<=0.0.13_16
  taizen<=0.0.0.20180808_4
diff --git a/srcpkgs/srw/patches/musl-fixes.patch b/srcpkgs/srw/patches/musl-fixes.patch
deleted file mode 100644
index fc3916d8699b..000000000000
--- a/srcpkgs/srw/patches/musl-fixes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- srw.c.orig
-+++ srw.c
-@@ -11,6 +11,7 @@
- #include <sys/ioctl.h>
- #include <sys/select.h>
- #include <sys/wait.h>
-+#include <sys/ttydefaults.h>
- 
- #ifdef __linux__
-  #include <pty.h>
diff --git a/srcpkgs/srw/template b/srcpkgs/srw/template
deleted file mode 100644
index fc0748a4f622..000000000000
--- a/srcpkgs/srw/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'srw'
-pkgname=srw
-version=0.7
-revision=1
-wrksrc=emg-srw-14f0a3c1f3bb
-build_style=gnu-makefile
-short_desc="Simple read wrapper"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
-homepage="https://bitbucket.org/emg/srw"
-distfiles="https://bitbucket.org/emg/srw/get/${version}.tar.bz2"
-checksum=7e0c3a30747bd58b46a9266303e59a587e0859d3803971fe36dbf57c68e04e27
-
-pre_build() {
-	sed -i 's|^CFLAGS *=|override CFLAGS +=|g' config.mk
-	sed -i 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk
-}
diff --git a/srcpkgs/srw/update b/srcpkgs/srw/update
deleted file mode 100644
index b70bd433dd9a..000000000000
--- a/srcpkgs/srw/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/emg/srw/downloads/?tab=tags"
-pattern="\K[\d\.]*(?=\.tar\.(bz2|gz))"

From 2538b1d7bf329635272cc019c0ed5e4297a5f77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:30:23 -0300
Subject: [PATCH 1985/3458] devhelp: gedit plugin depends on python3.

As seen in [1], the loader for this plugin is python3.

[1]
https://gitlab.gnome.org/GNOME/devhelp/-/blob/18f3d0d671540f3d2d6a5e1d5704681519420441/plugins/gedit-plugin/devhelp.plugin.desktop.in
---
 srcpkgs/devhelp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 86b3776adfd8..806e8094347f 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,7 +1,7 @@
 # Template file for 'devhelp'
 pkgname=devhelp
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
@@ -33,7 +33,7 @@ devhelp-libs_package() {
 }
 devhelp-gedit-plugin_package() {
 	short_desc+=" - gedit plugin"
-	depends="devhelp gedit python"
+	depends="devhelp gedit python3"
 	pkg_install() {
 		vmove usr/lib/gedit
 	}

From c8e1932c9c56ba59fcdce30e19aad266d167015c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 27 Jan 2021 07:21:53 +0100
Subject: [PATCH 1986/3458] gparted: update to 1.2.0.

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

diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index d2653fd96ec0..50d6dbe4dece 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,18 +1,23 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.1.0
+version=1.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
 hostmakedepends="intltool itstool pkg-config"
 makedepends="libglib-devel gtkmm-devel libparted-devel yelp-tools"
 depends="desktop-file-utils hicolor-icon-theme"
+checkdepends="xvfb-run"
 short_desc="Gnome Partition Editor"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=e2fe7b7afbc07e930491c00a05200c2682cc0576ca8f6da87245a000257f5924
+checksum=6c90715d254d7a7ec0208b29007b64160dd9fb7df4c4aa7f8ec2c9d23114c719
+
+# Some tests are known to fail since 1.1.0
+# This disables these:
+export GTEST_FILTER='-PipeCaptureTest.ReadEmbeddedNULCharacter:PipeCaptureTest.ReadNULByteInMiddleOfMultiByteUTF8Character:BlockSpecialTest.NamedBlockSpecialObjectBlockDevice:BlockSpecialTest.TwoNamedBlockSpecialObjectBlockDevices:BlockSpecialTest.NamedBlockSpecialObjectBySymlinkMatches'
 
 pre_configure() {
 	sed -i "s:@bindir@/gparted %f:@bindir@/gparted-pkexec %f:g" gparted.desktop.in.in

From 2e841dc47e812693155c239c24539aceede09456 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 21:19:18 -0500
Subject: [PATCH 1987/3458] protobuf26: update to 3.15.1.

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

diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf26/template
index 3f9689a50e08..233284af7219 100644
--- a/srcpkgs/protobuf26/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf26'
 pkgname=protobuf26
-version=3.15.0
+version=3.15.1
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=6aff9834fd7c540875e1836967c8d14c6897e3785a2efac629f69860fb7834ff
+checksum=f18a40816260a9a3190a94efb0fc26270b244a2436681602f0a944739095d632
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"

From 7f34d4aef016d48f061a8f91334fe30cffe3a697 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 21:19:23 -0500
Subject: [PATCH 1988/3458] python3-protobuf: update to 3.15.1.

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

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index 7dbd630c8a92..215067f93725 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.15.0
+version=3.15.1
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=e9f13fadb15b80e4a83ef5d9fa44e19243b1e2d96e84ee2228ca305180ca059e
+checksum=824dbae3390fcc3ea1bf96748e6da951a601802894cf7e1465e72b4732538cab
 
 build_options="cppext"
 build_options_default="cppext"

From 0812c8ef17a9fe9faf2512f4080adae37b988917 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 21:32:01 -0500
Subject: [PATCH 1989/3458] python3-uvloop: update to 0.15.2.

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

diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 33f683a9f368..62d3253c1b41 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
-version=0.15.1
+version=0.15.2
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,10 +13,12 @@ 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=a0aff7b8ca46b07c50f243a408351de05f731413acc37b9c25c560af824b08f5
+checksum=31944b4258be55526a38059739e360e3c7e2f047c0ae922b6fca5d6d85a37085
 
 do_check() {
-	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -k 'not Test_UV_TCPSSL'
+	# For some reason, setting PYTHONPATH is not sufficient
+	cp build/lib*/uvloop/*.so uvloop
+	python3 -m pytest tests -k 'not Test_UV_TCPSSL'
 }
 
 post_patch() {

From 788ae8cdcc8a6bdf4f61279195b45115f03e76e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 21:37:23 -0500
Subject: [PATCH 1990/3458] intel-ucode: update to 20210216.

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

diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index a59663aaa04d..f931d0600f9e 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20201118
+version=20210216
 revision=1
 archs="i686* x86_64*"
 wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}"
@@ -9,7 +9,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="${homepage}/archive/microcode-${version}.tar.gz"
-checksum=e42a264b7b86e80d013d6d00062467352c1f37e0aaea10fe5b51e4d8687921ab
+checksum=b855c81f78705f35341248a0603aa1a6e199ca7f59cd425e061b579329aa9eaa
 repository=nonfree
 
 do_install() {

From afe8fbae09c3fc054cbd755175cd3739ae23eba3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 21:41:17 -0500
Subject: [PATCH 1991/3458] python3-cryptography_vectors: update to 3.4.6.

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

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index e8f5f7888783..6fcdffb4a5f4 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=3.4.5
+version=3.4.6
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -10,7 +10,7 @@ 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=c921deac9b854e45f01353080ac84d79c8091742aa32923ccd0d68889d775a71
+checksum=e5f88a5fb03d60b4f20eed4920638b6a3ed32a363523a77086528d557a2c2da8
 
 post_install() {
 	vlicense LICENSE

From 4e30173718aabbf5caa8f74ad2b2fe8edc31de4f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 21:41:22 -0500
Subject: [PATCH 1992/3458] python3-cryptography: update to 3.4.6.

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

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 1234e0987d72..af9674c186ea 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=3.4.5
+version=3.4.6
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ 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=4f6761a82b51fe02cda8f45af1c2f698a10f50003dc9c2572d8a49eda2e6d35b
+checksum=2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From bad649f1fde253735c68298cd0eb4a241dfb8e0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 22:03:25 -0500
Subject: [PATCH 1993/3458] maturin: update to 0.9.4.

---
 srcpkgs/maturin/patches/add-ppc-tier3.patch | 6 +++---
 srcpkgs/maturin/template                    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch
index 6f99f304bdf2..cd5eae5c19bb 100644
--- a/srcpkgs/maturin/patches/add-ppc-tier3.patch
+++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch
@@ -12,12 +12,12 @@ diff --git setup.py setup.py
 index 228267f..8fa1c1e 100644
 --- setup.py
 +++ setup.py
-@@ -62,7 +62,7 @@ class PostInstallCommand(install):
+@@ -65,7 +65,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"):
+-            if platform.machine() in ("ppc64le", "ppc64", "powerpc"):
++            if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc"):
                  cargo_args.extend(
                      ["--no-default-features", "--features=auditwheel,log,human-panic"]
                  )
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 60ba6329812c..25b1a8da5403 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.9.1
+version=0.9.4
 revision=1
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
@@ -16,7 +16,7 @@ homepage="https://github.com/PyO3/maturin"
 # 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="e3e13ab6e7626698fe6e73f639ff899e71d485f4e5964381db9bc0ae03c9c2dd
+checksum="130d39cc6ecae9b1cb5602d262c1a8a8230c8ddb3496d2397c49e565c0fc731a
  2524984c2ef547bb54515828e4afad0e781a439d74cf0197cf168ec6c818594c"
 
 post_extract() {

From 6281993de91c0b6f6dce2969d53e278e599254e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 22:25:15 -0500
Subject: [PATCH 1994/3458] python3-hypothesis: update to 6.3.0.

---
 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 b77896dc4b83..250e0c0d5706 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.2.0
+version=6.3.0
 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=c2d37b04f509cdfc9234050800d06c969f7a7752f47c90232b85f30c5d0f4f75
+checksum=890f6c5b375dca597a76b4d6653ab70d0b2a154c2890d28a63a2878b0188607c
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From f2090b15378a7614f51b45889f6882716b0fd0ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 23:33:57 -0500
Subject: [PATCH 1995/3458] python-Cython: update to 0.29.22.

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

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index bdcb0c6d80d1..6a75941059ba 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
-version=0.29.21
-revision=2
+version=0.29.22
+revision=1
 wrksrc="Cython-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://cython.org/"
 changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
-checksum=e57acb89bd55943c8d8bf813763d20b9099cc7165c0f16b707631a7654be9cad
+checksum=df6b83c7a6d1d967ea89a2903e4a931377634a297459652e4551734c48195406
 
 alternatives="
  cython:cygdb:/usr/bin/cygdb2

From 0d311a2f98db990026e0ec454918de02944bf906 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 17 Feb 2021 11:32:10 -0500
Subject: [PATCH 1996/3458] chromium: update to 88.0.4324.182.

- Built for x86_64, x86_64-musl, i686.
- Tested on x86_64.

- Remove/update deprecated build options: is_desktop_linux,
  closure_compile, binutils_path, linux_use_bundled_binutils.
---
 srcpkgs/chromium/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index b543051ccf70..098cb904da98 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.150
+version=88.0.4324.182
 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=ae12e94392986c6b8ea4413356a49bae0a19356ffe2ea95495303cf2decb38c3
+checksum=30411fc3ec2d33df4c5cad41f21affa3823c80f7dbd394f6d68f9a1e81015b81
 nocross=yes
 
 lib32disabled=yes
@@ -182,15 +182,15 @@ do_configure() {
 		'use_system_harfbuzz=true'
 		'enable_widevine=true'
 		'enable_hangout_services_extension=true'
-		'is_desktop_linux=true'
 	)
 
 	conf+=(
 		"use_vaapi=$(vopt_if vaapi true false)"
 	)
 
+	# https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
 	conf+=(
-		"closure_compile=$(vopt_if js_optimize true false)"
+		"enable_js_type_check=$(vopt_if js_optimize true false)"
 	)
 
 	conf+=(
@@ -216,9 +216,7 @@ do_configure() {
 
 	# Never use bundled binutils/gold binary.
 	conf+=(
-		"binutils_path=\"${XBPS_CROSS_BASE}/usr/bin\""
 		"gold_path=\"${XBPS_CROSS_BASE}/usr/bin/ld.gold\""
-		'linux_use_bundled_binutils=false'
 		'use_custom_libcxx=false'
 		'use_lld=false'
 	)

From 1b9fe5156cb839659fed90da45ce812cec387fdf Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 17 Feb 2021 14:17:50 -0500
Subject: [PATCH 1997/3458] chromium-widevine: update to 88.0.4324.182.

---
 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 703be9f5101f..4c9600e6eca4 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=404f13af1288a824898674e83c42bcdffba098178ff96d266525cd7e2fdcd077
+checksum=ab00e9412f5f20e30c7db5dc987473248f4adf9ebf2c3f928ef62e1ffb104fe6
 _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 b54e4b56f395..d7a0587caf5a 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.150
+version=88.0.4324.182
 revision=1
 archs="x86_64"
 create_wrksrc=yes

From f7f171ce762d3de772dfb710f4c806807137bd47 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, 20 Feb 2021 07:07:23 +0700
Subject: [PATCH 1998/3458] python3-fido2: update to 0.9.1.

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

diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
index 687bd0659038..6f50bbb8dfb9 100644
--- a/srcpkgs/python3-fido2/template
+++ b/srcpkgs/python3-fido2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-fido2'
 pkgname=python3-fido2
 _pkgname=fido2
-version=0.9.0
+version=0.9.1
 revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
@@ -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=468f8657cc5b8b149e38a1735fbf5cd65e01a340a11a585caf4e6bade8c4b735
+checksum=8680ee25238e2307596eb3900a0f8c0d9cc91189146ed8039544f1a3a69dfe6e
 
 post_extract() {
 	# pytest mis-recognises this file as a test case

From f00da473c3bcea3f818e837e0ee0362a483e507b Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sun, 21 Feb 2021 10:47:08 +0100
Subject: [PATCH 1999/3458] libmysofa: update to 1.2.

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

diff --git a/common/shlibs b/common/shlibs
index eae36d09d1eb..fd1a20b0f649 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3042,7 +3042,7 @@ liblsmash.so.2 liblsmash-2.9.1_1
 libgiac.so.0 libgiac-1.4.9r17_1
 libgnustep-base.so.1.27 gnustep-base-1.27.0_1
 libtermbox.so.1 termbox-1.1.0_1
-libmysofa.so.0 libmysofa-0.6_1
+libmysofa.so.1 libmysofa-1.2_1
 libzinnia.so.0 libzinnia-0.06_1
 libdnet.so.1 libdnet-1.12_1
 libgtkd-3.so.0 gtkd-3.7.0_2
diff --git a/srcpkgs/libmysofa/template b/srcpkgs/libmysofa/template
index 202a5752ff55..0413c645f0f5 100644
--- a/srcpkgs/libmysofa/template
+++ b/srcpkgs/libmysofa/template
@@ -1,6 +1,6 @@
 # Template file for 'libmysofa'
 pkgname=libmysofa
-version=0.9.1
+version=1.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/hoene/libmysofa"
 distfiles="https://github.com/hoene/libmysofa/archive/v${version}.tar.gz"
-checksum=b942cc4a6b5da6187d38574f7653489347ceadf7c1ab7168dfe5e307e999dcc6
+checksum=7638dec8ba2b5408cf32ab41d37cb29460095c4b2161a860480c122e71806ba9
 
 post_install() {
 	vlicense LICENSE

From 6bea462fa963f994dffa03ae42164c8958d1c8e9 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sun, 21 Feb 2021 10:49:03 +0100
Subject: [PATCH 2000/3458] ffmpeg: add sofa option to enable sofalizer

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

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 5a79f1292c44..ac6c52e96306 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -23,10 +23,10 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel)
  $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
  $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel)
- $(vopt_if webp libwebp-devel)"
+ $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)"
 
 build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio
- dav1d zimg webp"
+ dav1d zimg webp sofa"
 build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -96,7 +96,8 @@ do_configure() {
 		--enable-libbs2b --enable-avresample --enable-libvidstab \
 		$(vopt_if dav1d '--enable-libdav1d') \
 		$(vopt_if zimg '--enable-libzimg') \
-		$(vopt_if webp '--enable-libwebp')
+		$(vopt_if webp '--enable-libwebp') \
+		$(vopt_if sofa '--enable-libmysofa')
 }
 do_build() {
 	rm ${XBPS_WRAPPERDIR}/strip

From c33add564d00f12f1162d08bf5c2a7b03446e592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 21 Feb 2021 14:21:22 +0100
Subject: [PATCH 2001/3458] New package: spin2cpp-3.0.5

---
 srcpkgs/spin2cpp/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/spin2cpp/template

diff --git a/srcpkgs/spin2cpp/template b/srcpkgs/spin2cpp/template
new file mode 100644
index 000000000000..39a98853d886
--- /dev/null
+++ b/srcpkgs/spin2cpp/template
@@ -0,0 +1,27 @@
+# Template file for 'spin2cpp'
+pkgname=spin2cpp
+version=5.0.3
+revision=1
+build_style=gnu-makefile
+hostmakedepends="bison"
+short_desc="Converting languages for the Parallax Inc. Propeller 1 and 2"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="MIT"
+homepage="https://github.com/totalspectrum/spin2cpp/"
+distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
+checksum=d19d4c9230e35e34df6d689634ce49c6752f386a77171ca3ae01aa1700a7b549
+
+CFLAGS="-I. -I./build -DFLEXSPIN_BUILD -fcommon"
+
+do_check() {
+	make CFLAGS="$CFLAGS" ${makejobs} test || true # some tests fail
+}
+
+do_install() {
+	for f in flexcc flexspin spin2cpp; do
+		vbin build/$f
+	done
+	vmkdir usr/share/${pkgname}
+	vcopy doc usr/share/${pkgname}
+	vlicense COPYING
+}

From 4de621875b34a5fc6f9e7f4dc5cd5e9efe5440e2 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sun, 21 Feb 2021 14:42:43 +0100
Subject: [PATCH 2002/3458] libeatmydata: fix lib path

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

diff --git a/srcpkgs/libeatmydata/template b/srcpkgs/libeatmydata/template
index efd7bea1a334..90a5f6b96113 100644
--- a/srcpkgs/libeatmydata/template
+++ b/srcpkgs/libeatmydata/template
@@ -1,7 +1,7 @@
 # Template file for 'libeatmydata'
 pkgname=libeatmydata
 version=105
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Small LD_PRELOAD library designed to (transparently) disable fsync"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 52980fc6a0a08e0d8bb6f4a97157054259be7ab4 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, 21 Feb 2021 20:48:10 +0700
Subject: [PATCH 2003/3458] swh-plugins: move gettext-devel to hostmakedepends

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

diff --git a/srcpkgs/swh-plugins/template b/srcpkgs/swh-plugins/template
index c5b43a21395f..1bfa854e7507 100644
--- a/srcpkgs/swh-plugins/template
+++ b/srcpkgs/swh-plugins/template
@@ -5,9 +5,9 @@ revision=1
 wrksrc="ladspa-${version}"
 conflicts="swh-lv2"
 build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config gettext
+hostmakedepends="automake libtool pkg-config gettext-devel gettext
  perl-Locale-gettext perl-Locale-PO perl-XML-Parser"
-makedepends="fftw-devel gettext-devel libgsm-devel libxml2-devel"
+makedepends="fftw-devel libgsm-devel libxml2-devel"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 homepage="http://plugin.org.uk/"
 short_desc="The SWH Plugins package for the LADSPA plugin system"

From 381c3e030b2aee50588861314c60142e2544d626 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, 21 Feb 2021 21:04:06 +0700
Subject: [PATCH 2004/3458] CubicSDR: use cmake-wxWidgets-gtk3 build-helper

---
 srcpkgs/CubicSDR/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index ebeb68a305f0..4b6b1aafc922 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -3,6 +3,7 @@ pkgname=CubicSDR
 version=0.2.5
 revision=2
 build_style=cmake
+build_helper="cmake-wxWidgets-gtk3"
 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-gtk3-devel glu-devel liquid-dsp-devel hamlib-devel
@@ -18,12 +19,6 @@ 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 e20a1c81d7769c5d1b58ad949d1f066910509f34 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, 21 Feb 2021 21:03:34 +0700
Subject: [PATCH 2005/3458] treesheets: use cmake-wxWidgets-gtk3 build-helper

---
 srcpkgs/treesheets/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/treesheets/template b/srcpkgs/treesheets/template
index 104b01f411c6..4cd41afbd932 100644
--- a/srcpkgs/treesheets/template
+++ b/srcpkgs/treesheets/template
@@ -3,6 +3,7 @@ pkgname=treesheets
 version=1.0.2
 revision=1
 build_style=cmake
+build_helper="cmake-wxWidgets-gtk3"
 makedepends="wxWidgets-gtk3-devel"
 short_desc="Free Form Data Organizer"
 maintainer="Piraty <piraty1@inbox.ru>"
@@ -11,9 +12,6 @@ homepage="http://strlen.com/treesheets/"
 distfiles="https://github.com/aardappel/treesheets/archive/v${version}.tar.gz"
 checksum=84eb82f122bc7be3ded399d2511536128911477a4a69c51b26b856de2160405f
 
-# tell FindwxWidgets.cmake to use wx-config-gtk3
-export WX_CONFIG=wx-config-gtk3
-
 do_install() {
 	vmkdir usr/lib/${pkgname}
 

From 550350a93c999e633741a226565d7f1cc1d55186 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, 21 Feb 2021 21:12:11 +0700
Subject: [PATCH 2006/3458] trackballs: respect our CPP

---
 srcpkgs/trackballs/patches/respect-our-cpp.patch | 13 +++++++++++++
 srcpkgs/trackballs/template                      |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/trackballs/patches/respect-our-cpp.patch

diff --git a/srcpkgs/trackballs/patches/respect-our-cpp.patch b/srcpkgs/trackballs/patches/respect-our-cpp.patch
new file mode 100644
index 000000000000..c53441705d80
--- /dev/null
+++ b/srcpkgs/trackballs/patches/respect-our-cpp.patch
@@ -0,0 +1,13 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -66,7 +66,7 @@ endforeach()
+ 
+ # cpp is the c++ preprocessor
+ add_custom_command(OUTPUT guile.cc.x
+-                  COMMAND CPP=cpp; ${GUILE_SNARF} -o guile.cc.x ${PROJECT_SOURCE_DIR}/src/guile.cc ${defstr} ${incstr} -D_GNU_SOURCE=1 -D_REENTRANT
++                  COMMAND ${GUILE_SNARF} -o guile.cc.x ${PROJECT_SOURCE_DIR}/src/guile.cc ${defstr} ${incstr} -D_GNU_SOURCE=1 -D_REENTRANT
+                   DEPENDS src/guile.cc
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ 
diff --git a/srcpkgs/trackballs/template b/srcpkgs/trackballs/template
index 321e20076212..8e6989658a92 100644
--- a/srcpkgs/trackballs/template
+++ b/srcpkgs/trackballs/template
@@ -3,7 +3,7 @@ pkgname=trackballs
 version=1.3.1
 revision=2
 build_style=cmake
-hostmakedepends="gettext guile"
+hostmakedepends="gettext guile pkg-config"
 makedepends="zlib-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel guile-devel"
 depends="guile"
 short_desc="Marble steering game"

From fa2150a8fd045c2eb322123f32c47495baa59d1b 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, 21 Feb 2021 21:21:47 +0700
Subject: [PATCH 2007/3458] python3-pwntools: do not check Python headers in
 build

---
 .../do-not-check-build-python-header.patch     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/python3-pwntools/patches/do-not-check-build-python-header.patch

diff --git a/srcpkgs/python3-pwntools/patches/do-not-check-build-python-header.patch b/srcpkgs/python3-pwntools/patches/do-not-check-build-python-header.patch
new file mode 100644
index 000000000000..56e8b6b78b00
--- /dev/null
+++ b/srcpkgs/python3-pwntools/patches/do-not-check-build-python-header.patch
@@ -0,0 +1,18 @@
+Index: setup.py
+===================================================================
+--- setup.py
++++ setup.py
+@@ -64,13 +64,6 @@ install_requires     = ['paramiko>=1.15.
+                         'six>=1.12.0',
+ ]
+ 
+-# Check that the user has installed the Python development headers
+-PythonH = os.path.join(get_python_inc(), 'Python.h')
+-if not os.path.exists(PythonH):
+-    print("You must install the Python development headers!", file=sys.stderr)
+-    print("$ apt-get install python-dev", file=sys.stderr)
+-    sys.exit(-1)
+-
+ # Convert README.md to reStructuredText for PyPI
+ long_description = ''
+ try:

From a988108b1a2bb86e5ccf2cf9789e88695eabd4e1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Feb 2021 15:50:36 +0100
Subject: [PATCH 2008/3458] python3-boto3: update to 1.17.12.

---
 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 5e164d0171b3..4f2d53d41ba3 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.17.9
+version=1.17.12
 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=4a72a1d85b0621ccdaf7965568a6aebdfd9cfef9076302f7566fc482195b9fce
+checksum=0eef717261da7c0aa6fa538c7cacf8c489123fd247a94a9c86a604ddeff7443b
 
 post_install() {
 	vlicense LICENSE

From b9c44166529e1977d3eb5aed9e44cde78923e83b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 21 Feb 2021 17:06:41 +0100
Subject: [PATCH 2009/3458] projectM: update to 3.1.12

clementine was messed up because of the 3.1.11 update since
it was including Intrinsics.h in public headers without installing
said header
---
 srcpkgs/projectM/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index 534823f1834a..14e70da03b1f 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,7 +1,7 @@
 # Template file for 'projectM'
 pkgname=projectM
-version=3.1.11
-revision=2
+version=3.1.12
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--datadir=/usr/libexec --enable-qt --enable-pulseaudio
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/projectM-visualizer/projectm"
 distfiles="${homepage}/releases/download/v${version}/projectM-${version}.tar.gz"
-checksum=4f60506637d178b96646bdd3c78161f6e30a89dee556675625d6e03dea0ee791
+checksum=b6b99dde5c8f0822ae362606a0429628ee478f4ec943a156723841b742954707
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"
@@ -27,8 +27,6 @@ post_install() {
 	# fix location of desktop files
 	vmkdir usr/share
 	mv $DESTDIR/usr/libexec/{applications,icons} $DESTDIR/usr/share
-	vsed -i $DESTDIR/usr/include/libprojectM/Common.hpp \
-		-e '/#include "Intrinsics.h"/d'
 }
 
 projectM-devel_package() {

From 27cd4510adfe0d08f29b21cb60d58a1f3fc3c376 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sun, 21 Feb 2021 10:26:26 -0600
Subject: [PATCH 2010/3458] python3-rich: update to 9.11.1.

---
 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 3d1ce246e4fc..9e93a0563195 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.11.0
+version=9.11.1
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,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=f8f08fdac6bd67dc2dd7fe976da702d748487aa9eb5d050c48b2321bc67ed659
+checksum=86a157008d17c73ee03da80de91e09fc2f7713109ccd4e90496eeb3702bef638
 
 post_install() {
 	vlicense LICENSE

From 19e5e771fdd36b5027f1651ed82ef4fff2c295d1 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sun, 21 Feb 2021 14:42:43 +0100
Subject: [PATCH 2011/3458] libeatmydata: fix lib path

---
 .../remove-debian-specific-command.patch      | 27 +++++++++++++++++++
 srcpkgs/libeatmydata/template                 |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libeatmydata/patches/remove-debian-specific-command.patch

diff --git a/srcpkgs/libeatmydata/patches/remove-debian-specific-command.patch b/srcpkgs/libeatmydata/patches/remove-debian-specific-command.patch
new file mode 100644
index 000000000000..6f988b4a4852
--- /dev/null
+++ b/srcpkgs/libeatmydata/patches/remove-debian-specific-command.patch
@@ -0,0 +1,27 @@
+From fc0e20e4d4a43c86f9151f74164983bbe7a3a9c7 Mon Sep 17 00:00:00 2001
+From: Andreas Stieger <astieger@suse.com>
+Date: Sun, 25 Jan 2015 00:23:57 +0100
+Subject: [PATCH] remove Debian specific command
+
+Remove Debian specific architecture detection and replace with build time setting.
+
+Signed-off-by: Stewart Smith <stewart@flamingspork.com>
+---
+ eatmydata.in | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git eatmydata.in eatmydata.in
+index 40468db..e37f07c 100644
+--- eatmydata.in
++++ eatmydata.in
+@@ -15,9 +15,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-export `dpkg-architecture|grep DEB_BUILD_MULTIARCH`
+-
+-shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh"
++shlib="@libexecdir@/eatmydata.sh"
+ if [ -f "$shlib" ]; then
+     . "$shlib"
+ else
diff --git a/srcpkgs/libeatmydata/template b/srcpkgs/libeatmydata/template
index 90a5f6b96113..3334ca236d94 100644
--- a/srcpkgs/libeatmydata/template
+++ b/srcpkgs/libeatmydata/template
@@ -1,7 +1,7 @@
 # Template file for 'libeatmydata'
 pkgname=libeatmydata
 version=105
-revision=3
+revision=4
 build_style=gnu-configure
 short_desc="Small LD_PRELOAD library designed to (transparently) disable fsync"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 20b12691700bd91b61413e49f8cc19882bcb522a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 21 Feb 2021 19:34:24 +0100
Subject: [PATCH 2012/3458] spin2cpp: update to 5.1.1

Use new layout where Propeller 2 tools are installed in a common
directory usr/libexec/p2tools.

This makes it easier for packages like flexspin to find its include
files in ../include which is the default.
---
 srcpkgs/spin2cpp/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spin2cpp/template b/srcpkgs/spin2cpp/template
index 39a98853d886..d6a0d7f1551c 100644
--- a/srcpkgs/spin2cpp/template
+++ b/srcpkgs/spin2cpp/template
@@ -1,6 +1,6 @@
 # Template file for 'spin2cpp'
 pkgname=spin2cpp
-version=5.0.3
+version=5.1.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="bison"
@@ -9,7 +9,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MIT"
 homepage="https://github.com/totalspectrum/spin2cpp/"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
-checksum=d19d4c9230e35e34df6d689634ce49c6752f386a77171ca3ae01aa1700a7b549
+checksum=72cc53a17c528541170361d70344f08bdf6ac719c875b6bbd71e0ae398d1eea8
 
 CFLAGS="-I. -I./build -DFLEXSPIN_BUILD -fcommon"
 
@@ -18,10 +18,14 @@ do_check() {
 }
 
 do_install() {
+	vmkdir usr/bin
+	vmkdir usr/libexec/p2tools/bin
 	for f in flexcc flexspin spin2cpp; do
-		vbin build/$f
+		vinstall build/$f 755 usr/libexec/p2tools/bin/
+		ln -s /usr/libexec/p2tools/bin/$f ${DESTDIR}/usr/bin/
 	done
-	vmkdir usr/share/${pkgname}
-	vcopy doc usr/share/${pkgname}
+	vmkdir usr/libexec/p2tools
+	vcopy include usr/libexec/p2tools
+	vcopy doc usr/libexec/p2tools
 	vlicense COPYING
 }

From fd9e7b776f7d5bb11ac72dcaa37effa377447b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 21 Feb 2021 19:41:14 +0100
Subject: [PATCH 2013/3458] New package: loadp2-045

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

diff --git a/srcpkgs/loadp2/template b/srcpkgs/loadp2/template
new file mode 100644
index 000000000000..9118f63a0a92
--- /dev/null
+++ b/srcpkgs/loadp2/template
@@ -0,0 +1,22 @@
+# Template file for 'loadp2'
+pkgname=loadp2
+version=045
+revision=1
+build_style=gnu-makefile
+hostmakedepends="spin2cpp"
+depends="spin2cpp"
+short_desc="Loader for the Parallax Propeller 2"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="MIT"
+homepage="https://github.com/totalspectrum/loadp2"
+distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
+checksum=bc7313e386111df921cf07503b468f4a9b0ce580c786de1eaf0484a3289a6613
+
+do_install() {
+	vmkdir usr/bin
+	vmkdir usr/libexec/p2tools/bin
+	vcopy board usr/libexec/p2tools
+	vinstall build/loadp2 755 usr/libexec/p2tools/bin
+	ln -s /usr/libexec/p2tools/bin/loadp2 ${DESTDIR}/usr/bin/
+	vlicense LICENSE
+}

From 76693add3666ea9402cc615b92e91d3e07d60b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:37:25 -0300
Subject: [PATCH 2014/3458] fvwm: use python3.

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

diff --git a/srcpkgs/fvwm/template b/srcpkgs/fvwm/template
index f5c988338a9b..6ca6338a49a2 100644
--- a/srcpkgs/fvwm/template
+++ b/srcpkgs/fvwm/template
@@ -1,13 +1,13 @@
 # Template file for 'fvwm'
 pkgname=fvwm
 version=2.6.9
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="libxslt pkg-config python"
+hostmakedepends="libxslt pkg-config python3"
 makedepends="fribidi-devel libXcursor-devel libXft-devel libXinerama-devel
  libXpm-devel libXt-devel librsvg-devel perl readline-devel"
-depends="perl python"
-short_desc="An extremely powerful ICCCM-compliant window manager"
+depends="perl python3"
+short_desc="Extremely powerful ICCCM-compliant window manager"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, MIT"
 homepage="http://fvwm.org/"

From 55ea640c867202d7f1bb59c87679dc78081f8722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:24:19 -0300
Subject: [PATCH 2015/3458] cracklib: build without python.

Doesn't seem to support python3, so remove python extension.
---
 srcpkgs/cracklib-python           |  1 -
 srcpkgs/cracklib/template         | 15 ++-------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/cracklib-python

diff --git a/srcpkgs/cracklib-python b/srcpkgs/cracklib-python
deleted file mode 120000
index 741275aec920..000000000000
--- a/srcpkgs/cracklib-python
+++ /dev/null
@@ -1 +0,0 @@
-cracklib
\ No newline at end of file
diff --git a/srcpkgs/cracklib/template b/srcpkgs/cracklib/template
index 7f61fc2be576..be17b6772094 100644
--- a/srcpkgs/cracklib/template
+++ b/srcpkgs/cracklib/template
@@ -1,11 +1,10 @@
 # Template file for 'cracklib'
 pkgname=cracklib
 version=2.9.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="libtool automake gettext-devel python"
-makedepends="python-devel"
+hostmakedepends="libtool automake gettext-devel"
 short_desc="Password Checking Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -34,16 +33,6 @@ cracklib-devel_package() {
 	}
 }
 
-cracklib-python_package() {
-	lib32disabled=yes
-	depends="python"
-	short_desc+=" - python bindings"
-	pycompile_module="cracklib.py"
-	pkg_install() {
-		vmove "usr/lib/python*"
-	}
-}
-
 libcracklib_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 57b6b45de86c..35b490894553 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -26,6 +26,7 @@ replaces="
  california<=0.4.0_4
  clamz<=0.5_4
  couchdb<=1.7.1_2
+ cracklib-python<=2.9.7_1
  ctpp2<=2.8.3_7
  ctpp2-devel<=2.8.3_7
  dht-node<=0.2.0_3

From 2e26894d2a3a8db600f479b40bf5dd9440ddd5af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:46:10 -0300
Subject: [PATCH 2016/3458] python-sqlite: remove package.

Nothing depends on it.
---
 srcpkgs/python-sqlite/template | 20 --------------------
 srcpkgs/python-sqlite/update   |  1 -
 2 files changed, 21 deletions(-)
 delete mode 100644 srcpkgs/python-sqlite/template
 delete mode 100644 srcpkgs/python-sqlite/update

diff --git a/srcpkgs/python-sqlite/template b/srcpkgs/python-sqlite/template
deleted file mode 100644
index 0daaf9897642..000000000000
--- a/srcpkgs/python-sqlite/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-sqlite'
-pkgname=python-sqlite
-version=2.8.3
-revision=1
-wrksrc="pysqlite-${version}"
-build_style=python2-module
-hostmakedepends="python-devel"
-makedepends="sqlite-devel ${hostmakedepends}"
-pycompile_module="pysqlite2"
-short_desc="Python2 DB-API 2.0 interface for SQLite 3.x databases"
-homepage="https://github.com/ghaering/pysqlite"
-license="zlib"
-maintainer="Orphaned <orphan@voidlinux.org>"
-distfiles="${PYPI_SITE}/p/pysqlite/pysqlite-${version}.tar.gz"
-checksum=17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/pysqlite*
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python-sqlite/update b/srcpkgs/python-sqlite/update
deleted file mode 100644
index 9fd01974452a..000000000000
--- a/srcpkgs/python-sqlite/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="pysqlite"

From c2ce09adf8a15dc3daaada2647f7dc6bb7758ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:53:34 -0300
Subject: [PATCH 2017/3458] python-gntp: become python3-gntp.

Remove python2 version.
---
 srcpkgs/python-gntp/template  | 32 --------------------------------
 srcpkgs/python3-gntp          |  1 -
 srcpkgs/python3-gntp/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-gntp/template
 delete mode 120000 srcpkgs/python3-gntp
 create mode 100644 srcpkgs/python3-gntp/template

diff --git a/srcpkgs/python-gntp/template b/srcpkgs/python-gntp/template
deleted file mode 100644
index 516246a110be..000000000000
--- a/srcpkgs/python-gntp/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-gntp'
-pkgname=python-gntp
-version=1.0.3
-revision=7
-wrksrc="gntp-${version}"
-build_style=python-module
-pycompile_module="gntp"
-hostmakedepends="python-devel python3-devel"
-depends="python"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/kfdm/gntp"
-short_desc="Python2 library for the Growl Notification Transport Protocol"
-distfiles="https://github.com/kfdm/gntp/archive/v${version}.tar.gz"
-checksum=e9fde29e5ec37dfb77a7659018a7c7f65cb1411054c864eae137ce3d008f794f
-alternatives="gntp:gntp:/usr/bin/gntp2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-gntp_package() {
-	depends="python3"
-	pycompile_module="gntp"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="gntp:gntp:/usr/bin/gntp3"
-	pkg_install() {
-		vmove usr/bin/gntp3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-gntp b/srcpkgs/python3-gntp
deleted file mode 120000
index 34e4aaa0fa96..000000000000
--- a/srcpkgs/python3-gntp
+++ /dev/null
@@ -1 +0,0 @@
-python-gntp
\ No newline at end of file
diff --git a/srcpkgs/python3-gntp/template b/srcpkgs/python3-gntp/template
new file mode 100644
index 000000000000..db2fa5e0b6de
--- /dev/null
+++ b/srcpkgs/python3-gntp/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-gntp'
+pkgname=python3-gntp
+version=1.0.3
+revision=8
+wrksrc="gntp-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel"
+depends="python3"
+short_desc="Python3 library for the Growl Notification Transport Protocol"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/kfdm/gntp"
+distfiles="https://github.com/kfdm/gntp/archive/v${version}.tar.gz"
+checksum=e9fde29e5ec37dfb77a7659018a7c7f65cb1411054c864eae137ce3d008f794f
+conflicts="python-gntp>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From ff42cfec3b0da3d9a2e43a8ed69468ccfa30f8ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:55:06 -0300
Subject: [PATCH 2018/3458] python-netifaces: become python3-netifaces.

Remove python2 version.
---
 srcpkgs/python-netifaces/template  | 27 ---------------------------
 srcpkgs/python3-netifaces          |  1 -
 srcpkgs/python3-netifaces/template | 20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/python-netifaces/template
 delete mode 120000 srcpkgs/python3-netifaces
 create mode 100644 srcpkgs/python3-netifaces/template

diff --git a/srcpkgs/python-netifaces/template b/srcpkgs/python-netifaces/template
deleted file mode 100644
index 4bca5a924adf..000000000000
--- a/srcpkgs/python-netifaces/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-netifaces'
-pkgname=python-netifaces
-version=0.10.9
-revision=3
-wrksrc="netifaces-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 library to retrieve information about network interfaces"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/al45tair/netifaces"
-distfiles="${PYPI_SITE}/n/netifaces/netifaces-${version}.tar.gz"
-checksum=2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3
-
-post_install() {
-	sed -n '/Copyright/,/SOFTWARE\./p' PKG-INFO >LICENSE
-	vlicense LICENSE
-}
-
-python3-netifaces_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-netifaces b/srcpkgs/python3-netifaces
deleted file mode 120000
index 7fd5df6f422f..000000000000
--- a/srcpkgs/python3-netifaces
+++ /dev/null
@@ -1 +0,0 @@
-python-netifaces
\ No newline at end of file
diff --git a/srcpkgs/python3-netifaces/template b/srcpkgs/python3-netifaces/template
new file mode 100644
index 000000000000..9bfd719ebb68
--- /dev/null
+++ b/srcpkgs/python3-netifaces/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-netifaces'
+pkgname=python3-netifaces
+version=0.10.9
+revision=4
+wrksrc="netifaces-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 library to retrieve information about network interfaces"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://github.com/al45tair/netifaces"
+distfiles="${PYPI_SITE}/n/netifaces/netifaces-${version}.tar.gz"
+checksum=2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3
+conflicts="python-netifaces>=0"
+
+post_install() {
+	sed -n '/Copyright/,/SOFTWARE\./p' PKG-INFO >LICENSE
+	vlicense LICENSE
+}

From 79e3ca1e3d4071e232fe7385ac48d04dfb1c81b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:47:45 -0300
Subject: [PATCH 2019/3458] removed-packages: add some python2 packages.

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 35b490894553..e773d40a0f14 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -195,13 +195,16 @@ replaces="
  python-SecretStorage<=2.3.1_4
  python-audit<=2.8.5_2
  python-enchant<=2.0.0_4
+ python-gntp<=1.0.3_7
  python-jellyfish<=0.6.1_2
  python-matplotlib<=2.2.4_2
  python-matplotlib-data<=2.2.4_2
+ python-netifaces<=0.10.9_3
  python-pivy<=0.6.4_2
  python-pyenet<=1.3.13.post7_2
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
+ python-sqlite<=2.8.3_1
  python3-Django<=3.0.7_2
  python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4

From 03d65148fed7ddda3caed9b8acc31ff664339a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 00:39:18 -0300
Subject: [PATCH 2020/3458] ncdns: remove package.

Package is completely unmaintained and hasn't been update ever since it
was added.
---
 srcpkgs/ncdns/template            | 18 ------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 srcpkgs/ncdns/template

diff --git a/srcpkgs/ncdns/template b/srcpkgs/ncdns/template
deleted file mode 100644
index e87595486b87..000000000000
--- a/srcpkgs/ncdns/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'ncdns'
-pkgname=ncdns
-version=0.0.2
-revision=12
-build_style=go
-hostmakedepends="git"
-makedepends="libcap-devel"
-go_import_path="github.com/hlandau/ncdns"
-short_desc="Nameserver for Namecoin .bit domains"
-maintainer="ananteris <ananteris@protonmail.ch>"
-license="GPL-3"
-homepage="https://github.com/hlandau/ncdns"
-distfiles="https://github.com/hlandau/${pkgname}/archive/v${version}.tar.gz"
-checksum="a9457216f5bbc3c3b41e0538b78f8f67ad9a04304743a352a7325eef6af4a439"
-
-post_install() {
-	vconf ${GOPATH}/src/github.com/hlandau/ncdns/_doc/ncdns.conf.example  ncdns.conf
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e773d40a0f14..03851aff17e3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -179,6 +179,7 @@ replaces="
  mirrorbits<=0.5.1_1
  mongroup<=0.4.1_2
  mozjs68<=68.11.0_1
+ ncdns<=0.0.2_12
  orage<=4.12.1_7
  oce<=0.18.3_1
  oce-devel<=0.18.3_1

From 0b1d7d973211e60419793e0954e1d7ec7a832f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 00:24:20 -0300
Subject: [PATCH 2021/3458] minify: fix go_import_path.

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

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index be6bcb78b65a..313ab4bb227e 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,16 +1,16 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.9.13
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/tdewolff/minify"
-go_package="github.com/tdewolff/minify/cmd/minify"
+go_import_path="github.com/tdewolff/minify/v2"
+go_package="${go_import_path}/cmd/minify"
 hostmakedepends="git"
 short_desc="Go minifiers for web formats"
 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"
+distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
 checksum=b9d4553d888e1717c320dcf829741ff929e432dd59451927d474bd2efcc251cf
 
 post_install() {

From 50c82bc5c1da4d84e1feed0fd9c1363bb02f1ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:18:27 -0300
Subject: [PATCH 2022/3458] archiver: fix go_import_path.

This template was building v1 of archiver, which it cloned at build
time.
---
 srcpkgs/archiver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index b63712329a7c..05c5333c46aa 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,9 +1,9 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.0
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/mholt/archiver
+go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"
 hostmakedepends="git"
 short_desc="Easily create and extract common archive formats"

From b4098f3ce76e47809f0767767003588d94af5355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 21 Feb 2021 18:46:02 -0300
Subject: [PATCH 2023/3458] enchant2: fix file conflict with enchant.

Reverts a change made in 1d79784495195cff12559a53ff387f32e12a6dc8 that
removed the make args. Also add explanation for why the make arguments
are necessary.
---
 srcpkgs/enchant2/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index d3f9c9d1ad8f..5bb08e5c5636 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,9 +1,16 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=1
+revision=2
 wrksrc="enchant-${version}"
 build_style=gnu-configure
+# so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
+# might be a bug in their build system that only this directory and/or file aren't
+# suffixed appropriately.
+# passing this in make is safe because this is the value used to define the macro
+# that their code uses to find enchant.ordering
+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"

From 4d724a35b00360a1c0ee79c56567c229405b7c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 01:10:39 -0300
Subject: [PATCH 2024/3458] saml2aws: update to 2.28.2.

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

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 7809c2a74697..89bfbcc6ebe3 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,9 +1,9 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.26.2
+version=2.28.2
 revision=1
 build_style=go
-go_import_path=github.com/Versent/saml2aws
+go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"
 go_ldflags="-X main.Version=${version}"
 hostmakedepends="git"
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=f7d5611ad1c9ceefeb705b2158fc4e3cce611985b64b835a83e18201a8fa902d
+checksum=d20f1f8b82b3621dccab216ab763058fd28762836dae6cf650cf9e08b41120ac
 
 post_install() {
 	vlicense LICENSE.md

From 4b82d31f7b7ab20b45ef05d50ba5b017d0f6221e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 21 Feb 2021 21:32:12 +0100
Subject: [PATCH 2025/3458] spin2cpp: install version.h for flexprop

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

diff --git a/srcpkgs/spin2cpp/template b/srcpkgs/spin2cpp/template
index d6a0d7f1551c..3771aca670f9 100644
--- a/srcpkgs/spin2cpp/template
+++ b/srcpkgs/spin2cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'spin2cpp'
 pkgname=spin2cpp
 version=5.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="bison"
 short_desc="Converting languages for the Parallax Inc. Propeller 1 and 2"
@@ -18,14 +18,16 @@ do_check() {
 }
 
 do_install() {
-	vmkdir usr/bin
 	vmkdir usr/libexec/p2tools/bin
+	vcopy include usr/libexec/p2tools
+	vcopy doc usr/libexec/p2tools
+	vmkdir usr/libexec/p2tools/spin2cpp
+	vinstall version.h 644 usr/libexec/p2tools/spin2cpp
+
+	vmkdir usr/bin
 	for f in flexcc flexspin spin2cpp; do
 		vinstall build/$f 755 usr/libexec/p2tools/bin/
 		ln -s /usr/libexec/p2tools/bin/$f ${DESTDIR}/usr/bin/
 	done
-	vmkdir usr/libexec/p2tools
-	vcopy include usr/libexec/p2tools
-	vcopy doc usr/libexec/p2tools
 	vlicense COPYING
 }

From 1c3248fa780ed2915cba5b0e615aefd3c1b0160c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 21 Feb 2021 22:09:27 +0100
Subject: [PATCH 2026/3458] New package: flexprop-5.1.1

---
 srcpkgs/flexprop/template | 46 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 srcpkgs/flexprop/template

diff --git a/srcpkgs/flexprop/template b/srcpkgs/flexprop/template
new file mode 100644
index 000000000000..248d38e100ad
--- /dev/null
+++ b/srcpkgs/flexprop/template
@@ -0,0 +1,46 @@
+# Template file for 'flexprop'
+pkgname=flexprop
+version=5.1.1
+revision=1
+hostmakedepends="loadp2 which"
+makedepends="tk-devel"
+depends="loadp2 tk xterm"
+short_desc="Simple GUI for creating applications on the Parallax Propeller 2"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="MIT"
+homepage="https://github.com/totalspectrum/flexprop/"
+distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
+checksum=65cf8b0cd04d439d3b694962579d2f44602cecfa7bd2dee24540be601cfa5f2a
+
+do_build() {
+	${CPP} -xc++ -I /usr/libexec/p2tools -DTCL_SRC < version.inp > src/version.tcl
+}
+
+do_install() {
+	vinstall flexprop.tcl 755 usr/libexec/p2tools
+	# Install a copy of the examples
+	vcopy samples usr/libexec/p2tools
+	# Let's use the system provided tcl/tk instead
+	rm -rf src/tcl_library
+	# No need for flexprop.c which is a Windows source file
+	rm -f src/flexprop.c
+	# Install a copy of the tcl/tk source scripts
+	vcopy src usr/libexec/p2tools
+
+	# Create a wrapper script to run flexprop
+	vmkdir usr/bin
+	cat >${DESTDIR}/usr/bin/flexprop <<EOF
+#!/bin/bash
+# Wrapper to run flexprop.tcl
+if [ ! -d "\$HOME/.local/share/p2tools" ]; then
+	echo "Installing a copy of the examples in \$HOME/.local/share/p2tools ..."
+	mkdir -p \$HOME/.local/share/p2tools
+	cp -a /usr/libexec/p2tools/samples \$HOME/.local/share/p2tools
+fi
+cd \$HOME/.local/share/p2tools
+export SOURCE=/usr/libexec/p2tools/src
+exec /usr/bin/wish /usr/libexec/p2tools/flexprop.tcl
+EOF
+	chmod 755 ${DESTDIR}/usr/bin/flexprop
+	vlicense License.txt LICENSE
+}

From 6af33db62ebaf16a072daf0a25c07be6626d40c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 22 Feb 2021 00:30:22 +0100
Subject: [PATCH 2027/3458] loadp2: revbump to build spin2cpp on aarch64-musl

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

diff --git a/srcpkgs/loadp2/template b/srcpkgs/loadp2/template
index 9118f63a0a92..02a982ce0a95 100644
--- a/srcpkgs/loadp2/template
+++ b/srcpkgs/loadp2/template
@@ -1,7 +1,7 @@
 # Template file for 'loadp2'
 pkgname=loadp2
 version=045
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="spin2cpp"
 depends="spin2cpp"

From f5ac7d00ecb173c0a9334c838effd37d6096caa8 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, 22 Feb 2021 07:45:47 +0700
Subject: [PATCH 2028/3458] nfs-utils: fix -Wformat

---
 srcpkgs/nfs-utils/patches/printf-format.patch | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 srcpkgs/nfs-utils/patches/printf-format.patch

diff --git a/srcpkgs/nfs-utils/patches/printf-format.patch b/srcpkgs/nfs-utils/patches/printf-format.patch
new file mode 100644
index 000000000000..b8ae217cbfdc
--- /dev/null
+++ b/srcpkgs/nfs-utils/patches/printf-format.patch
@@ -0,0 +1,44 @@
+Index: utils/nfsdcltrack/nfsdcltrack.c
+===================================================================
+--- a/utils/nfsdcltrack/nfsdcltrack.c
++++ b/utils/nfsdcltrack/nfsdcltrack.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <inttypes.h>
+ #include <stdbool.h>
+ #include <getopt.h>
+ #include <string.h>
+@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr)
+ 	if (*tail)
+ 		return -EINVAL;
+ 
+-	xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
++	xlog(D_GENERAL, "%s: grace done. gracetime=%" PRId64, __func__, (int64_t)gracetime);
+ 
+ 	ret = sqlite_remove_unreclaimed(gracetime);
+ 
+Index: utils/nfsdcltrack/sqlite.c
+===================================================================
+--- a/utils/nfsdcltrack/sqlite.c
++++ b/utils/nfsdcltrack/sqlite.c
+@@ -40,6 +40,7 @@
+ 
+ #include <dirent.h>
+ #include <errno.h>
++#include <inttypes.h>
+ #include <stdio.h>
+ #include <stdbool.h>
+ #include <string.h>
+@@ -544,8 +545,8 @@ sqlite_remove_unreclaimed(time_t grace_s
+ 	int ret;
+ 	char *err = NULL;
+ 
+-	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
+-			grace_start);
++	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %" PRId64,
++			(int64_t)grace_start);
+ 	if (ret < 0) {
+ 		return ret;
+ 	} else if ((size_t)ret >= sizeof(buf)) {

From e741f528d3b6a5327edc54ba7f855b1fa7903f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 22 Feb 2021 08:19:21 +0100
Subject: [PATCH 2029/3458] coturn: fix libdir

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

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db50..0da549c66d1b 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -3,6 +3,7 @@ pkgname=coturn
 version=4.5.1.3
 revision=1
 build_style=gnu-configure
+configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
 makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
@@ -43,7 +44,7 @@ coturn-devel_package() {
 	short_desc="${short_desc} - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/lib/*.a
+		vmove "usr/lib/*.a"
 		vmove usr/include
 	}
 }

From 9aa14d0b226e7d54fe34f4b8d9771d09f7ebb10e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 22 Feb 2021 08:33:31 +0100
Subject: [PATCH 2030/3458] cc65: (sometimes) fails w/ parallel builds

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

diff --git a/srcpkgs/cc65/template b/srcpkgs/cc65/template
index 60b0aefde990..bb31b4ad323a 100644
--- a/srcpkgs/cc65/template
+++ b/srcpkgs/cc65/template
@@ -11,6 +11,7 @@ homepage="https://cc65.github.io/"
 distfiles="https://github.com/cc65/cc65/archive/V${version}.tar.gz"
 checksum=d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab
 nocross="Build process runs the built binary"
+disable_parallel_build=yes
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) broken="../libwrk/apple2enh/dbg.s(675): Error: Newline in string constant";;

From 768013c6f921e08216c001f1c303601352a0631d Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Sun, 21 Feb 2021 11:15:13 +1100
Subject: [PATCH 2031/3458] New package: zeroc-mcpp-2.7.2.14

---
 .../zeroc-mcpp/patches/Makefile-install.diff  | 18 ++++++++++++++++
 srcpkgs/zeroc-mcpp/template                   | 21 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 srcpkgs/zeroc-mcpp/patches/Makefile-install.diff
 create mode 100644 srcpkgs/zeroc-mcpp/template

diff --git a/srcpkgs/zeroc-mcpp/patches/Makefile-install.diff b/srcpkgs/zeroc-mcpp/patches/Makefile-install.diff
new file mode 100644
index 000000000000..0c3e248e414c
--- /dev/null
+++ b/srcpkgs/zeroc-mcpp/patches/Makefile-install.diff
@@ -0,0 +1,18 @@
+diff --git a/Makefile b/Makefile
+index bfbf543..9fa6deb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,9 +55,11 @@ $(LIBDIR)/libmcpp.a: $(OBJS)
+ 	$(AR) rcs $(LIBDIR)/libmcpp.a $(OBJS)
+ 
+ install: $(LIBDIR)/libmcpp.a
+-	@mkdir -p $(PREFIX)/$(LIBDIR)
+-	cp $(LIBDIR)/libmcpp.a $(PREFIX)/$(LIBDIR)
++	install -Dm644 $(LIBDIR)/libmcpp.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libmcpp.a
++	install -Dm644 mcpp_lib.h $(DESTDIR)$(PREFIX)/include/mcpp_lib.h
++	install -m644 mcpp_out.h $(DESTDIR)$(PREFIX)/include/mcpp_out.h
+ 
++.PHONY: clean
+ clean:
+ 	rm -f $(OBJS)
+ 	rm -rf $(LIBDIR)
diff --git a/srcpkgs/zeroc-mcpp/template b/srcpkgs/zeroc-mcpp/template
new file mode 100644
index 000000000000..497813ba0e04
--- /dev/null
+++ b/srcpkgs/zeroc-mcpp/template
@@ -0,0 +1,21 @@
+# Template file for 'zeroc-mcpp'
+pkgname=zeroc-mcpp
+version=2.7.2.14
+revision=1
+wrksrc="mcpp-${version}"
+build_style=gnu-makefile
+make_build_args="LIBDIR=lib"
+make_install_args="LIBDIR=lib"
+short_desc="Simplified fork of mcpp from ZeroC, for building ICE"
+maintainer="a dinosaur <nick@a-dinosaur.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/zeroc-ice/mcpp"
+distfiles="https://github.com/zeroc-ice/mcpp/archive/v${version}.tar.gz"
+checksum=1a426cf2d513ffd66634384d5445dcce1aac83be1789a56044013eab8ca8ffff
+nostrip=yes
+conflicts=mcpp-devel
+patch_args="-Np1"
+
+post_install() {
+	vlicense LICENSE
+}

From 55814746343d7a1b36ab5160b6a09ecb7827430e Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Sun, 21 Feb 2021 11:17:00 +1100
Subject: [PATCH 2032/3458] Ice: update to 3.7.5

Continuation of my work at #28422

Upstream mcpp is abandonware and is missing features newer versions of Ice
need to build. There are supposedly patches applicable to the official mcpp
that allows it to work but I couldn't see links to any (I'm guessing they live
in distros). Instead I tried packaging ZeroC's officially maintained stripped
down library only version (see previous commit e617a384).

Tests have been disabled because they take a disgustingly long time to build
and have to be hand blacklisted to the ones that don't fail on each platform.
I tested this package by building and running Murmur from the `mumble` package.

Almost all of the patches had completely bit-rotted, I salvaged a few that was
still relevant but the rest had to be thrown away. I made the changes
necessary to cross-compile to aarch64-musl but the result untested as I don't
have any exotic systems to test with (`mumble` was built for aarch64-musl
as well).
---
 common/shlibs                      | 29 +++++-----
 srcpkgs/Ice/patches/archs.patch    | 62 --------------------
 srcpkgs/Ice/patches/fix-musl.patch | 24 ++++----
 srcpkgs/Ice/patches/libressl.patch | 37 ------------
 srcpkgs/Ice/template               | 90 ++++++++++--------------------
 5 files changed, 58 insertions(+), 184 deletions(-)
 delete mode 100644 srcpkgs/Ice/patches/archs.patch
 delete mode 100644 srcpkgs/Ice/patches/libressl.patch

diff --git a/common/shlibs b/common/shlibs
index fd1a20b0f649..f3501f37dac3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -961,19 +961,22 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.7 kdecoration-5.18.0_1
-libGlacier2.so.35 libIce-3.5.0_1
-libIce.so.35 libIce-3.5.0_1
-libIceSSL.so.35 libIce-3.5.0_1
-libIceUtil.so.35 libIce-3.5.0_1
-libIceStormService.so.35 libIce-3.5.0_1
-libIceStorm.so.35 libIce-3.5.0_1
-libFreeze.so.35 libIce-3.5.0_1
-libSlice.so.35 libIce-3.5.0_1
-libIceBox.so.35 libIce-3.5.0_1
-libIceGrid.so.35 libIce-3.5.0_1
-libIcePatch2.so.35 libIce-3.5.0_1
-libIceDB.so.35 libIce-3.5.0_1
-libIceXML.so.35 libIce-3.5.0_1
+libGlacier2.so.37 libIce-3.7.5_1
+libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_1
+libIce.so.37 libIce-3.7.5_1
+libIceSSL.so.37 libIce-3.7.5_1
+libIceUtil.so.37 libIce-3.7.5_1
+libIceStormService.so.37 libIce-3.7.5_1
+libIceStorm.so.37 libIce-3.7.5_1
+libFreeze.so.37 libIce-3.7.5_1
+libSlice.so.37 libIce-3.7.5_1
+libIceBox.so.37 libIce-3.7.5_1
+libIceGrid.so.37 libIce-3.7.5_1
+libIcePatch2.so.37 libIce-3.7.5_1
+libIceDB.so.37 libIce-3.7.5_1
+libIceXML.so.37 libIce-3.7.5_1
+libIceDiscovery.so.37 libIce-3.7.5_1
+libIceLocatorDiscovery.so.37 libIce-3.7.5_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
diff --git a/srcpkgs/Ice/patches/archs.patch b/srcpkgs/Ice/patches/archs.patch
deleted file mode 100644
index 2c1f9c5d7e79..000000000000
--- a/srcpkgs/Ice/patches/archs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- cpp/include/IceUtil/Config.h
-+++ cpp/include/IceUtil/Config.h
-@@ -20,31 +20,28 @@
- # include <endian.h>
- #endif
- 
--#if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
--    defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
--    defined(__ARMEL__) || defined(_M_ARM_FP) || \
--    defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
--#   define ICE_LITTLE_ENDIAN
--#elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
--      defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
--      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
--#   define ICE_BIG_ENDIAN
--#else
--#   error "Unknown architecture"
-+#if defined(HAVE_ENDIAN_H)
-+#  include <endian.h>
-+#  if __BYTE_ORDER==__LITTLE_ENDIAN
-+#    define ICE_LITTLE_ENDIAN
-+#  elif __BYTE_ORDER==__BIG_ENDIAN
-+#    define ICE_BIG_ENDIAN
-+#  else
-+#    error "Unknown endian type"
-+#  endif
- #endif
- 
- //
- // 32 or 64 bit mode?
- //
--#if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
--      defined(__linux) && defined(__x86_64)                        || \
--      defined(__hppa) && defined(__LP64__)                         || \
--      defined(_ARCH_COM) && defined(__64BIT__)                     || \
--      defined(__alpha__)                                           || \
--      defined(_WIN64)
--#   define ICE_64
--#else
--#   define ICE_32
-+#if defined(HAVE_LIMITS_H)
-+#   include <stdint.h>
-+#   include <limits.h>
-+#   if __WORDSIZE == 64
-+#      define ICE_64
-+#   else
-+#      define ICE_32
-+#   endif
- #endif
- 
- //
---- cpp/src/IceUtil/Makefile
-+++ cpp/src/IceUtil/Makefile
-@@ -41,7 +41,7 @@
- include $(top_srcdir)/config/Make.rules
- 
- CPPFLAGS        := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I..
--LINKWITH        := $(ICEUTIL_OS_LIBS)
-+LINKWITH        := $(ICEUTIL_OS_LIBS) -lrt
- 
- ifeq ($(STATICLIBS),yes)
- $(libdir)/$(LIBNAME): $(OBJS)
diff --git a/srcpkgs/Ice/patches/fix-musl.patch b/srcpkgs/Ice/patches/fix-musl.patch
index c03824b70f5f..8f2efa550eae 100644
--- a/srcpkgs/Ice/patches/fix-musl.patch
+++ b/srcpkgs/Ice/patches/fix-musl.patch
@@ -1,11 +1,13 @@
---- cpp/include/IceUtil/Mutex.h.orig	2016-03-27 17:49:17.579001730 +0200
-+++ cpp/include/IceUtil/Mutex.h	2016-03-27 17:51:56.591989829 +0200
-@@ -231,7 +231,7 @@ Mutex::init(MutexProtocol
-     // Enable mutex error checking in debug builds
-     //
- #ifndef NDEBUG
--#if defined(__linux) && !defined(__USE_UNIX98)
-+#if defined(__linux) && !defined(__USE_UNIX98) && defined(PTHREAD_MUTEX_ERRORCHECK_NP)
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
- #else
-     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp
+index 266942bb3d..3ef50c30b0 100644
+--- a/cpp/src/IceUtil/UtilException.cpp
++++ b/cpp/src/IceUtil/UtilException.cpp
+@@ -43,7 +43,7 @@
+ #       endif
+ #   endif
+ 
+-#   if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS)
++#   if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS) && defined(__GLIBC__)
+ #       include <execinfo.h>
+ #       include <cxxabi.h>
+ #       include <stdint.h>
diff --git a/srcpkgs/Ice/patches/libressl.patch b/srcpkgs/Ice/patches/libressl.patch
deleted file mode 100644
index 6b56ecc63e49..000000000000
--- a/srcpkgs/Ice/patches/libressl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- cpp/src/Glacier2/CryptPermissionsVerifierI.cpp.orig	2014-07-15 16:06:05.470463382 +0200
-+++ cpp/src/Glacier2/CryptPermissionsVerifierI.cpp	2014-07-15 16:09:18.591065235 +0200
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <Glacier2/CryptPermissionsVerifierI.h>
-+#include <openssl/opensslv.h>
- #include <openssl/des.h>
- 
- using namespace std;
---- cpp/src/IceGrid/RegistryI.cpp.orig	2014-07-15 16:10:22.943599009 +0200
-+++ cpp/src/IceGrid/RegistryI.cpp	2014-07-15 16:10:40.950748368 +0200
-@@ -40,6 +40,7 @@
- 
- #include <fstream>
- 
-+#include <openssl/opensslv.h>
- #include <openssl/des.h> // For crypt() passwords
- 
- #include <sys/types.h>
---- cpp/src/IceSSL/Instance.cpp.orig	2014-07-15 15:59:44.430302828 +0200
-+++ cpp/src/IceSSL/Instance.cpp	2014-07-15 16:02:59.590921603 +0200
-@@ -274,12 +274,14 @@ IceSSL::Instance::Instance(const Communi
-             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
-             if(!entropyDaemon.empty())
-             {
-+#ifdef HAVE_SSL_RAND_EGD
-                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
-                 {
-                     PluginInitializationException ex(__FILE__, __LINE__);
-                     ex.reason = "IceSSL: EGD failure using file " + entropyDaemon;
-                     throw ex;
-                 }
-+#endif
-             }
- #endif
-             if(!RAND_status())
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74e..b9092cd56396 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,86 +1,54 @@
 # Template file for 'Ice'
 pkgname=Ice
-version=3.5.1
-revision=22
-build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+version=3.7.5
+revision=1
+wrksrc="ice-${version}"
+build_style=gnu-makefile
+make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
+ USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
+make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
+makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
+ libressl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only, ICE"
-homepage="http://www.zeroc.com"
-distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
-python_version=2 #unverified
+maintainer="a dinosaur <nick@a-dinosaur.com>"
+license="GPL-2.0-only, custom:ICE"
+homepage="https://www.zeroc.com"
+distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz"
+checksum=36bf45591a95e6ee7216153d45d8eca05ff00c1da35608f0c400e6ddc8049da9
+patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
-	# Cross build requires the host's slice2cpp and slice2freeze
+	# Cross build requires the host's slice2cpp
 	hostmakedepends+=" Ice"
 fi
 
 do_configure() {
-	sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules
-	sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules
-	sed -i '/^embedded_runpath_prefix*/d' config/Make.rules
-	sed -i -e 's|x)/man/man1|x)/share/man/man1|' config/Make.rules
-	sed -i -e "s|test demo||" Makefile
+	# Disable building tests
+	vsed 's|include \$(top_srcdir)/config/Make.tests.rules||' -i config/Make.rules
 
-	# Simple fixes for musl libc instead of a proper patch
-	sed -i -e 's|__GNUC__|__GLIBC__|' src/IceUtil/Exception.cpp
-	sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|' src/IceUtil/RecMutex.cpp
-	sed -i -e 's|sys/poll\.h|poll.h|' src/Ice/*.h
+	# Disable errors on warnings
+	vsed 's|-Werror|-Wno-error|' -i config/Make.rules.Linux
+
+	# Patch to fix finding editline
+	vsed 's|-ledit|-leditline|' -i config/Make.rules.Linux
+	vsed 's|editline/readline.h|editline.h|' -i cpp/src/IceStorm/Parser.cpp cpp/src/IceGrid/Parser.cpp
 
-	# Patch to find our $CXX and always use our $CXXFLAGS
-	sed -i config/Make.rules.Linux \
-		-e "s|= g++|= ${CXX}|" \
-		-e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \
-		-e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \
-		-e "s|\$(CXX) -shared|${CXX} -shared|" \
-		-e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \
-		-e "s|-Werror|-Wno-error|"
-	# Fix cross building
 	if [ "$CROSS_BUILD" ]; then
-		# Use host's slice2cpp and slice2freeze
-		sed -i config/Make.rules \
-			-e 's|$(SLICE2CPP) $(SLICE2CPPFLAGS)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2cpp $(SLICE2CPPFLAGS)|'
-		find . -name Makefile -exec sed -i "{}" \
-			-e 's|^\(\s\)$(SLICE2FREEZE)|\1LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			-e '/SLICE2FREEZECMD\s=/ s|$(SLICE2FREEZE)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \
-			\;
+		# Use host's slice2cpp
+		vsed -i config/Make.project.rules \
+			-e 's/$($6_path) |/|/' \
+			-e 's|$(Q)$($6_path)|$(Q)/usr/bin/slice2cpp|'
 	fi
 }
 
-do_build() {
-	export CXXFLAGS+=" -fPIC -DPIC"
-	make prefix=/usr ${makejobs}
-}
-
-do_install() {
-	case "$XBPS_MACHINE" in
-		x86_64*)
-			vmkdir usr/lib
-			ln -s lib ${DESTDIR}/usr/lib64
-			;;
-	esac
-	make prefix=${DESTDIR}/usr install
-	[ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64
-
-	mv ${DESTDIR}/usr/slice ${DESTDIR}/usr/share
-	rm ${DESTDIR}/usr/LICENSE ${DESTDIR}/usr/ICE_LICENSE
-	rm ${DESTDIR}/usr/CHANGES ${DESTDIR}/usr/RELEASE_NOTES
-	cd ${wrksrc}
+post_install() {
 	vlicense ICE_LICENSE
-	vdoc CHANGES
-	vdoc RELEASE_NOTES
-
-	# remove unused cruft
-	rm -f ${DESTDIR}/usr/lib/*.class
 }
 
 libIce_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove usr/lib/Ice
 	}
 }
 

From 5b70cdd409b9dd4e90ae712947f589b40a90e847 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Sun, 21 Feb 2021 14:57:53 +1100
Subject: [PATCH 2033/3458] mumble: revbump for Ice-3.7.5

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

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index d63df7bd4c15..db23e747ecfb 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=2
+revision=3
 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

From f7126243ed923c2b94258f88aa5ab41d3bac9227 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 11:36:43 +0100
Subject: [PATCH 2034/3458] openjdk11: fix update check

---
 srcpkgs/openjdk11/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/openjdk11/update

diff --git a/srcpkgs/openjdk11/update b/srcpkgs/openjdk11/update
new file mode 100644
index 000000000000..a4ed7b4e4ea8
--- /dev/null
+++ b/srcpkgs/openjdk11/update
@@ -0,0 +1,2 @@
+site="http://hg.openjdk.java.net/jdk-updates/jdk11u/tags"
+pattern='jdk-\K11\.[\d.+]+'

From b2b48f02a77b7bda57e6ee558ba75f79e69c65b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 18 Feb 2021 13:32:24 -0500
Subject: [PATCH 2035/3458] zfs: update to 2.0.3.

Closes: #28862 [via git-merge-pr]
---
 srcpkgs/zfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 544f80c8658f..fd1f66f8bd1d 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.0.2
+version=2.0.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,7 +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=bde5067ce4577d26cc0f0313a09173ad40d590d01539b92c93f33f06ee150b24
+checksum=0694f64aa76a3a0a506e20e99b49102c3cb68bef63cb0f0154e50befc387e539
 
 replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0
 

From 6271418bbb64637bf1a3a672c70d9f09b6b34d70 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Feb 2021 14:55:44 +0100
Subject: [PATCH 2036/3458] parallel: update to 20210222.

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

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 2d7cee4615c0..594eac9fbbf0 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20210122
+version=20210222
 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=b4f1b6d3de4aea71f7c763ae6ba80d5e499c12869b00b66904778546cdc7b3f3
+checksum=4e69b00aeb62f74ea2fdc6579d31d2b4a4cc0a64fe75cf61926312402f1be72b
 
 pre_configure() {
 	# no html and pdf doc

From 29e26fc6e3800167770a8c1b01bbf01b3e744463 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 22 Feb 2021 09:43:26 -0500
Subject: [PATCH 2037/3458] python3-cairocffi: update to 1.2.0.

---
 srcpkgs/python3-cairocffi/template | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-cairocffi/template b/srcpkgs/python3-cairocffi/template
index 4cbab0adc183..6d1c9db6e180 100644
--- a/srcpkgs/python3-cairocffi/template
+++ b/srcpkgs/python3-cairocffi/template
@@ -1,25 +1,29 @@
 # Template file for 'python3-cairocffi'
 pkgname=python3-cairocffi
-version=0.9.0
-revision=5
+version=1.2.0
+revision=1
 wrksrc="cairocffi-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-cffi"
+hostmakedepends="python3-setuptools python3-cffi python3-wheel"
 depends="python3-cffi cairo"
-checkdepends="cairo gdk-pixbuf"
+checkdepends="python3-pytest python3-numpy gdk-pixbuf $depends"
 short_desc="CFFI-based cairo bindings for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Kozea/cairocffi"
+changelog="https://raw.githubusercontent.com/Kozea/cairocffi/master/NEWS.rst"
 distfiles="${PYPI_SITE}/c/cairocffi/cairocffi-${version}.tar.gz"
-checksum=15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337
+checksum=9a979b500c64c8179fec286f337e8fe644eca2f2cd05860ce0b62d25f22ea140
 
-pre_check() {
-	export PY_IGNORE_IMPORTMISMATCH=1
-	vsed -e s/test_scaled_font/scaled_font/ -i build-2.7/lib/cairocffi/test_cairo.py
-	vsed -e s/test_context_font/context_font/ -i build-2.7/lib/cairocffi/test_cairo.py
+post_patch() {
+	vsed -e '/pytest-runner/d' -i setup.cfg
 }
 
+do_check() {
+	vsed -e '/addopts/d' -i setup.cfg
+	# Copy in $wrksrc lacks generated module; run against built copy
+	( cd build/lib* && python3 -m pytest )
+}
 
 post_install() {
 	vlicense LICENSE

From 22429a864a626db02d3d37f7f26b33e51a30cbc2 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Fri, 19 Feb 2021 07:48:26 -0800
Subject: [PATCH 2038/3458] opam: add dependency on bubblewrap.

[chris@cmbvm ~]$ opam init
[NOTE] Will configure from built-in defaults.
Checking for available remotes: rsync and local, git.
  - you won't be able to use mercurial repositories unless you install
    the hg     command on your system.
  - you won't be able to use darcs repositories unless you install
    the darcs     command on your system.

[ERROR] Missing dependencies -- the following commands are required
for opam to         operate:
  - bwrap: Sandboxing tool bwrap was not found. You should install
    'bubblewrap'. See
    https://opam.ocaml.org/doc/FAQ.html#Why-does-opam-require-bwrap.
---
 srcpkgs/opam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index be9a59f309bf..ec430863b4d1 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,13 +1,13 @@
 # Template file for 'opam'
 pkgname=opam
 version=2.0.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"
 make_check_target="tests"
 makedepends="curl ncurses-devel ocaml ocaml-findlib tar"
-depends="curl patch unzip"
+depends="bubblewrap curl patch unzip"
 checkdepends="${depends} git rsync"
 short_desc="OCaml package manager"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From ebb0eddf642b6c1da453c78e4d345a7b4e363e7f Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Mon, 22 Feb 2021 16:24:06 +0100
Subject: [PATCH 2039/3458] synapse: update to 1.27.0.

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 1258ebbd7d6a..f25d1f9f5838 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.26.0
+version=1.27.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=8e9c9aaf8fb89ca74b10fb4f2d1db61973c1d34c659939b16971417c8603e1ec
+checksum=d87ba2187210eff0571106315421a81b9bf5c5101deb5e6f849921ad28ff3f5a
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 23a04fea44f7b8b03bfdbf4d483212fcd9634453 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 21 Feb 2021 19:42:26 -0500
Subject: [PATCH 2040/3458] dijo: update to 0.2.6

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

diff --git a/srcpkgs/dijo/template b/srcpkgs/dijo/template
index d3eac02d4a26..08d72f127173 100644
--- a/srcpkgs/dijo/template
+++ b/srcpkgs/dijo/template
@@ -1,6 +1,6 @@
 # Template file for 'dijo'
 pkgname=dijo
-version=0.2.5
+version=0.2.6
 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=3e32e07e64af9b6c5c20a04c9c893accc8a95973df0ef519a096dd1c268eaef9
+checksum=3c52a1be40f93a42768dbde6df1d9258732b73052bfed7dc181671c875a3040b
 
 post_install() {
 	vlicense LICENSE

From 9c016268ef0a83436cd18e0807209009317341b6 Mon Sep 17 00:00:00 2001
From: saqfish <saqfish@gmail.com>
Date: Mon, 22 Feb 2021 03:59:13 -0600
Subject: [PATCH 2041/3458] xwallpaper: update to 0.6.6

Closes: #28968 [via git-merge-pr]
---
 srcpkgs/xwallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xwallpaper/template b/srcpkgs/xwallpaper/template
index 08d2fdd3cbed..05c6ecaf8f9a 100644
--- a/srcpkgs/xwallpaper/template
+++ b/srcpkgs/xwallpaper/template
@@ -1,6 +1,6 @@
 # Template file for 'xwallpaper'
 pkgname=xwallpaper
-version=0.6.5
+version=0.6.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
@@ -11,7 +11,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="ISC"
 homepage="https://github.com/stoeckmann/xwallpaper"
 distfiles="https://github.com/stoeckmann/xwallpaper/archive/v${version}.tar.gz"
-checksum=382929bba39ebc678d23f2ed0b5e9531898dd2f0ff167e2ab1560c9f4dc7896f
+checksum=8d56f573b5af8f04ec9260b0b2cc676a12489c0420820b868de187bdd11b6a16
 
 pre_configure() {
 	autoreconf -fiv

From 952f712d4ebc412bb3eb986da169c9845938ed24 Mon Sep 17 00:00:00 2001
From: saqfish <saqfish@gmail.com>
Date: Sun, 21 Feb 2021 23:04:45 -0600
Subject: [PATCH 2042/3458] sqlite: update to 3.34.1

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

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 77efa2cbe4dd..69ca9d872c14 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.34.0
+version=3.34.1
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -12,8 +12,8 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
-distfiles="${homepage}/2020/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=bf6db7fae37d51754737747aaaf413b4d6b3b5fbacd52bdb2d0d6e5b2edd9aee
+distfiles="${homepage}/2021/sqlite-autoconf-${_amalgamationver}.tar.gz"
+checksum=2a3bca581117b3b88e5361d0ef3803ba6d8da604b1c1a47d902ef785c1b53e89
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \

From 66754864ff7e963f7cd1380d9e408fa345522ae9 Mon Sep 17 00:00:00 2001
From: Harrison Thorne <harrisonthorne@protonmail.com>
Date: Wed, 18 Nov 2020 08:25:32 -0700
Subject: [PATCH 2043/3458] New package: tree-sitter-0.18.2.

By ericonr:
- move to 0.18.2
---
 common/shlibs                |  1 +
 srcpkgs/tree-sitter-devel    |  1 +
 srcpkgs/tree-sitter/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/tree-sitter-devel
 create mode 100644 srcpkgs/tree-sitter/template

diff --git a/common/shlibs b/common/shlibs
index f3501f37dac3..d86b7eddef0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3920,3 +3920,4 @@ 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
 libsword-1.8.1.so libsword-1.8.1_6
+libtree-sitter.so.0 tree-sitter-0.18.2_1
diff --git a/srcpkgs/tree-sitter-devel b/srcpkgs/tree-sitter-devel
new file mode 120000
index 000000000000..80b8bba47cab
--- /dev/null
+++ b/srcpkgs/tree-sitter-devel
@@ -0,0 +1 @@
+tree-sitter
\ No newline at end of file
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
new file mode 100644
index 000000000000..3a60fb91c29e
--- /dev/null
+++ b/srcpkgs/tree-sitter/template
@@ -0,0 +1,26 @@
+# Template file for 'tree-sitter'
+pkgname=tree-sitter
+version=0.18.2
+revision=1
+build_style=gnu-makefile
+short_desc="Parser generator tool and incremental parsing library"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="MIT"
+homepage="https://tree-sitter.github.io"
+distfiles="https://github.com/tree-sitter/${pkgname}/archive/v${version}.tar.gz"
+checksum=feedb3e77f7869baf3b242c586aa5be4277a049c6e0bc366ee5c6aeb4ba3da39
+
+post_install() {
+	vlicense LICENSE
+}
+
+tree-sitter-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 605615403285746abe3a3400004a276507986c06 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Feb 2021 11:11:07 -0600
Subject: [PATCH 2044/3458] New package: spotify-qt-3.4

---
 .../patches/fix-darkmode-toggle.patch         | 26 +++++++++++++++++++
 srcpkgs/spotify-qt/template                   | 13 ++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 srcpkgs/spotify-qt/patches/fix-darkmode-toggle.patch
 create mode 100644 srcpkgs/spotify-qt/template

diff --git a/srcpkgs/spotify-qt/patches/fix-darkmode-toggle.patch b/srcpkgs/spotify-qt/patches/fix-darkmode-toggle.patch
new file mode 100644
index 000000000000..dd63a2d4a45b
--- /dev/null
+++ b/srcpkgs/spotify-qt/patches/fix-darkmode-toggle.patch
@@ -0,0 +1,26 @@
+https://github.com/kraxarn/spotify-qt/commit/fe916f8976cca3983030e24d02d65e62893ad88d.patch
+
+From fe916f8976cca3983030e24d02d65e62893ad88d Mon Sep 17 00:00:00 2001
+From: kraxarn <me@kraxarn.com>
+Date: Sun, 7 Feb 2021 22:02:21 +0100
+Subject: [PATCH] Fix crash when toggling dark theme
+
+---
+ src/settingspage/interfacepage.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git src/settingspage/interfacepage.cpp src/settingspage/interfacepage.cpp
+index d809730..be16455 100644
+--- src/settingspage/interfacepage.cpp
++++ src/settingspage/interfacepage.cpp
+@@ -215,7 +215,9 @@ void InterfacePage::darkThemeToggle(bool checked)
+ 	if (checked)
+ 	{
+ 		itfStyle->setCurrentText("Fusion");
+-		itfIcFallback->setChecked(true);
++
++		if (itfIcFallback != nullptr)
++			itfIcFallback->setChecked(true);
+ 	}
+ 	else
+ 	{
diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
new file mode 100644
index 000000000000..ce964a0b71a1
--- /dev/null
+++ b/srcpkgs/spotify-qt/template
@@ -0,0 +1,13 @@
+# Template file for 'spotify-qt'
+pkgname=spotify-qt
+version=3.4
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-devel"
+makedepends="qt5-devel qt5-svg-devel"
+short_desc="Lightweight Spotify client using Qt"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/kraxarn/spotify-qt"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ceae5dec3aa31a3fbf6754a2c481dfc1b32b9f5e131007ec176f64a87a6e516e

From 3abfc9c9a50088d67afa84f33ae4dd5d8bc5191f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:12:36 -0300
Subject: [PATCH 2045/3458] bup: update to 0.32, switch to python3.

Also fix xbps-src check.

Co-authored-by: Enno Boland <gottox@voidlinux.org>
---
 srcpkgs/bup/patches/disable-git-call.patch | 13 +++++++------
 srcpkgs/bup/template                       | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/bup/patches/disable-git-call.patch b/srcpkgs/bup/patches/disable-git-call.patch
index 5468b5992f32..3abedea5aba0 100644
--- a/srcpkgs/bup/patches/disable-git-call.patch
+++ b/srcpkgs/bup/patches/disable-git-call.patch
@@ -1,13 +1,14 @@
 --- Makefile.orig	2016-05-25 16:57:27.966465927 +0200
 +++ Makefile	2016-05-25 16:57:32.091465618 +0200
 @@ -39,8 +39,8 @@ else
-   test_tmp := $(CURDIR)/t/tmp
+   test_tmp := $(CURDIR)/test/tmp
  endif
  
--initial_setup := $(shell ./configure-version --update $(isok))
--initial_setup := $(call shout,$(initial_setup),Version configuration failed))
-+#initial_setup := $(shell ./configure-version --update $(isok))
-+#initial_setup := $(call shout,$(initial_setup),Version configuration failed))
+-initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok))
+-initial_setup := $(call shout,$(initial_setup),update-checkout-info failed))
++#initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok))
++#initial_setup := $(call shout,$(initial_setup),update-checkout-info failed))
  
- config/config.vars: configure config/configure config/configure.inc \
+ config/config.vars: \
+   configure config/configure config/configure.inc \
    $(wildcard config/*.in)
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 8bec5f8bdc99..b40c3cddbf68 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -1,19 +1,24 @@
 # Template file for 'bup'
 pkgname=bup
-version=0.30
+version=0.32
 revision=1
 build_style=configure
-hostmakedepends="python perl git"
-makedepends="python-devel"
+hostmakedepends="python3 perl git"
+makedepends="python3-devel"
+checkdepends="python3-pytest tar rsync"
 short_desc="Backup system based on the git packfile format"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-only"
 homepage="https://github.com/bup/bup"
 distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
-checksum=5238f045c220278a165fff528ea32288f2752db2e1ac15704e849b71cddda0b2
-python_version=2 #unverified
+checksum=a894cfa96c44b9ef48003b2c2104dc5fa6361dd2f4d519261a93178984a51259
+python_version=3
 nocross=yes
 
 pre_configure() {
 	sed -i 's#^PREFIX=.*#PREFIX=/usr#' Makefile
 }
+
+do_check() {
+	./pytest -x --ignore-glob='test/ext/test-ls*'
+}

From 7312d969712dfdf4529ad4727aecccab581d4b61 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 22 Feb 2021 19:55:37 +0100
Subject: [PATCH 2046/3458] isync: update to 1.3.5.

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

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c97..a67f57ec57ce 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,6 +1,6 @@
 # Template file for 'isync'
 pkgname=isync
-version=1.3.4
+version=1.3.5
 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=e8eb449c46e53910bb56a71b1bdc8bfe9aad9ad8e5cab4affba1368dc3c72e71
+checksum=68f532e5dcd434b02b873d920323ebc9a8a7d87f119f7cc050365dc014cf7655
 
 post_install() {
 	vsconf src/mbsyncrc.sample

From f1983473e4b639d5356195f51f6e5c8efd35de23 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 19 Feb 2021 00:56:14 -0800
Subject: [PATCH 2047/3458] python3-pytest-mock: update to 3.5.1

Breaking changes:
drop deprecated mock alias to mocker
drop python 2.7 and 3.4 support
---
 srcpkgs/python3-pytest-mock/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index c1dc81830092..43ce2c842703 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-mock'
 pkgname=python3-pytest-mock
-version=1.10.4
-revision=4
+version=3.5.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,10 +12,14 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pytest-mock/"
 distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
-checksum=5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568
+checksum=a1e2aba6af9560d313c642dae7e00a2a12b022b80301d9d7fc8ec6858e1dd9fc
+
+# pytest-mock requires pytest-mock to be installed so it'll always fail during
+# packaging
+make_check=no
 
 pre_build() {
-	sed -i setup.py \
+	vsed -i setup.py \
 		-e '/setup_requires=/d' \
 		-e "s|use_scm_version=.*|version='${version}',|"
 }

From 4d0ac05a8b9408176842b01c2d98131492b2d3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 17:27:45 -0300
Subject: [PATCH 2048/3458] tox: exclude poetry test.

This test stoppped tox from successfully completing its test suite.
---
 srcpkgs/tox/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8e6a6daa8efb..8f0aada772c5 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -24,7 +24,8 @@ do_check() {
 			and not test_tox_quickstart_script \
 			and not test_provision_cli_args_ignore \
 			and not test_provision_interrupt_child \
-			and not test_provision_non_canonical_dep"
+			and not test_provision_non_canonical_dep \
+			and not test_package_poetry"
 }
 
 post_install() {

From 4bd2c88fb284f39b77b5e81f0b83ff8b9654cbaa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Feb 2021 13:14:19 -0600
Subject: [PATCH 2049/3458] bpytop: update to 1.0.63.

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

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index ef48c813d33e..734197029833 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.62
+version=1.0.63
 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=a8e731dfb70d2fad3202e124d815c68dca327ebeebc5c30292964fd737e7cd41
+checksum=a543d8e0e342c03c7c235d468d116c501312a9c7f389e7d82d7931392a067c33
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From 1007726d23b5224e950f76155760ed195020c423 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Feb 2021 13:18:01 -0600
Subject: [PATCH 2050/3458] downloader-cli: ignore ancient date based versions

---
 srcpkgs/downloader-cli/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/downloader-cli/update

diff --git a/srcpkgs/downloader-cli/update b/srcpkgs/downloader-cli/update
new file mode 100644
index 000000000000..034b9c1c87ac
--- /dev/null
+++ b/srcpkgs/downloader-cli/update
@@ -0,0 +1 @@
+ignore=2019*

From 1e0382b3bd64cedcf47c438c0fddbe5cdeab8184 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 17 Feb 2021 00:45:20 +0100
Subject: [PATCH 2051/3458] volctl: update to 0.8.2.

---
 srcpkgs/volctl/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 0b4dc7d4409c..294de567a6fb 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,13 +1,19 @@
 # Template file for 'volctl'
 pkgname=volctl
-version=0.8.0
-revision=2
+version=0.8.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-gobject desktop-file-utils"
-short_desc="Lightweight volume control for pulseaudio that sits in your systray"
+depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-yaml python3-click"
+checkdepends="${depends} dbus pulseaudio xvfb-run"
+short_desc="Lightweight volume control for pulseaudio in your systray"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://buzz.github.io/volctl/"
 distfiles="https://github.com/buzz/volctl/archive/v${version}.tar.gz"
-checksum=01d021f244982a8bc827574f778a49864e937ca53310e03ec1386587bf8fb9b4
+checksum=8e744fe0e92f00451983e4fffa079d4d5354a8f96f6bcf8d15da44a18dc556f5
+
+# There are no tests definded. If they ever add tests, we'll be ready to run them
+do_check() {
+	xvfb-run dbus-run-session python setup.py test
+}

From 78f650d131311390c05c5413c2015c4dd12dbc85 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 22 Feb 2021 13:34:19 -0600
Subject: [PATCH 2052/3458] libredwg: update to 0.12.2.

Also ignore nightly tags in version checks.
---
 srcpkgs/libredwg/template | 4 ++--
 srcpkgs/libredwg/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libredwg/update

diff --git a/srcpkgs/libredwg/template b/srcpkgs/libredwg/template
index ed71218f8dd8..f25e84658d2d 100644
--- a/srcpkgs/libredwg/template
+++ b/srcpkgs/libredwg/template
@@ -1,6 +1,6 @@
 # Template file for 'libredwg'
 pkgname=libredwg
-version=0.12.1
+version=0.12.2
 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=f9fcdc6f66417c091a5887925b10cdc651403d323754b9196c52b5968fba0fdc
+checksum=9227f4cb8a4aa1b785038e2c583affe0d84194c97dca4794e143258b0302fb85
 
 post_install() {
 	rm ${DESTDIR}/usr/share/{dwgadd.example,load_dwg.py}
diff --git a/srcpkgs/libredwg/update b/srcpkgs/libredwg/update
new file mode 100644
index 000000000000..fc73838d751c
--- /dev/null
+++ b/srcpkgs/libredwg/update
@@ -0,0 +1 @@
+ignore="*.[0-9][0-9][0-9][0-9]"

From f99e8c5e7963d9b8c27209176fb24af92b25fa56 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 22 Feb 2021 21:12:11 +0100
Subject: [PATCH 2053/3458] xf86-video-mga: fix build

---
 .../patches/no-vbe-non-x86.patch              | 57 +++++++++++++++++++
 srcpkgs/xf86-video-mga/template               |  8 +--
 2 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch

diff --git a/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch b/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch
new file mode 100644
index 000000000000..19b0f9cfa447
--- /dev/null
+++ b/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch
@@ -0,0 +1,57 @@
+From 30449dfac037faebac42ddb4bf809e94412512cc Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Mon, 22 Feb 2021 21:08:26 +0100
+Subject: [PATCH] only attempt to use VBE on x86
+
+---
+ src/mga_driver.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git src/mga_driver.c src/mga_driver.c
+index 94183db..2aa0063 100644
+--- src/mga_driver.c
++++ src/mga_driver.c
+@@ -77,7 +77,9 @@
+ 
+ #include "xf86DDC.h"
+ 
++#if defined(__i386__) || defined(__x86_64__)
+ #include "vbe.h"
++#endif
+ 
+ #include "fb.h"
+ #include "dixstruct.h"
+@@ -1378,6 +1380,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
+ 					  pMga->ddc1Read ) ;
+ 		from = "DDC1";
+ 	    }
++#if defined(__i386__) || defined(__x86_64__)
+ 	if (!MonInfo){
+ 	    vbeInfoPtr pVbe;
+ 	    if (xf86LoadSubModule(pScrn, "vbe")) {
+@@ -1387,6 +1390,7 @@ MGAdoDDC(ScrnInfoPtr pScrn)
+ 		from = "VBE";
+ 	    }
+ 	}
++#endif
+     }
+ 
+     if (MonInfo) {
+@@ -1418,12 +1422,14 @@ MGAdoDDC(ScrnInfoPtr pScrn)
+ void
+ MGAProbeDDC(ScrnInfoPtr pScrn, int index)
+ {
++#if defined(__i386__) || defined(__x86_64__)
+     vbeInfoPtr pVbe;
+     if (xf86LoadSubModule(pScrn, "vbe")) {
+ 	pVbe = VBEInit(NULL,index);
+ 	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
+ 	vbeFree(pVbe); 
+     }
++#endif
+ }
+ 
+ Bool
+-- 
+2.30.1
+
diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template
index 23a5f463e2c3..26183e8236d9 100644
--- a/srcpkgs/xf86-video-mga/template
+++ b/srcpkgs/xf86-video-mga/template
@@ -1,7 +1,7 @@
 # Template file for 'xf86-video-mga'
 pkgname=xf86-video-mga
 version=2.0.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config xorg-util-macros"
 makedepends="xorg-server-devel"
@@ -17,12 +17,6 @@ lib32disabled=yes
 LDFLAGS="-Wl,-z,lazy"
 
 pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		i686*|x86_64*|aarch64*|ppc*)
-			sed -i 's/^DRI="no"/DRI="yes"/' configure.ac
-			;;
-		*) ;;
-	esac
 	autoreconf -if
 }
 post_install() {

From 565863b460beb307277951cccfd951db7d429a22 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 22 Feb 2021 21:18:18 +0100
Subject: [PATCH 2054/3458] xf86-video-cirrus: fix build

---
 .../patches/no-vbe-non-x86.patch              | 114 ++++++++++++++++++
 srcpkgs/xf86-video-cirrus/template            |   3 +-
 2 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch

diff --git a/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch b/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch
new file mode 100644
index 000000000000..46ee5637b1ba
--- /dev/null
+++ b/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch
@@ -0,0 +1,114 @@
+From d80ff575021b9ae5991435f07a7ce0a948bf4054 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Mon, 22 Feb 2021 21:16:35 +0100
+Subject: [PATCH] only attempt to use VBE on x86
+
+---
+ src/alp_driver.c | 8 ++++++++
+ src/cir_driver.c | 4 ++++
+ src/lg_driver.c  | 4 ++++
+ 3 files changed, 16 insertions(+)
+
+diff --git src/alp_driver.c src/alp_driver.c
+index bd5e52f..f478eb5 100644
+--- src/alp_driver.c
++++ src/alp_driver.c
+@@ -61,7 +61,9 @@
+ 
+ 
+ #include "xf86DDC.h"
++#if defined(__i386__) || defined(__x86_64__)
+ #include "xf86int10.h"
++#endif
+ 
+ #include "cir.h"
+ #define _ALP_PRIVATE_
+@@ -469,7 +471,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+ 	int depth_flags;
+ 	ClockRangePtr clockRanges;
+ 	char *s;
++#if defined(__i386__) || defined(__x86_64__)
+  	xf86Int10InfoPtr pInt = NULL;
++#else
++    void *pInt = NULL;
++#endif
+ 
+ 	if (flags & PROBE_DETECT)  {
+ 	  cirProbeDDC( pScrn, xf86GetEntityInfo(pScrn->entityList[0])->index );
+@@ -528,6 +534,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+     if (!xf86IsPc98())
+ #endif
++#if defined(__i386__) || defined(__x86_64__)
+     if (xf86LoadSubModule(pScrn, "int10"))
+     {
+ 	xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
+@@ -541,6 +548,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+ 	PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM), 0x10);
+ 	PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM), 0x14);
+     }
++#endif
+ 
+     /* Set pScrn->monitor */
+ 	pScrn->monitor = pScrn->confScreen->monitor;
+diff --git src/cir_driver.c src/cir_driver.c
+index 2df4a2e..d9c2f0c 100644
+--- src/cir_driver.c
++++ src/cir_driver.c
+@@ -31,7 +31,9 @@
+ #include "alp.h"
+ #include "lg.h"
+ 
++#if defined(__i386__) || defined(__x86_64__)
+ #include "vbe.h"
++#endif
+ 
+ /*
+  * Forward definitions for the functions that make up the driver.
+@@ -428,6 +430,7 @@ CirUnmapMem(CirPtr pCir, int scrnIndex)
+ _X_EXPORT void
+ cirProbeDDC(ScrnInfoPtr pScrn, int index)
+ {
++#if defined(__i386__) || defined(__x86_64__)
+     vbeInfoPtr pVbe;
+ 
+     if (xf86LoadSubModule(pScrn, "vbe")) {
+@@ -435,4 +438,5 @@ cirProbeDDC(ScrnInfoPtr pScrn, int index)
+         ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
+ 	vbeFree(pVbe);
+     }
++#endif
+ }
+diff --git src/lg_driver.c src/lg_driver.c
+index 589d14e..6bc3154 100644
+--- src/lg_driver.c
++++ src/lg_driver.c
+@@ -51,7 +51,9 @@
+ /* Needed by the Shadow Framebuffer */
+ #include "shadowfb.h"
+ 
++#if defined(__i386__) || defined(__x86_64__)
+ #include "xf86int10.h"
++#endif
+ 
+ #include "fb.h"
+ 
+@@ -388,6 +390,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+ 			      PCI_DEV_FUNC(pCir->PciInfo));
+ #endif
+ 
++#if defined(__i386__) || defined(__x86_64__)
+ 	if (xf86LoadSubModule(pScrn, "int10")) {
+ 	    xf86Int10InfoPtr int10InfoPtr;
+ 	    
+@@ -396,6 +399,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+ 	    if (int10InfoPtr)
+ 		xf86FreeInt10(int10InfoPtr);
+ 	}
++#endif
+ 
+ 	/* Set pScrn->monitor */
+ 	pScrn->monitor = pScrn->confScreen->monitor;
+-- 
+2.30.1
+
diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template
index d0f1fb9da2fd..1cef78742e86 100644
--- a/srcpkgs/xf86-video-cirrus/template
+++ b/srcpkgs/xf86-video-cirrus/template
@@ -1,7 +1,7 @@
 # Template build file for 'xf86-video-cirrus'.
 pkgname=xf86-video-cirrus
 version=1.5.3
-revision=6
+revision=7
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -15,6 +15,7 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
 checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab
 
 LDFLAGS="-Wl,-z,lazy"
+CFLAGS="-Wno-pointer-arith -Wno-discarded-qualifiers -Wno-unused-label"
 
 post_install() {
 	vlicense COPYING

From 9e30a7d9b72302a8782921813209313eca27e15b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 19 Feb 2021 21:23:04 +0100
Subject: [PATCH 2055/3458] xbps-src: fix XBPS_USE_BUILD_MTIME option

---
 xbps-src | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xbps-src b/xbps-src
index 06970629cc42..ecd389b93e17 100755
--- a/xbps-src
+++ b/xbps-src
@@ -634,7 +634,8 @@ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
     XBPS_KEEP_ALL XBPS_HOSTDIR XBPS_MASTERDIR XBPS_SRC_VERSION \
     XBPS_DESTDIR XBPS_MACHINE XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
     XBPS_LIBEXECDIR XBPS_DISTDIR XBPS_DISTFILES_MIRROR XBPS_ALLOW_RESTRICTED \
-    XBPS_USE_GIT_COMMIT_DATE XBPS_PKG_COMPTYPE XBPS_REPO_COMPTYPE XBPS_BUILDHELPERDIR
+    XBPS_USE_GIT_COMMIT_DATE XBPS_PKG_COMPTYPE XBPS_REPO_COMPTYPE \
+    XBPS_BUILDHELPERDIR XBPS_USE_BUILD_MTIME
 
 for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do
     eval val="\$XBPS_$i"

From 61749c70d05d0c96f6f5656d55ac94a6bba32121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 21:19:52 +0100
Subject: [PATCH 2056/3458] akonadi5: fix cross build

instead of hacking around to get a host protocolgen bin use qemu
---
 srcpkgs/akonadi5/patches/protocolgen-cross.patch | 13 -------------
 srcpkgs/akonadi5/template                        | 12 +-----------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 srcpkgs/akonadi5/patches/protocolgen-cross.patch

diff --git a/srcpkgs/akonadi5/patches/protocolgen-cross.patch b/srcpkgs/akonadi5/patches/protocolgen-cross.patch
deleted file mode 100644
index 4d2a204ce732..000000000000
--- a/srcpkgs/akonadi5/patches/protocolgen-cross.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/private/protocolgen/CMakeLists.txt	2018-01-09 20:34:31.345972552 +0100
-+++ src/private/protocolgen/CMakeLists.txt	2018-01-09 20:45:14.393984830 +0100
-@@ -1,5 +1,10 @@
- project(protocolgen)
- 
-+IF(CMAKE_CROSSCOMPILING)
-+	SET(CMAKE_CXX_COMPILER $ENV{CXX_host})
-+	SET(CMAKE_CXX_FLAGS $ENV{XBPS_CXXFLAGS})
-+ENDIF(CMAKE_CROSSCOMPILING)
-+
- set(protocolgen_SRCS
-     main.cpp
-     cppgenerator.cpp
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index b2b8229dd4c7..3f8ac46f58be 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -4,6 +4,7 @@ version=20.12.2
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
+build_helper="qemu"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  shared-mime-info libxslt pkg-config gettext"
 makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
@@ -33,17 +34,6 @@ pre_configure() {
 	fi
 }
 
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		sed -e "s?/usr/${XBPS_CROSS_TRIPLET}??g" \
-			-i build/src/private/protocolgen/CMakeFiles/protocolgen.dir/flags.make
-		sed -e "s?/usr/${XBPS_CROSS_TRIPLET}??g" \
-			-i build/src/private/protocolgen/CMakeFiles/protocolgen.dir/link.txt
-		sed -e 's!\&\& protocolgen!\&\& ../../bin/protocolgen!' \
-			-i build/src/private/CMakeFiles/generate_protocol.dir/build.make
-	fi
-}
-
 do_check() {
 	# failing tests are disabled - sqlite tests hang on futex
 	cd build

From dc76703ddeba863871f334f57535c0486f4373b9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 22 Feb 2021 22:37:26 +0100
Subject: [PATCH 2057/3458] xf86-video-mga: fix no-vbe patch for non-powerpc

---
 .../patches/no-vbe-non-x86.patch              | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch b/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch
index 19b0f9cfa447..6a505591d8ac 100644
--- a/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch
+++ b/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch
@@ -1,14 +1,15 @@
-From 30449dfac037faebac42ddb4bf809e94412512cc Mon Sep 17 00:00:00 2001
+From 9bbf539cee8b899c09454a433b8e6fca349400df Mon Sep 17 00:00:00 2001
 From: Daniel Kolesa <daniel@octaforge.org>
 Date: Mon, 22 Feb 2021 21:08:26 +0100
 Subject: [PATCH] only attempt to use VBE on x86
 
 ---
- src/mga_driver.c | 6 ++++++
- 1 file changed, 6 insertions(+)
+ src/mga_driver.c | 10 ++++++++--
+ src/mga_merge.c  |  2 +-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
 
 diff --git src/mga_driver.c src/mga_driver.c
-index 94183db..2aa0063 100644
+index 94183db..68f911f 100644
 --- src/mga_driver.c
 +++ src/mga_driver.c
 @@ -77,7 +77,9 @@
@@ -52,6 +53,37 @@ index 94183db..2aa0063 100644
  }
  
  Bool
+@@ -1905,7 +1911,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
+         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Enabling KVM\n");
+     }
+     
+-#if !defined(__powerpc__)
++#if defined(__i386__) || defined(__x86_64__)
+     pMga->softbooted = FALSE;
+     Default = (pMga->chip_attribs->dual_head_possible
+ 	       && !pMga->Primary && !pMga->SecondCrtc);
+@@ -2251,7 +2257,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
+      */
+     (*pMga->PreInit)(pScrn);
+ 
+-#if !defined(__powerpc__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+     /* Read and print the Monitor DDC info */
+     pScrn->monitor->DDC = MGAdoDDC(pScrn);
+diff --git src/mga_merge.c src/mga_merge.c
+index 64c85b4..62a6330 100644
+--- src/mga_merge.c
++++ src/mga_merge.c
+@@ -406,7 +406,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
+      */
+     (*pMga->PreInit)(pScrn);
+ 
+-#if !defined(__powerpc__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+     /* Read and print the Monitor DDC info */
+ /*    pScrn->monitor->DDC = MGAdoDDC(pScrn);*/ /*FIXME: have to try this*/
 -- 
 2.30.1
 

From 25a38af020443e0cf82ea563ef9f83a450b21880 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 10 Nov 2020 22:23:45 +0100
Subject: [PATCH 2058/3458] New package: redkite-1.3.0

---
 srcpkgs/redkite-devel    |  1 +
 srcpkgs/redkite/template | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/redkite-devel
 create mode 100644 srcpkgs/redkite/template

diff --git a/srcpkgs/redkite-devel b/srcpkgs/redkite-devel
new file mode 120000
index 000000000000..98f68eebb4c0
--- /dev/null
+++ b/srcpkgs/redkite-devel
@@ -0,0 +1 @@
+redkite
\ No newline at end of file
diff --git a/srcpkgs/redkite/template b/srcpkgs/redkite/template
new file mode 100644
index 000000000000..73b4783a00af
--- /dev/null
+++ b/srcpkgs/redkite/template
@@ -0,0 +1,22 @@
+# Template file for 'redkite'
+pkgname=redkite
+version=1.3.0
+revision=1
+build_style=cmake
+makedepends="cairo-devel"
+short_desc="GUI toolkit"
+maintainer="teldra <teldra@rotce.de>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/iurie-sw/redkite"
+distfiles="https://github.com/iurie-sw/redkite/archive/v${version}.tar.gz"
+checksum=f43fc88c18e4231a87b55f82c1f657188b435de425877706b788adf2f63f94e1
+make_check=extended # No target to "ninja test".
+
+redkite-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/include"
+		vmove "usr/lib"
+	}
+}

From b6fc75242e052ff02a8f4ba720c3134836a595ca Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 10 Nov 2020 22:24:10 +0100
Subject: [PATCH 2059/3458] New package: geonkick-2.7.0

closes https://github.com/void-linux/void-packages/issues/20957
---
 srcpkgs/geonkick/patches/musl.patch | 39 +++++++++++++++++++++++++++++
 srcpkgs/geonkick/template           | 24 ++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 srcpkgs/geonkick/patches/musl.patch
 create mode 100644 srcpkgs/geonkick/template

diff --git a/srcpkgs/geonkick/patches/musl.patch b/srcpkgs/geonkick/patches/musl.patch
new file mode 100644
index 000000000000..281752a92ecb
--- /dev/null
+++ b/srcpkgs/geonkick/patches/musl.patch
@@ -0,0 +1,39 @@
+diff --git dsp/src/compressor.h dsp/src/compressor.h
+index 2b246be..e6cac5d 100644
+--- dsp/src/compressor.h
++++ dsp/src/compressor.h
+@@ -26,6 +26,8 @@
+ 
+ #include "geonkick_internal.h"
+ 
++#include <pthread.h>
++
+ struct gkick_compressor {
+         int enabled;
+ 
+diff --git dsp/src/distortion.h dsp/src/distortion.h
+index 4e42f11..b06e6e5 100644
+--- dsp/src/distortion.h
++++ dsp/src/distortion.h
+@@ -26,6 +26,8 @@
+ 
+ #include "geonkick_internal.h"
+ 
++#include <pthread.h>
++
+ struct gkick_distortion {
+         int enabled;
+ 	/* Input limiter for distortion. */
+diff --git dsp/src/synthesizer.h dsp/src/synthesizer.h
+index 303f810..d4d4f9b 100644
+--- dsp/src/synthesizer.h
++++ dsp/src/synthesizer.h
+@@ -31,6 +31,8 @@
+ 
+ #include <stdatomic.h>
+ 
++#include <pthread.h>
++
+ struct gkick_synth {
+       	atomic_size_t id;
+         char name[30];
diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template
new file mode 100644
index 000000000000..e611fe0dd923
--- /dev/null
+++ b/srcpkgs/geonkick/template
@@ -0,0 +1,24 @@
+# Template file for 'geonkick'
+pkgname=geonkick
+version=2.7.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config tar xz redkite"
+makedepends="redkite-devel jack-devel libsndfile-devel rapidjson
+ lv2 libX11-devel cairo-devel"
+short_desc="Free software percussion synthesizer"
+maintainer="teldra <teldra@rotce.de>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/iurie-sw/geonkick"
+distfiles="https://github.com/iurie-sw/geonkick/archive/v${version}.tar.gz"
+checksum=c333da9f8db3eb71519a8920e8cc05525754c3a71f9c68ae16b55690d03fb9d4
+make_check=extended # No target to "ninja test".
+
+if [[ ! ${XBPS_TARGET_MACHINE} == "x86_64" ]]; then
+	configure_args+=" -DGKICK_ARCHITECTURE=$XBPS_TARGET_MACHINE"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
+fi

From cf7bf13be2b10b473fdc8b0cf9e6f763c7230691 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, 21 Feb 2021 19:15:59 +0700
Subject: [PATCH 2060/3458] ffmpeg: build -dbg package properly

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

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index ac6c52e96306..7a23a7900298 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=6
+revision=7
 short_desc="Decoding, encoding and streaming software"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
@@ -78,6 +78,7 @@ do_configure() {
 	esac
 
 	./configure --prefix=/usr --disable-debug --enable-gpl --enable-gnutls \
+		--disable-stripping \
 		--enable-libcdio --enable-version3 --enable-runtime-cpudetect \
 		--enable-libmp3lame --enable-libvorbis --enable-libxvid \
 		--enable-libx264 $(vopt_enable vpx libvpx) --enable-libtheora \
@@ -100,7 +101,6 @@ do_configure() {
 		$(vopt_if sofa '--enable-libmysofa')
 }
 do_build() {
-	rm ${XBPS_WRAPPERDIR}/strip
 	make ${makejobs}
 	make doc/ff{mpeg,play}.1
 }

From 0de981a4295a74da79f1c8719cac86c1dd740429 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, 21 Feb 2021 14:45:24 +0700
Subject: [PATCH 2061/3458] nss: update to 3.62.

---
 srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch | 12 ------------
 srcpkgs/nss/template                                 |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete 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
deleted file mode 100644
index 72fc5252cde3..000000000000
--- a/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 fbcdc67dc585..8ded0c7ae530 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.29
 
 pkgname=nss
-version=3.61
+version=3.62
 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=312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370
+checksum=86d6df7cece25b8d4efa53e4c19af903c484eb79871163f37b5232bb406a5478
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From c372f09ec2f25cfe0b5c3f18326c92dafdc2c5d1 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, 23 Feb 2021 07:28:16 +0700
Subject: [PATCH 2062/3458] lmms: requires fltk in build

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

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index 31c8a9dd7ba5..a5ce97ebc5c6 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -5,7 +5,8 @@ revision=5
 archs="~armv6*"
 build_style=cmake
 configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"
-hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules
+ fltk"
 makedepends="SDL_sound-devel fltk-devel fluidsynth-devel jack-devel ladspa-sdk
  lame-devel libsamplerate-devel libstk-devel portaudio-devel qt5-tools-devel
  qt5-x11extras-devel redland-devel xcb-util-devel xcb-util-keysyms-devel

From 192674ef779150fa0f1c6921033abdcf2533ab3b 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, 23 Feb 2021 08:01:27 +0700
Subject: [PATCH 2063/3458] liquid-dsp: fix build, for real this time

---
 .../liquid-dsp/patches/fix-make-install.patch | 51 +++++++++++++++++++
 srcpkgs/liquid-dsp/template                   |  1 -
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/liquid-dsp/patches/fix-make-install.patch

diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
new file mode 100644
index 000000000000..21705fc9ebf0
--- /dev/null
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -0,0 +1,51 @@
+Index: makefile.in
+===================================================================
+--- makefile.in.orig
++++ makefile.in
+@@ -47,10 +47,10 @@ VERSION		:= @PACKAGE_VERSION@
+ BUGREPORT	:= @PACKAGE_BUGREPORT@
+ 
+ # paths
+-srcdir		:= @srcdir@
+-libdir		:= @libdir@
+ prefix		:= @prefix@
+ exec_prefix	:= @exec_prefix@
++srcdir		:= @srcdir@
++libdir		:= @libdir@
+ include_dirs	:= . include
+ 
+ # programs
+@@ -1188,10 +1188,10 @@ help:
+ install: all
+ 	@echo "installing..."
+ 	@echo ""
+-	mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
++	mkdir -p $(DESTDIR)$(libdir)
+ 	mkdir -p $(DESTDIR)$(prefix)/include/liquid
+-	install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
+-	ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
++	install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
++	ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
+ 	install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
+ 	@echo ""
+ 	@echo "---------------------------------------------------------"
+@@ -1201,7 +1201,7 @@ install: all
+ 	@echo "  libraries by running 'ldconfig' to make the shared"
+ 	@echo "  object available.  You might also need to modify your"
+ 	@echo "  LD_LIBRARY_PATH environment variable to include the"
+-	@echo "  directory $(DESTDIR)$(exec_prefix)"
++	@echo "  directory $(DESTDIR)"
+ 	@echo ""
+ 	@echo "  Please report bugs to $(BUGREPORT)"
+ 	@echo "---------------------------------------------------------"
+@@ -1214,8 +1214,8 @@ install: all
+ uninstall:
+ 	@echo "uninstalling..."
+ 	$(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
+-	$(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
+-	$(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
++	$(RM) $(DESTDIR)$(libdir)/libliquid.a
++	$(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
+ 	@echo "done."
+ 
+ ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index d03535ae6605..432adac62cf7 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -3,7 +3,6 @@ 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)"

From 6123e4f1d6c5eb81908d91b9ed1a0668b73ac9e0 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, 23 Feb 2021 08:33:52 +0700
Subject: [PATCH 2064/3458] zeroc-mcpp: remove -m32

---
 srcpkgs/zeroc-mcpp/patches/no-m32.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/zeroc-mcpp/patches/no-m32.patch

diff --git a/srcpkgs/zeroc-mcpp/patches/no-m32.patch b/srcpkgs/zeroc-mcpp/patches/no-m32.patch
new file mode 100644
index 000000000000..dbe198ece4ce
--- /dev/null
+++ b/srcpkgs/zeroc-mcpp/patches/no-m32.patch
@@ -0,0 +1,12 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -21,7 +21,6 @@ ifeq ($(UNAME),Linux)
+         override CFLAGS += -fPIC -Wno-maybe-uninitialized -Wno-implicit-function-declaration -Wno-unused-result
+ 
+         ifeq ($(MACHINE),i686)
+-                override CFLAGS += -m32
+                 #
+                 # Ubuntu.
+                 #

From 5dd14fbb590321eeb2b85c6f489e474613355f64 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, 23 Feb 2021 08:42:29 +0700
Subject: [PATCH 2065/3458] stk: set exec-prefix

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

diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index 3ef3e444a38b..b6b6d821b334 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--with-alsa
  --libexecdir=/usr/libexec/stk
  --with-jack RAWWAVE_PATH=/usr/share/stk/rawwaves/"
-make_install_args="prefix=/usr"
+make_install_args="prefix=/usr exec_prefix=\${prefix}"
 hostmakedepends="automake libtool pkg-config"
 makedepends="alsa-lib-devel jack-devel"
 depends="libstk-${version}_${revision} stk-data-${version}_${revision}"

From 9126faa6bcf4f8713239af6d753d6178b6a82fb2 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, 23 Feb 2021 09:13:17 +0700
Subject: [PATCH 2066/3458] tcc: build-style is configure

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

diff --git a/srcpkgs/tcc/template b/srcpkgs/tcc/template
index b27a0750ab75..5d2da178af70 100644
--- a/srcpkgs/tcc/template
+++ b/srcpkgs/tcc/template
@@ -6,7 +6,8 @@ version=${_distver}.${_voidver}
 revision=1
 _gitrev=a4997bf3d952f904bce824ee3e8f3e12e8524071
 wrksrc=tinycc-${_gitrev:0:7}
-build_style=gnu-configure
+build_style=configure
+configure_args="--prefix=/usr --libdir=\${prefix}/lib$XBPS_TARGET_WORDSIZE"
 make_check_target="test"
 hostmakedepends="perl"
 short_desc="Tiny C Compiler"
@@ -20,14 +21,9 @@ nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) broken="ftbfs";;
-	*-musl) configure_args="--config-musl";;
+	*-musl) configure_args+=" --config-musl";;
 esac
 
-pre_configure() {
-	# Replace lib64 with lib
-	sed -i configure -e "s;lib64;lib;g"
-}
-
 do_build() {
 	# Can't use (many of) our CFLAGS or LDFLAGS
 	# because TCC is bootstrapped with the same flags

From aad069fe675075a846688c13353a2078c266333e Mon Sep 17 00:00:00 2001
From: saqfish <saqfish@gmail.com>
Date: Mon, 22 Feb 2021 03:36:38 -0600
Subject: [PATCH 2067/3458] goaccess: update to 1.4.5

goaccess: update to 1.4.5

Removed CFLAGS
---
 srcpkgs/goaccess/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/goaccess/template b/srcpkgs/goaccess/template
index 6207104a4efe..ce6231cc0253 100644
--- a/srcpkgs/goaccess/template
+++ b/srcpkgs/goaccess/template
@@ -1,6 +1,6 @@
 # Template file for 'goaccess'
 pkgname=goaccess
-version=1.3
+version=1.4.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8 --enable-geoip=legacy"
@@ -11,9 +11,7 @@ maintainer="Bart Kerkvliet <bart@bannarte.nl>"
 license="MIT"
 homepage="https://goaccess.io"
 distfiles="http://tar.goaccess.io/goaccess-${version}.tar.gz"
-checksum=8c775c5c24bf85a933fd6f1249004847342d6542aa533e4ec02aaf7be41d7b9b
-
-CFLAGS="-fcommon"
+checksum=c4820e781f75d9446f6b1be5fc8d11c6ec94a47fa8dd523001698c589f46c1ba
 
 pre_configure() {
 	autoreconf -fi

From 1b0c453cc55e47b0fa2302c6086f2109575fc406 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Tue, 23 Feb 2021 11:10:16 +1000
Subject: [PATCH 2068/3458] kops: update to 1.19.1

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

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 28d8cee38857..08bff1e80434 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.19.0
+version=1.19.1
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops

From 892538b91497412a5085a7563203b53ef2256757 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 23 Feb 2021 06:59:42 +0300
Subject: [PATCH 2069/3458] python3-neovim: update to 0.4.2

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

diff --git a/srcpkgs/python3-neovim/template b/srcpkgs/python3-neovim/template
index eae1c4decbcd..813c95ed9cfa 100644
--- a/srcpkgs/python3-neovim/template
+++ b/srcpkgs/python3-neovim/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-neovim'
 pkgname=python3-neovim
-version=0.4.1
-revision=2
+version=0.4.2
+revision=1
 wrksrc="pynvim-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
@@ -9,6 +9,6 @@ depends="neovim python3-greenlet python3-msgpack"
 short_desc="Python3 client for Neovim"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="Apache-2.0"
-homepage="https://github.com/neovim/python-client"
-distfiles="https://github.com/neovim/python-client/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=132ea5c226399aed45a959f1d8efe8cdd89a769a672534722760a9a67b06dfa0
+homepage="https://github.com/neovim/pynvim"
+distfiles="https://github.com/neovim/pynvim/archive/${version}.tar.gz"
+checksum=513b56741b1140e394536e6c29bae112a35b7c3602b71ba34acf2319570e26e7

From edd653fe42f270b2c850c877425a9eed689e7dbe Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 22 Feb 2021 09:59:53 +0000
Subject: [PATCH 2070/3458] gphoto2: update to 2.5.27.

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

diff --git a/srcpkgs/gphoto2/template b/srcpkgs/gphoto2/template
index 954bc9e631a1..73b706b7a99f 100644
--- a/srcpkgs/gphoto2/template
+++ b/srcpkgs/gphoto2/template
@@ -1,6 +1,6 @@
 # Template file for 'gphoto2'
 pkgname=gphoto2
-version=2.5.26
+version=2.5.27
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev
@@ -12,4 +12,4 @@ 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=7653213b05329c1dc2779efea3eff00504e12011436587aedc9aaa1e8665ab2f
+checksum=30054e93a1bb59f501aabd5018713177ea04ce0cb28935319bd6ca80061e8d38

From c51d3791fb73e580fad3a7c7154cc25c351f4b77 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 11 Nov 2020 02:07:18 +0300
Subject: [PATCH 2071/3458] New package: simutron-1.0.1

[Piraty: append _rev to version]

Closes: #25742 [via git-merge-pr]
---
 common/shlibs                                 |  2 ++
 .../remove-bitbang-from-firmware-c.patch      | 13 ++++++++++
 srcpkgs/simutron/template                     | 24 +++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 srcpkgs/simutron/patches/remove-bitbang-from-firmware-c.patch
 create mode 100644 srcpkgs/simutron/template

diff --git a/common/shlibs b/common/shlibs
index d86b7eddef0a..89aa301681fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3919,5 +3919,7 @@ 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
+libsimavr.so.1 simavr-1.6_2
+libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libtree-sitter.so.0 tree-sitter-0.18.2_1
diff --git a/srcpkgs/simutron/patches/remove-bitbang-from-firmware-c.patch b/srcpkgs/simutron/patches/remove-bitbang-from-firmware-c.patch
new file mode 100644
index 000000000000..c2e7cafaf994
--- /dev/null
+++ b/srcpkgs/simutron/patches/remove-bitbang-from-firmware-c.patch
@@ -0,0 +1,13 @@
+--- plugins/avrmcu/plugin/firmware.c
++++ plugins/avrmcu/plugin/firmware.c
+@@ -118,10 +118,6 @@
+             case AVR_MMCU_TAG_SIMAVR_CONSOLE: {
+                 firmware->console_register_addr = src[0] | (src[1] << 8);
+             }	break;
+-			case AVR_MMCU_TAG_BITBANG: {
+-				firmware->bitbang_on_mask =
+-					src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
+-			}	break;
+         }
+         size -= next;
+         src += next - 2; // already incremented
diff --git a/srcpkgs/simutron/template b/srcpkgs/simutron/template
new file mode 100644
index 000000000000..cdcf68c2a435
--- /dev/null
+++ b/srcpkgs/simutron/template
@@ -0,0 +1,24 @@
+# Template file for 'simutron'
+pkgname=simutron
+_version=1.0.1
+_rev=SR2
+version=1.0.1.${_rev}
+revision=1
+build_wrksrc=build
+build_style=qmake
+hostmakedepends="subversion qt5-qmake qt5-host-tools pkg-config"
+makedepends="simavr-devel qt5-devel"
+short_desc="AVR simulator IDE"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="GPL-3.0-only"
+homepage="https://sourceforge.net/projects/simutron/"
+nostrip_files="LCD20x4Test.elf"
+
+do_fetch() {
+	svn checkout "https://svn.code.sf.net/p/${pkgname}/code/branches/RB-${_version}-${_rev}" "$wrksrc"
+}
+
+post_extract() {
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Debug/LCD20x4Test.elf
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Release/LCD20x4Test.elf
+}

From 0140e620bc5d44f3b6dc4e0e4605f0d0ca4da06a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 23 Feb 2021 12:56:31 +0100
Subject: [PATCH 2072/3458] zeroc-mcpp: fix no-m32.patch

The template has patch_args="-Np1" so add a/ b/ to the patch.
---
 srcpkgs/zeroc-mcpp/patches/no-m32.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zeroc-mcpp/patches/no-m32.patch b/srcpkgs/zeroc-mcpp/patches/no-m32.patch
index dbe198ece4ce..b1ef72d28f0d 100644
--- a/srcpkgs/zeroc-mcpp/patches/no-m32.patch
+++ b/srcpkgs/zeroc-mcpp/patches/no-m32.patch
@@ -1,7 +1,7 @@
 Index: Makefile
 ===================================================================
---- Makefile.orig
-+++ Makefile
+--- a/Makefile.orig
++++ b/Makefile
 @@ -21,7 +21,6 @@ ifeq ($(UNAME),Linux)
          override CFLAGS += -fPIC -Wno-maybe-uninitialized -Wno-implicit-function-declaration -Wno-unused-result
  

From 976ad3b759b71fb637542538cf590cf09d246dca 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, 23 Feb 2021 19:40:23 +0700
Subject: [PATCH 2073/3458] mlt: build-style is configure

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

diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template
index 5b67d2a7a6c5..7c5316f778e9 100644
--- a/srcpkgs/mlt/template
+++ b/srcpkgs/mlt/template
@@ -2,8 +2,9 @@
 pkgname=mlt
 version=6.22.1
 revision=2
-build_style=gnu-configure
-configure_args="--enable-gpl --enable-gpl3 --disable-swfdec --without-kde
+build_style=configure
+configure_args="--prefix=/usr --libdir=/usr/lib$XBPS_TARGET_WORDSIZE
+ --enable-gpl --enable-gpl3 --disable-swfdec --without-kde
  --swig-languages=python"
 hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which"
 # XXX: movit vid.stab

From 0f051aa469af08dfbd0da1a4afbcefbbfb5bd4f6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Fri, 19 Feb 2021 19:23:49 -0600
Subject: [PATCH 2074/3458] lprng: remove package

---
 srcpkgs/lprng/files/lprng/run     |  4 ----
 srcpkgs/lprng/template            | 26 --------------------------
 srcpkgs/removed-packages/template |  3 ++-
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100755 srcpkgs/lprng/files/lprng/run
 delete mode 100644 srcpkgs/lprng/template

diff --git a/srcpkgs/lprng/files/lprng/run b/srcpkgs/lprng/files/lprng/run
deleted file mode 100755
index 1e8435ee9ff4..000000000000
--- a/srcpkgs/lprng/files/lprng/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec chpst -u :_lprng lpd -F
diff --git a/srcpkgs/lprng/template b/srcpkgs/lprng/template
deleted file mode 100644
index b4b9c9cb0086..000000000000
--- a/srcpkgs/lprng/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'lprng'
-pkgname=lprng
-version=3.8.C
-revision=1
-build_style=gnu-configure
-configure_args="--with-userid=_lprng --with-groupid=_lprng"
-short_desc="Enhanced Printer Spooler"
-maintainer="Andrew Benson <abenson+void@gmail.com>"
-license="GPL-2.0-only"
-homepage="http://lprng.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/lprng/lprng/lprng-${version}.tar.gz"
-checksum=694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10
-system_accounts="_lprng"
-conflicts="cups>=0"
-conf_files="/etc/lpd/* /etc/printcap"
-
-CFLAGS="-fcommon"
-
-export CLEAR=no
-
-post_install() {
-	mv ${DESTDIR}/etc/printcap{.sample,}
-	mv ${DESTDIR}/etc/lpd/lpd.conf{.sample,}
-	mv ${DESTDIR}/etc/lpd/lpd.perms{.sample,}
-	vsv lprng
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03851aff17e3..6507f1acea7f 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=30
+revision=31
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -169,6 +169,7 @@ replaces="
  librpcsecgss-devel<=0.19_6
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
+ lprng<=3.8.C_1
  ls++-git<=20140919_3
  luxmark<=3.1_9
  luxrays<=3.1_18

From bdb3c7af0932665491bf354389395311a3c5e387 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Tue, 23 Feb 2021 08:58:30 +0100
Subject: [PATCH 2075/3458] flowblade: update to 2.8.0.2.

Closes: #28997 [via git-merge-pr]
---
 srcpkgs/flowblade/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flowblade/template b/srcpkgs/flowblade/template
index 74a7820aee8d..3d8a9cfa295d 100644
--- a/srcpkgs/flowblade/template
+++ b/srcpkgs/flowblade/template
@@ -1,6 +1,6 @@
 # Template file for 'flowblade'
 pkgname=flowblade
-version=2.8
+version=2.8.0.2
 revision=1
 build_wrksrc=flowblade-trunk
 build_style=python3-module
@@ -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=0a06d31ed148087b49dadcce775b395cd89586e05d306834d02f219c450b8125
+checksum=1d2a9400cfdddd2e6f0221e78f9c87ad47621a1d79aeda1b62b93de8a2b64cb7

From b1c37d19ac17648f5f8a606e08de02b263dfdb4e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 23 Feb 2021 16:00:49 +0100
Subject: [PATCH 2076/3458] coq: update to 8.13.1.

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

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index cf49b27d0183..2f8f04c5e5ec 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,6 +1,6 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.13.0
+version=8.13.1
 revision=1
 hostmakedepends="camlp5 ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only"
 homepage="https://coq.inria.fr"
 distfiles="https://github.com/coq/coq/archive/V${version}.tar.gz"
-checksum=06445dbd6cb3c8a2e4e957dbd12e094d609a62fcb0c8c3cad0cd1fdedda25c9b
+checksum=95e71b16e6f3592e53d8bb679f051b062afbd12069a4105ffc9ee50e421d4685
 nopie=yes
 nocross=yes
 

From 195500a5d6710cb3ea0f25b3be4f52060982ee97 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 23 Feb 2021 16:01:05 +0100
Subject: [PATCH 2077/3458] mathcomp: rebuild for coq-8.13.1.

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

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 0e284e748b66..c8d20840bc18 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.12.0
-revision=2
+revision=3
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 798956b0b6efa7b5dd84bf05b0c8b071f62d93e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 23 Feb 2021 16:36:08 +0100
Subject: [PATCH 2078/3458] linux5.10: update to 5.10.18.

---
 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 a2bdd1c36dc2..84498596e21f 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.17
+version=5.10.18
 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=e84e623ce8bb2446ec026b62eafa3b18480aa6fb6ae9c86cd8f18651324d4814
+checksum=3bc1ee2b1bf73b5ba936721953f3f9599fd165cef906cd5163c68d23cb9bb611
 python_version=3
 patch_args="-Np1"
 

From 0f9599983f5e4f39b06aae7a98adc93912ced5a8 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 23 Feb 2021 08:53:21 -0600
Subject: [PATCH 2079/3458] pcsc-tools: update to 1.5.7.

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

diff --git a/srcpkgs/pcsc-tools/template b/srcpkgs/pcsc-tools/template
index 6525bf27267e..3848f3ebe0d4 100644
--- a/srcpkgs/pcsc-tools/template
+++ b/srcpkgs/pcsc-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsc-tools'
 pkgname=pcsc-tools
-version=1.5.6
+version=1.5.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ludovic.rousseau.free.fr/softwares/pcsc-tools"
 distfiles="http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=5edb41c783e05446e13e2d6bb4a430afc017887c01a0522fc59a68c30c685fa8
+checksum=e0ea8f8496d5bcf5316da913869ba95b925d0405c2aaade801c0d6ce7697699d

From 64aab3f710354ba495d0f2757a0439f51b2bff32 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 23 Feb 2021 09:01:31 -0600
Subject: [PATCH 2080/3458] pcsclite: update to 1.9.1.

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

diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template
index 414ea77c5656..ad9e221bfbc7 100644
--- a/srcpkgs/pcsclite/template
+++ b/srcpkgs/pcsclite/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsclite'
 pkgname=pcsclite
-version=1.9.0
+version=1.9.1
 revision=1
 wrksrc="pcsc-lite-upstream-${version}"
 build_style=gnu-configure
@@ -9,11 +9,11 @@ hostmakedepends="intltool pkg-config python3"
 makedepends="eudev-libudev-devel libusb-devel python3-devel"
 depends="python3"
 short_desc="Middleware to access a smart card using SCard API (PC/SC)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://salsa.debian.org/debian/pcsc-lite"
 distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz"
-checksum=6d60b2b745d304440bdcf2c8697ffd84697fc74f8ac3c0a231e90ecbfb8d3a14
+checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8
 
 post_install() {
 	vsv pcscd

From a85b5f7f80aa42b39bcbefc262d208be39138826 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 23 Feb 2021 08:52:47 -0600
Subject: [PATCH 2081/3458] zeek: update to 3.2.4.

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

diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b31586592587..5212bb2dc4b9 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,6 +1,6 @@
 # Template file for 'zeek'
 pkgname=zeek
-version=3.2.3
+version=3.2.4
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.zeek.org"
 distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz"
-checksum=f9295c2dd4076a71042bc83a267b0b0d5d5db291d7c7a12b6c5bac75292bc2c6
+checksum=d5a984d383c0cc337e18d3d65b969e8566ab8a6fc38e9c6d39ba4a101027be85
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel musl-legacy-compat"

From 27f00dc2b59142a84a725db32102d98d774d1a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 22 Feb 2021 21:32:29 +0100
Subject: [PATCH 2082/3458] glyphy: make devel depend on main package

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

diff --git a/srcpkgs/glyphy/template b/srcpkgs/glyphy/template
index e63e3ca5c59b..15079905c59a 100644
--- a/srcpkgs/glyphy/template
+++ b/srcpkgs/glyphy/template
@@ -1,7 +1,7 @@
 # Template file for 'glyphy'
 pkgname=glyphy
 version=0.0.20190307
-revision=1
+revision=2
 _gitrev=bc2da506d23bdaf3eb0d95c9649a4591b4d912c7
 wrksrc="${pkgname}-${_gitrev}"
 build_style=gnu-configure
@@ -24,7 +24,7 @@ post_configure() {
 
 glyphy-devel_package() {
 	short_desc+=" - development files"
-	depends="${pkgname}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so

From ab1bff28c85fad86c673246edd8a5cb965f23e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 22 Feb 2021 21:32:30 +0100
Subject: [PATCH 2083/3458] libpipewire0.2: make devel depend on main package

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

diff --git a/srcpkgs/libpipewire0.2/template b/srcpkgs/libpipewire0.2/template
index 88a6666d9dfd..9537adb4b379 100644
--- a/srcpkgs/libpipewire0.2/template
+++ b/srcpkgs/libpipewire0.2/template
@@ -1,7 +1,7 @@
 # Template file for 'libpipewire0.2'
 pkgname=libpipewire0.2
 version=0.2.7
-revision=1
+revision=2
 wrksrc=pipewire-${version}
 build_style=meson
 configure_args="-Dgstreamer=disabled -Ddocs=false -Dsystemd=false"
@@ -26,7 +26,7 @@ post_install() {
 }
 
 libpipewire0.2-devel_package() {
-	depends="${pkgname}-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - pipewire and libspa development files"
 	pkg_install() {
 		vmove usr/include

From bcc86521a4b7affe10924050a0b5b947014b9437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 22 Feb 2021 21:24:47 +0100
Subject: [PATCH 2084/3458] README.md: requirements for binary-bootstrap are
 modest

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 17111d471b77..315e6858bfaf 100644
--- a/README.md
+++ b/README.md
@@ -36,12 +36,15 @@ See [Contributing](./CONTRIBUTING.md) for a general overview of how to contribut
 
 - GNU bash
 - xbps >= 0.56
+- git(1) - unless configured to not, see etc/defaults.conf
+- common POSIX utilities included by default in almost all UNIX systems
 - curl(1) - required by `xbps-src update-check`
+
+For bootstrapping additionally:
 - flock(1) - util-linux
 - bsdtar or GNU tar (in that order of preference)
 - install(1) - GNU coreutils
 - objcopy(1), objdump(1), strip(1): binutils
-- other common POSIX utilities included by default in almost all UNIX systems.
 
 `xbps-src` requires a utility to chroot and bind mount existing directories
 into a `masterdir` that is used as its main `chroot` directory. `xbps-src` supports

From 0e43146a1d7d1c51c251f2d4ce7d05565007c5ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 22 Feb 2021 21:24:47 +0100
Subject: [PATCH 2085/3458] xbps-src: allow to run without git

This makes possible to binary-bootstrap and build packages
with only base-system using tarball of void-packages.
---
 common/environment/setup/git.sh | 4 +++-
 etc/defaults.conf               | 2 +-
 xbps-src                        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/environment/setup/git.sh b/common/environment/setup/git.sh
index 13e5178ccff3..4b352fe53870 100644
--- a/common/environment/setup/git.sh
+++ b/common/environment/setup/git.sh
@@ -2,7 +2,9 @@
 # only run this, if SOURCE_DATE_EPOCH isn't set.
 
 if [ -z "$XBPS_GIT_CMD" ]; then
-	msg_error "BUG: environment/setup: XBPS_GIT_CMD is not set\n"
+	if [ -z "$XBPS_USE_BUILD_MTIME" ] || [ -n "$XBPS_USE_GIT_REVS" ]; then
+		msg_error "BUG: environment/setup: XBPS_GIT_CMD is not set\n"
+	fi
 fi
 
 if [ -n "$XBPS_USE_BUILD_MTIME" ]; then
diff --git a/etc/defaults.conf b/etc/defaults.conf
index bc93457747f4..133449a150d6 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -132,7 +132,7 @@ XBPS_SUCMD="sudo /bin/sh -c"
 
 # [OPTIONAL]
 # Enable to use the standard mtime of files. Otherwise it will be rewritten to
-# the HEAD commit time.
+# the HEAD commit time. Requires git when disabled.
 #
 #XBPS_USE_BUILD_MTIME=yes
 
diff --git a/xbps-src b/xbps-src
index ecd389b93e17..a488ed3f849e 100755
--- a/xbps-src
+++ b/xbps-src
@@ -513,7 +513,7 @@ if command -v chroot-git &>/dev/null; then
     export XBPS_GIT_CMD=$(command -v chroot-git)
 elif command -v git &>/dev/null; then
     export XBPS_GIT_CMD=$(command -v git)
-else
+elif [ -z "$XBPS_USE_BUILD_MTIME" ] || [ "$XBPS_USE_GIT_REVS" ]; then
     echo "neither chroot-git or git are available in your system!" 1>&2
     exit 1
 fi

From b733f882ae505f175b0df32f221a126b4452790d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 23 Feb 2021 14:45:27 -0300
Subject: [PATCH 2086/3458] evtest: fix time64 patch.

---
 srcpkgs/evtest/patches/time64.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evtest/patches/time64.patch b/srcpkgs/evtest/patches/time64.patch
index f1a18fd3ad2c..9d7e12b4b142 100644
--- a/srcpkgs/evtest/patches/time64.patch
+++ b/srcpkgs/evtest/patches/time64.patch
@@ -5,7 +5,7 @@
  			code = ev[i].code;
  
 -			printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec);
-+			printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_usec);
++			printf("Event: time %lld.%06ld, ", (long long)ev[i].input_event_sec, (long)ev[i].input_event_usec);
  
  			if (type == EV_SYN) {
  				if (code == SYN_MT_REPORT)

From 139126a32afdb9ee86a4555bb8bde32877186e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 23 Feb 2021 14:28:00 -0300
Subject: [PATCH 2087/3458] mdadm: apply patch to fix UAF and fix time64 patch.

---
 srcpkgs/mdadm/patches/time64.patch         | 24 +++++++++-------------
 srcpkgs/mdadm/patches/use-after-free.patch | 17 +++++++++++++++
 srcpkgs/mdadm/template                     |  2 +-
 3 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/mdadm/patches/use-after-free.patch

diff --git a/srcpkgs/mdadm/patches/time64.patch b/srcpkgs/mdadm/patches/time64.patch
index c02ca8f7592a..1ee4b23f41a7 100644
--- a/srcpkgs/mdadm/patches/time64.patch
+++ b/srcpkgs/mdadm/patches/time64.patch
@@ -1,20 +1,16 @@
---- monitor.c	2018-10-01 18:26:06.000000000 +0000
-+++ monitor.c	2020-01-22 19:51:39.575877908 +0000
-@@ -20,6 +20,7 @@
- 
- #include "mdadm.h"
- #include "mdmon.h"
-+#include <inttypes.h>
- #include <sys/syscall.h>
- #include <sys/select.h>
- #include <signal.h>
-@@ -447,7 +448,7 @@
+diff --git monitor.c monitor.c
+index 81537ed..08027ac 100644
+--- monitor.c
++++ monitor.c
+@@ -447,9 +447,9 @@ static int read_and_act(struct active_array *a, fd_set *fds)
  	}
  
  	gettimeofday(&tv, NULL);
 -	dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
-+	dprintf("(%d): %"PRId64".%06"PRId64" state:%s prev:%s action:%s prev: %s start:%llu\n",
++	dprintf("(%d): %lld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
  		a->info.container_member,
- 		tv.tv_sec, tv.tv_usec,
+-		tv.tv_sec, tv.tv_usec,
++		(long long)tv.tv_sec, (long)tv.tv_usec,
  		array_states[a->curr_state],
-
+ 		array_states[a->prev_state],
+ 		sync_actions[a->curr_action],
diff --git a/srcpkgs/mdadm/patches/use-after-free.patch b/srcpkgs/mdadm/patches/use-after-free.patch
new file mode 100644
index 000000000000..69b6ee4aeae6
--- /dev/null
+++ b/srcpkgs/mdadm/patches/use-after-free.patch
@@ -0,0 +1,17 @@
+From Rich Felker, over IRC
+
+diff --git a/policy.c b/policy.c
+index c0d18a7e..78ad34cd 100644
+--- policy.c
++++ policy.c
+@@ -214,8 +214,9 @@ static char *disk_path(struct mdinfo *disk)
+ 				continue;
+ 			if (stb.st_rdev != makedev(disk->disk.major, disk->disk.minor))
+ 				continue;
++			char *result = xstrdup(ent->d_name);
+ 			closedir(by_path);
+-			return xstrdup(ent->d_name);
++			return result;
+ 		}
+ 		closedir(by_path);
+ 	}
diff --git a/srcpkgs/mdadm/template b/srcpkgs/mdadm/template
index ac1bce5aedef..f776b6dc9d36 100644
--- a/srcpkgs/mdadm/template
+++ b/srcpkgs/mdadm/template
@@ -1,7 +1,7 @@
 # Template file for 'mdadm'
 pkgname=mdadm
 version=4.1
-revision=2
+revision=3
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"
 short_desc="Tool for managing/monitoring Linux md device arrays"

From 296a9bf9f83e46904160b08fb564bb2eede34160 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 23 Feb 2021 18:37:21 +0100
Subject: [PATCH 2088/3458] youtube-dl: update to 2021.02.22.

Closes: #29008 [via git-merge-pr]
---
 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 c2e287ce8a43..4c522ae07718 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.10
+version=2021.02.22
 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=d607adf66b7047865733f7d05af9478118ee4dd974ef9f971563e11de7f29122
+checksum=fd605dd76b6e46179bd2eed6905537bebffdc72732b578db21d3074bb19b44a6
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From a43119ea9a6af7cac5c8e399e997252df337339b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:30:31 +0100
Subject: [PATCH 2089/3458] ario: remove unused libsoup from makedepends

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

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index eaa4bb2b89c7..c9fc6f3cd9b7 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -6,8 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
- libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
- libunique1-devel taglib-devel"
+ libcurl-devel libmpdclient-devel libnotify-devel libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From a32491eb2cce5892b36d93529f47d70c0419d65d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:31:20 +0100
Subject: [PATCH 2090/3458] gedit: remove unused libsoup from makedepends

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

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 419d64742995..f73d3735b645 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -10,7 +10,7 @@ configure_args="-Dplugins=true
 hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext
  $(vopt_if gir vala)"
 makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel libsoup-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
+ libpeas-devel tepl-devel $(vopt_if gir 'python3-gobject-devel')"
 depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
 short_desc="Text editor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 68446c8a174d56a9b9074bb41179ba7c59264f59 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:31:48 +0100
Subject: [PATCH 2091/3458] pluma: remove unused libsoup from makedepends

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

diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template
index f33e7ff039e2..4a689f727b18 100644
--- a/srcpkgs/pluma/template
+++ b/srcpkgs/pluma/template
@@ -8,7 +8,7 @@ pycompile_dirs="usr/lib/pluma/plugins"
 hostmakedepends="autoconf-archive gobject-introspection mate-common
  automake libtool"
 makedepends="enchant2-devel gtksourceview-devel iso-codes libSM-devel
- libpeas-devel libsoup-devel mate-desktop-devel"
+ libpeas-devel mate-desktop-devel"
 depends="desktop-file-utils iso-codes zenity mate-desktop"
 short_desc="Powerful text editor for MATE"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0229b3fee4300951aa6ab4f9e628438f05e26f92 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:33:04 +0100
Subject: [PATCH 2092/3458] gupnp: need libsoup-devel

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

diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index 11cc231ceac3..a2b732dae935 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -1,13 +1,14 @@
 # Template file for 'gupnp'
 pkgname=gupnp
 version=1.2.4
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir introspection) $(vopt_bool gir vapi)
  -Dexamples=false"
 hostmakedepends="pkg-config glib-devel $(vopt_if gir vala)"
-makedepends="libglib-devel libxml2-devel libuuid-devel gssdp-devel"
+makedepends="libglib-devel libxml2-devel libuuid-devel gssdp-devel
+ libsoup-devel"
 short_desc="GObject-based library for UPnP"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From f660ba8a35294a6dc9edadc89c56cad70a05f275 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:34:41 +0100
Subject: [PATCH 2093/3458] gupnp-tools: need libsoup in makedepends

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

diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 9f237395e8b5..09507922f46c 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -5,7 +5,7 @@ revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel gobject-introspection"
 makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel
- libxml2-devel"
+ libxml2-devel libsoup-devel"
 short_desc="Free replacements of Intel UPnP tools that use GUPnP"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 724f9829d27cb89023753e7e718dde292a46ddfc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:36:45 +0100
Subject: [PATCH 2094/3458] libnice: drop libsoup-devel from makedepends

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

diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 409720503008..84721a66e73f 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,14 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
- libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 4235d7e56781499c82fa18d29e319930cd4f87c5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:37:22 +0100
Subject: [PATCH 2095/3458] mpd: remove libsoup-devel from makedepends

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

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index d03c063a3246..18701cd912a8 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -21,7 +21,7 @@ hostmakedepends="pkg-config python3-Sphinx"
 makedepends="avahi-glib-libs-devel boost-devel faad2-devel ffmpeg-devel
  libcurl-devel libid3tag-devel libmad-devel libmikmod-devel libmms-devel
  libmodplug-devel libmpdclient-devel libnfs-devel libsamplerate-devel
- libsoup-devel libupnp-devel mpg123-devel opus-devel yajl-devel
+ libupnp-devel mpg123-devel opus-devel yajl-devel
  zziplib-devel libsoxr-devel audiofile-devel twolame-devel
  $(vopt_if io_uring 'liburing-devel')
  $(vopt_if cdio 'libcdio-paranoia-devel') $(vopt_if shoutcast 'libshout-devel')

From 24c157532b3042c10f4e6fe040bd9e0b20a9db28 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:37:47 +0100
Subject: [PATCH 2096/3458] vino: remove libsoup-devel from makedepends

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

diff --git a/srcpkgs/vino/template b/srcpkgs/vino/template
index ea69f8851e0d..5930a164616c 100644
--- a/srcpkgs/vino/template
+++ b/srcpkgs/vino/template
@@ -6,8 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libjpeg-turbo-devel gtk+3-devel
  libnotify-devel avahi-glib-libs-devel dbus-glib-devel telepathy-glib-devel
- libsoup-devel libXtst-devel NetworkManager-devel libsecret-devel
- gnutls-devel libSM-devel"
+ libXtst-devel NetworkManager-devel libsecret-devel gnutls-devel libSM-devel"
 depends="libsoup>=2.46 desktop-file-utils"
 short_desc="VNC server for the GNOME desktop"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From 055c9eb64cfcab439f0109065d7c6d98f3dd6c9e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:38:14 +0100
Subject: [PATCH 2097/3458] FeedReader: need libsoup-devel in makedepends

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

diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template
index a584421fc554..53dc7acb745f 100644
--- a/srcpkgs/FeedReader/template
+++ b/srcpkgs/FeedReader/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="glib-devel intltool itstool pkg-config vala"
 makedepends="gnome-online-accounts-devel gst-plugins-base1-devel json-glib-devel
  libcurl-devel libgee08-devel libnotify-devel libpeas-devel libsecret-devel
- rest-devel vala-devel webkit2gtk-devel gumbo-parser-devel"
+ rest-devel vala-devel webkit2gtk-devel gumbo-parser-devel libsoup-devel"
 short_desc="Modern desktop RSS desktop client"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-only"

From 3d2e3dd785a125da38f39428f937c41064fa48f5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:38:37 +0100
Subject: [PATCH 2098/3458] astroid: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 6b90d21bd131..72bc0ce9eb30 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
 makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
  gmime3-devel boost-devel protobuf-devel vte3-devel gobject-introspection
- libpeas-devel"
+ libpeas-devel libsoup-devel"
 short_desc="Graphical threads-with-tags style email client for Notmuch"
 maintainer="Ameise <ameise@bitparlament.de>"
 license="GPL-3.0-or-later"

From 2a5d26ef26cf94e7428c4d3a9e066d88f4595fe8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:38:55 +0100
Subject: [PATCH 2099/3458] badwolf: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 2eca13c583a0..287f02f45b49 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 make_check_target=test
 hostmakedepends="pkg-config gettext"
-makedepends="webkit2gtk-devel"
+makedepends="webkit2gtk-devel libsoup-devel"
 short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="BSD-3-Clause"

From 96a30f6578f2b5a07480c25ee6562eae27afc0d0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:39:16 +0100
Subject: [PATCH 2100/3458] bookworm: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 2fa61df0fc69..3e319fb786d9 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel
  webkit2gtk-devel sqlite-devel poppler-glib-devel
- libxml2-devel glib-devel"
+ libxml2-devel glib-devel libsoup-devel"
 depends="poppler unzip"
 short_desc="Simple, focused eBook reader"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"

From e2bc9e4671dcb92a57d57c61a89f7c81f182eea6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:39:40 +0100
Subject: [PATCH 2101/3458] evolution: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 442d4769e52c..3411930f90bf 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -11,7 +11,7 @@ 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
- gnome-desktop-devel"
+ gnome-desktop-devel libsoup-devel"
 depends="gnome-keyring"
 short_desc="Integrated mail, addressbook and calendaring for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7c48973eae0736600d5fbf9fad5421cac36b8783 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:39:56 +0100
Subject: [PATCH 2102/3458] evolution-ews: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 095167847afc..bfb928598ea4 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -6,7 +6,7 @@ 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
- gnome-desktop-devel"
+ gnome-desktop-devel libsoup-devel"
 short_desc="MS Exchange integration through Exchange Web Services"
 maintainer="Peter Kuchar <masaj@gmx.com>"
 license="LGPL-2.1-or-later"

From d66bfbe35e17f46538c9e5acddc942289b218b84 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:40:16 +0100
Subject: [PATCH 2103/3458] evolution-data-server: add libsoup-devel in
 makedepends

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 2c8be82e8725..24be6b0a2b31 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -11,7 +11,7 @@ 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)"
+ libsoup-devel $(vopt_if gir vala-devel)"
 depends="libgweather libsoup-gnome"
 short_desc="Centralized access to appointments and contacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From c01c3fc856a2ad997ab1bcb9ad3e8c8c38b58d1f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:40:36 +0100
Subject: [PATCH 2104/3458] epiphany: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index d4365e58bbbf..6ee3d64e91ed 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -9,7 +9,7 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
  libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel"
+ nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
 short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 867ff0771c3b96a9adc149dfa078a49ef26b13a9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:40:57 +0100
Subject: [PATCH 2105/3458] flatpak: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 9c8065af2c00..9e7334e1b82f 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -12,7 +12,8 @@ configure_args="
 hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison
  python3-parsing docbook docbook-xml docbook-xsl"
 makedepends="appstream-glib-devel gpgme-devel json-glib-devel libcap-devel
- libostree-devel libseccomp-devel polkit-devel dconf-devel fuse-devel"
+ libostree-devel libseccomp-devel polkit-devel dconf-devel fuse-devel
+ libsoup-devel"
 depends="bubblewrap gnupg2"
 checkdepends="attr-progs bubblewrap dbus gnupg2 socat which"
 short_desc="Application sandboxing and distribution framework"

From c8bafef4799b95de1721b504a731d5ca9efca540 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:41:34 +0100
Subject: [PATCH 2106/3458] gitg: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index fc7903de7773..e309a6a1462f 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -7,7 +7,7 @@ build_helper="qemu"
 hostmakedepends="intltool gettext glib-devel gobject-introspection pkg-config vala"
 makedepends="gtksourceview-devel libgit2-glib-devel libgee08-devel gtkspell3-devel
  webkit2gtk-devel libpeas-devel gsettings-desktop-schemas-devel libsecret-devel
- libdazzle-devel"
+ libdazzle-devel libsoup-devel"
 depends="git"
 short_desc="Git repository viewer for GTK+/GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 69b349c63451d4a0408c69f4a0ebdf3ab10dbdfe Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:41:52 +0100
Subject: [PATCH 2107/3458] gnome-control-center: add libsoup-devel in
 makedepends

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 11071d9f2831..7d4a2dc5c47a 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -15,7 +15,7 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel
  libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel
  clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel
- $(vopt_if cheese cheese-devel)"
+ libsoup-devel $(vopt_if cheese cheese-devel)"
 depends="alsa-plugins-pulseaudio desktop-file-utils upower colord cups-pk-helper
  gsettings-desktop-schemas hicolor-icon-theme iso-codes sound-theme-freedesktop
  cracklib"

From d56cdeac1bb4d7ac4aecd072793191cb8865913a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:42:16 +0100
Subject: [PATCH 2108/3458] liferea: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/liferea/template b/srcpkgs/liferea/template
index f73189fdd10a..bc903237928e 100644
--- a/srcpkgs/liferea/template
+++ b/srcpkgs/liferea/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 build_helper=gir
 hostmakedepends="pkg-config intltool libglib-devel"
-makedepends="libxslt-devel webkit2gtk-devel
+makedepends="libxslt-devel webkit2gtk-devel libsoup-devel
  json-glib-devel $(vopt_if gir gobject-introspection)
  gsettings-desktop-schemas-devel libpeas-devel python3-devel sqlite-devel"
 depends="python3"

From 0a8853c8cf306bd29fb0693ff7f293b028fba8fe Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:42:36 +0100
Subject: [PATCH 2109/3458] luakit: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template
index f5f8bfc372cb..00e5d21c783a 100644
--- a/srcpkgs/luakit/template
+++ b/srcpkgs/luakit/template
@@ -5,7 +5,7 @@ version=2.2.1
 revision=1
 conf_files="/etc/xdg/luakit/*.lua"
 hostmakedepends="pkg-config LuaJIT"
-makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel"
+makedepends="webkit2gtk-devel lua51-luafilesystem LuaJIT-devel libsoup-devel"
 depends="lua51-luafilesystem"
 short_desc="Fast, small, webkit based browser framework extensible by Lua"
 maintainer="Orphaned <orphan@voidlinux.org>"

From b42ffb5167d1ae24cfd88899b91f40fb264c8cd5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:43:00 +0100
Subject: [PATCH 2110/3458] planner: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index 03b07c5b2247..bfc3ed4c4dde 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel"
+ webkit2gtk-devel libsoup-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"

From d14043941f977e03d16bf7ac0cd4b29f21784468 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:43:26 +0100
Subject: [PATCH 2111/3458] pragha: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index 2069b22b1ef6..9c5c08944aef 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -9,7 +9,8 @@ makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-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"
+ libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel
+ libmtp-devel libsoup-devel"
 short_desc="Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later"

From a2a828b00e9c77c3d3f497d93719a48fd00e29b4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:43:49 +0100
Subject: [PATCH 2112/3458] vimb: add libsoup-devel in makedepends

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

diff --git a/srcpkgs/vimb/template b/srcpkgs/vimb/template
index e2fa01273015..d8cce98587a5 100644
--- a/srcpkgs/vimb/template
+++ b/srcpkgs/vimb/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_build_target=RUNPREFIX=/usr
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="webkit2gtk-devel libglib-devel"
+makedepends="webkit2gtk-devel libglib-devel libsoup-devel"
 short_desc="Fast and lightweight web browser based on WebKit/GTK+"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 5d43da06375169404fe6fcf3c5f40ef9c297bd0b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:44:38 +0100
Subject: [PATCH 2113/3458] totem-pl-parser: drop libsoup-gnome-devel from
 makedepends

add libxml2-devel instead
---
 srcpkgs/totem-pl-parser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template
index 403ec783c628..cc5c8fc19344 100644
--- a/srcpkgs/totem-pl-parser/template
+++ b/srcpkgs/totem-pl-parser/template
@@ -1,14 +1,14 @@
 # Template file for 'totem-pl-parser'
 pkgname=totem-pl-parser
 version=3.26.5
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 # XXX needs libquvi>=0.9
 configure_args="-Denable-libarchive=yes -Denable-libgcrypt=yes
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="glib-devel intltool pkg-config"
-makedepends="libarchive-devel libgcrypt-devel libsoup-gnome-devel"
+makedepends="libarchive-devel libgcrypt-devel libxml2-devel"
 short_desc="Totem playlist parser library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"

From dfc7f1f507a5fcf0036b74fb67b88c7fe77228e5 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 19:49:59 +0100
Subject: [PATCH 2114/3458] seahorse-sharing: remove dead package

---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/seahorse-sharing/template | 21 ---------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 srcpkgs/seahorse-sharing/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6507f1acea7f..25281b64c677 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -231,6 +231,7 @@ replaces="
  rkt-stage1-fly<=1.30.0_3
  rkt-stage1-coreos<=1.30.0_3
  scantailor<=0.9.12.1_2
+ seahorse-sharing<=3.8.0_4
  seriespl<=2.3.5_2
  simple-obfs<=0.0.5_2
  sitecopy<=0.16.6_11
diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
deleted file mode 100644
index 4fa4413e10b0..000000000000
--- a/srcpkgs/seahorse-sharing/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'seahorse-sharing'
-pkgname=seahorse-sharing
-version=3.8.0
-revision=4
-build_style=gnu-configure
-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"
-short_desc="Sharing of PGP public keys via DNS-SD and HKP"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=e216e7d5709e688e142b4e96710759f5be54c39ac6c2d58f2eec330e4dfef92b
-
-post_patch() {
-	vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \
-		-e '/accepted_versions=/s/2\.0/2.2/' \
-		configure
-}

From 0714ad569189bc490cb9c44d7d20a3dd9e81d75f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 20:04:46 +0100
Subject: [PATCH 2115/3458] gucharmap: remove appdata-tools from
 hostmakedepends (unused)

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

diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template
index fe88d2df0242..a4829f1d2d87 100644
--- a/srcpkgs/gucharmap/template
+++ b/srcpkgs/gucharmap/template
@@ -7,7 +7,7 @@ build_helper="gir"
 configure_args="--disable-schemas-compile  $(vopt_enable gir introspection)
  --with-unicode-data=${XBPS_SRCDISTDIR}/${pkgname}-${version}"
 hostmakedepends="pkg-config intltool itstool glib-devel
- desktop-file-utils appdata-tools unzip"
+ desktop-file-utils unzip"
 makedepends="gtk+3-devel hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="GNOME Unicode Charmap"

From ba246feece0b880e824021ccfbbf1d2e9bebe4b1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 20:07:40 +0100
Subject: [PATCH 2116/3458] gnome-terminal: remove appdata-tools from
 hostmakedepends (unused)

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

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index e3eb3a5c2c76..303ad85bdb18 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -4,8 +4,7 @@ version=3.38.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
-hostmakedepends="appdata-tools glib-devel intltool itstool
- pkg-config docbook-xsl libxslt"
+hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
 makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
  nautilus-devel vte3-devel"
 depends="desktop-file-utils"

From 2b4c35f76a703f952eb27545a5458c9fef743da7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 20:10:30 +0100
Subject: [PATCH 2117/3458] gnome-screenshot: replace appdata-tools with
 appstream-glib

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

diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index a39483bc437b..0a5511db2173 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -3,7 +3,7 @@ pkgname=gnome-screenshot
 version=3.38.0
 revision=1
 build_style=meson
-hostmakedepends="appdata-tools gettext glib-devel itstool pkg-config"
+hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config"
 makedepends="libcanberra-devel libhandy1-devel"
 depends="desktop-file-utils"
 short_desc="Screenshot capture utility for GNOME"

From b123901ff4a4243d5508d0060e219df9623517f0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 20:13:36 +0100
Subject: [PATCH 2118/3458] gnome-builder: replace appdata-tools with
 appstream-glib

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 3d5932a67a06..648d91a44b7c 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -5,7 +5,7 @@ revision=3
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
-hostmakedepends="pkg-config appdata-tools desktop-file-utils flex gobject-introspection
+hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
  gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
  gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel

From b7338866715028a5c22c7c16e154229522de9997 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 23 Feb 2021 20:14:29 +0100
Subject: [PATCH 2119/3458] appdata-tools: remove package

---
 srcpkgs/appdata-tools/template    | 17 -----------------
 srcpkgs/removed-packages/template |  3 ++-
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/appdata-tools/template

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
deleted file mode 100644
index 40779679ba11..000000000000
--- a/srcpkgs/appdata-tools/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'appdata-tools'
-pkgname=appdata-tools
-version=0.1.8
-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.0-or-later"
-homepage="http://people.freedesktop.org/~hughsient/appdata"
-distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
-checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
-
-post_patch() {
-	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 25281b64c677..9fb4d0f9bed3 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=31
+revision=32
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -13,6 +13,7 @@ replaces="
  XorCurses<=0.2.2_1
  albert<=0.16.1_4
  apg<=2.2.3_5
+ appdata-tools<=0.1.8_2
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3
  avogadro<=1.2.0_8

From 5a6be45d1b7594295e2fe9aae00cb67e082a774e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 23 Feb 2021 17:50:40 +0300
Subject: [PATCH 2120/3458] github-cli: update to 1.6.2

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

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 078d892cfd19..ec3ec65be509 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.5.0
+version=1.6.2
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -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=49c42a3b951b67e29bc66e054fedb90ac2519f7e1bfc5c367e82cb173e4bb056
+checksum=8cc3cafb85e1234f61ef5c4468d07307142fa0cc99bdc7452251cf1cac9b38ae
 
 pre_build() {
 	local _date

From 4b0185fb7352fca0b90ec7a97daec799954ce069 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 22:12:00 +0100
Subject: [PATCH 2121/3458] linux-firmware: update to 20210208.

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

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index bb1fbf54eccb..46fbf7bea584 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,14 +1,14 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20201218
-revision=2
+version=20210208
+revision=1
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=9965b3b963121e9a16ef633e99cbbe5d43daa655aff6ae09c95bc024a4b55142
+checksum=c5d0448326b5fba5bc97ab448d641d8e093e365fc496e5ea3da6bfd31fa94770
 python_version=3
 nostrip=yes
 

From dc179768883b3d32ee607a23c3c11f9a2aa0fb6a Mon Sep 17 00:00:00 2001
From: cryptarch <timothy.rice@unimelb.edu.au>
Date: Wed, 24 Feb 2021 07:26:49 +1100
Subject: [PATCH 2122/3458] puppet: Fix typo in service script (pupper ->
 puppet)

---
 srcpkgs/puppet/files/puppetmaster/run | 2 +-
 srcpkgs/puppet/template               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/puppet/files/puppetmaster/run b/srcpkgs/puppet/files/puppetmaster/run
index ca850d28ca05..3bfb340ab5b7 100644
--- a/srcpkgs/puppet/files/puppetmaster/run
+++ b/srcpkgs/puppet/files/puppetmaster/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 set -e
-install -d -m0755 -o puppet -g pupper /run/puppet
+install -d -m0755 -o puppet -g puppet /run/puppet
 exec puppet master --no-daemonize
diff --git a/srcpkgs/puppet/template b/srcpkgs/puppet/template
index 1ef964745cff..d59c43a5f067 100644
--- a/srcpkgs/puppet/template
+++ b/srcpkgs/puppet/template
@@ -1,7 +1,7 @@
 # Template file for 'puppet'
 pkgname=puppet
 version=6.16.0
-revision=2
+revision=3
 build_style=ruby-module
 hostmakedepends="ruby facter-devel hiera which"
 makedepends="facter-devel"

From 79a79b5495433aac5049a76c4899a5fa116bfef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 23 Feb 2021 22:06:35 +0100
Subject: [PATCH 2123/3458] postgis: update to 3.1.1.

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

diff --git a/srcpkgs/postgis/template b/srcpkgs/postgis/template
index 28e99d427b78..917b643e7a07 100644
--- a/srcpkgs/postgis/template
+++ b/srcpkgs/postgis/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis'
 pkgname=postgis
-version=3.1.0
+version=3.1.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=da06e2456876cd0c6a9bee0636ff700982e900c597d1e4cb80a99a2623400201
+checksum=0e96afef586db6939d48fb22fbfbc9d0de5e6bc1722d6d553d63bb41441a2a7d
 nocross="FIXME: Cannot run test program to determine PROJ version"
 
 pre_configure() {

From 2cf40dc7fc461c2f8154f9c7cd2ee0e8fcc43cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 23 Feb 2021 22:06:36 +0100
Subject: [PATCH 2124/3458] postgis-postgresql12: update to 3.1.1.

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

diff --git a/srcpkgs/postgis-postgresql12/template b/srcpkgs/postgis-postgresql12/template
index 2224f943e1d1..14cac1a0b917 100644
--- a/srcpkgs/postgis-postgresql12/template
+++ b/srcpkgs/postgis-postgresql12/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql12'
 pkgname=postgis-postgresql12
-version=3.1.0
+version=3.1.1
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=da06e2456876cd0c6a9bee0636ff700982e900c597d1e4cb80a99a2623400201
+checksum=0e96afef586db6939d48fb22fbfbc9d0de5e6bc1722d6d553d63bb41441a2a7d
 nocross="FIXME: Cannot run test program to determine PROJ version"
 
 pre_configure() {

From 2ed0630ebe76cd330b7d6249c2ccd839c4cdf9d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 23 Feb 2021 22:06:37 +0100
Subject: [PATCH 2125/3458] postgis-postgresql13: update to 3.1.1.

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

diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
index eaf4dac571b3..d96f110e3a81 100644
--- a/srcpkgs/postgis-postgresql13/template
+++ b/srcpkgs/postgis-postgresql13/template
@@ -1,6 +1,6 @@
 # Template file for 'postgis-postgresql13'
 pkgname=postgis-postgresql13
-version=3.1.0
+version=3.1.1
 revision=1
 wrksrc="postgis-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://postgis.net/"
 changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
 distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=da06e2456876cd0c6a9bee0636ff700982e900c597d1e4cb80a99a2623400201
+checksum=0e96afef586db6939d48fb22fbfbc9d0de5e6bc1722d6d553d63bb41441a2a7d
 nocross="FIXME: Cannot run test program to determine PROJ version"
 
 pre_configure() {

From c76a6a5be1126c11328e0e60caa96e34c55f3fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 02:39:02 -0300
Subject: [PATCH 2126/3458] vboot-utils: update to 89.13729.

Also clean up template.

Related #28507.
---
 .../vboot-utils/patches/fix-glibc-2.28.patch  | 13 -----
 srcpkgs/vboot-utils/patches/fix-musl.patch    | 49 ----------------
 .../vboot-utils/patches/format-glibc.patch    | 58 +++++++++++++++++++
 .../vboot-utils/patches/tpm_lite_stub.patch   | 10 ----
 srcpkgs/vboot-utils/template                  | 52 ++++++++---------
 5 files changed, 82 insertions(+), 100 deletions(-)
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/fix-musl.patch
 create mode 100644 srcpkgs/vboot-utils/patches/format-glibc.patch
 delete mode 100644 srcpkgs/vboot-utils/patches/tpm_lite_stub.patch

diff --git a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch b/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
deleted file mode 100644
index 4f091aaf2ce9..000000000000
--- a/srcpkgs/vboot-utils/patches/fix-glibc-2.28.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index 62635f3f..b27a3eef 100644
---- cgpt/cgpt_wrapper.c
-+++ cgpt/cgpt_wrapper.c
-@@ -20,6 +20,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
- 
- #include "cgpt.h"
- #include "cgpt_nor.h"
-
diff --git a/srcpkgs/vboot-utils/patches/fix-musl.patch b/srcpkgs/vboot-utils/patches/fix-musl.patch
deleted file mode 100644
index 1819bdc2a563..000000000000
--- a/srcpkgs/vboot-utils/patches/fix-musl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- firmware/stub/vboot_api_stub_sf.c.orig
-+++ firmware/stub/vboot_api_stub_sf.c
-@@ -5,7 +5,9 @@
-  * Stub implementations of firmware-provided API functions.
-  */
- 
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-+#endif
- #include <stdint.h>
- 
- #define _STUB_IMPLEMENTATION_
-@@ -34,11 +36,13 @@ static struct alloc_node *alloc_head;
- 
- static void print_stacktrace(void)
- {
-+#if defined(__GLIBC__)
- 	void *buffer[MAX_STACK_LEVELS];
- 	int levels = backtrace(buffer, MAX_STACK_LEVELS);
- 
- 	// print to stderr (fd = 2), and remove this function from the trace
- 	backtrace_symbols_fd(buffer + 1, levels - 1, 2);
-+#endif
- }
- 
- void *VbExMalloc(size_t size)
-@@ -57,7 +61,11 @@ void *VbExMalloc(size_t size)
- 	node->next = alloc_head;
- 	node->ptr = p;
- 	node->size = size;
-+#if defined(__GLIBC__)
- 	node->bt_levels = backtrace(node->bt_buffer, MAX_STACK_LEVELS);
-+#else
-+	node->bt_levels = 0;
-+#endif
- 	alloc_head = node;
- 
- 	return p;
-@@ -118,8 +126,10 @@ int vboot_api_stub_check_memory(void)
- 		next = node->next;
- 		fprintf(stderr, "\nptr=%p, size=%zd\n", node->ptr, node->size);
- 		fflush(stderr);
-+#if defined(__GLIBC__)
- 		backtrace_symbols_fd(node->bt_buffer + 1, node->bt_levels - 1,
- 				     2);
-+#endif
- 		free(node);
- 	}
- 
diff --git a/srcpkgs/vboot-utils/patches/format-glibc.patch b/srcpkgs/vboot-utils/patches/format-glibc.patch
new file mode 100644
index 000000000000..567ee42176c1
--- /dev/null
+++ b/srcpkgs/vboot-utils/patches/format-glibc.patch
@@ -0,0 +1,58 @@
+commit 8f2787e5eb72406231b83a4bc6ee20daa640ab41
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Sun Feb 21 00:45:12 2021 -0300
+
+    Fix wrong memory access on 32-bit glibc.
+    
+    off_t on 32-bit glibc is a 32-bit value by default, and building with
+    large file is optional.
+    
+    We also fix the makefile to actually enable large file support.
+    
+    This isn't an issue on musl since it builds with large file support by
+    default.
+
+diff --git Makefile Makefile
+index 3a72d3d..0f9caa4 100644
+--- Makefile
++++ Makefile
+@@ -252,7 +252,7 @@ CFLAGS += -D_GNU_SOURCE
+ # but if the environment doesn't support it, at least compile support
+ # for what is possible.
+ # Pass through cflags_use_64bits to evaluate it only once, here.
+-cflags_use_64bits := $(call test_ccflag,-D_FILE_OFFSET_BITS=64,\#include <fts.h>)
++cflags_use_64bits := $(call test_ccflag,-D_FILE_OFFSET_BITS=64,#include <fts.h>)
+ CFLAGS += $(cflags_use_64bits)
+ 
+ # Code coverage
+diff --git futility/cmd_gbb_utility.c futility/cmd_gbb_utility.c
+index 2a76ecb..ab0d568 100644
+--- futility/cmd_gbb_utility.c
++++ futility/cmd_gbb_utility.c
+@@ -225,7 +225,7 @@ static uint8_t *read_entire_file(const char *filename, off_t *sizeptr)
+ 	buf = (uint8_t *) malloc(sb.st_size);
+ 	if (!buf) {
+ 		fprintf(stderr, "ERROR: can't malloc %" PRIi64 " bytes: %s\n",
+-			sb.st_size, strerror(errno));
++			(int64_t)sb.st_size, strerror(errno));
+ 		goto fail;
+ 	}
+ 
+@@ -333,7 +333,7 @@ static int read_from_file(const char *msg, const char *filename,
+ 	if (ferror(fp)) {
+ 		fprintf(stderr,
+ 			"ERROR: Read %zu/%" PRIi64 " bytes from %s: %s\n",
+-			count, sb.st_size, filename, strerror(errno));
++			count, (int64_t)sb.st_size, filename, strerror(errno));
+ 		errorcnt++;
+ 		r = errno;
+ 	}
+@@ -557,7 +557,7 @@ static int do_gbb(int argc, char *argv[])
+ 			errorcnt++;
+ 			fprintf(stderr,
+ 				"ERROR: can't malloc %" PRIi64 " bytes: %s\n",
+-				filesize, strerror(errno));
++				(int64_t)filesize, strerror(errno));
+ 			break;
+ 		}
+ 
diff --git a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch b/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
deleted file mode 100644
index a736beb856ad..000000000000
--- a/srcpkgs/vboot-utils/patches/tpm_lite_stub.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./firmware/stub/tpm_lite_stub.c.orig	2015-06-16 12:29:51.609619681 +0200
-+++ ./firmware/stub/tpm_lite_stub.c	2015-06-16 12:30:01.216620121 +0200
-@@ -14,6 +14,7 @@
- #include "utility.h"
- #include "vboot_api.h"
- 
-+#include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 610689759642..dd93cb9151a9 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,42 +1,38 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
-version=45.7262
-revision=13
+version=89.13729
+revision=1
+_version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
-_githash=0e8c964915fffb58032bb59bdb31949de718ca90
-hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+create_wrksrc=yes
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="pkg-config"
+makedepends="libressl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git"
-CFLAGS='-D_GNU_SOURCE -Wno-error -fcommon'
+distfiles="https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git/+archive/refs/heads/release-R${_version}.B.tar.gz"
+checksum=@3d8edd7e3a1672b29f02d93c4cf89f19ad7477694968b0653aa968783c8ba3e6
+# 2crypto specifies a section for some variables, which lead to text relocations in the binary
+# let's play it safe and disable PIE
+nopie=yes
 
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/8508/steps/shell_3/logs/stdio" ;;
+case $XBPS_TARGET_MACHINE in
+	x86_64*) _arch=x86_64 ;;
+	i686*) _arch=x86 ;;
+	arm*|aarch64*) _arch=arm ;;
+	*) broken="This package doesn't have a configuration for this target" ;;
 esac
+make_build_args="ARCH=${_arch} WERROR="
 
-do_fetch() {
-	git clone https://chromium.googlesource.com/chromiumos/platform/vboot_reference.git $pkgname-$version || true
-	cd $pkgname-$version
-	git checkout $_githash
-}
-
-do_build() {
-	local _arch=
-	sed -i "s/MTD_CHAR_MAJOR/90/" cgpt/cgpt_wrapper.c
-	case $XBPS_TARGET_MACHINE in
-		x86_64*) _arch=x86_64 ;;
-		i686*) _arch=x86 ;;
-		arm*) _arch=arm ;;
-	esac
-	make CC="$CC" LD="$CC" AR="$AR" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-		MINIMAL=1 ARCH=$_arch ${makejobs} \
-		cgpt utils futil
-}
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+	export LDLIBS="-lfts"
+fi
 
-do_install() {
-	make STRIP=true DESTDIR=${DESTDIR} MINIMAL=1 install
+post_install() {
 	vmkdir usr/share/vboot
 	vcopy tests/devkeys usr/share/vboot/devkeys
 	vlicense LICENSE

From 1416a9a10bca7f5b218206c1f4654269e6eaaa32 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 23 Feb 2021 19:07:09 +0300
Subject: [PATCH 2127/3458] font-iosevka: update to 5.0.3

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

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 7027b3212ff3..7a5ad6c9ebf8 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.5.0
+version=5.0.3
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -12,8 +12,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  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="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 884e82e41f094eb2dc50c2d2706237416ad6bed83cf57d0f76fb884d38e285c5
- 56987be16eb0e7f5ac653ac66eede10e5e2431b62a2c70f152734c348963e09e"
+ e49181e4bdc39d449ef857d129c58ca37d1e21dc936b7c44e7705f1f07293ef0
+ 21fc98a7d7cc2ddc2d5c40f03e9d67eab95eb413828d12a95a992f4fa73a8f13"
 
 font_dirs="/usr/share/fonts/TTF"
 

From a1c8ce48c53d590ec5047d115fdc79523816432f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 23 Feb 2021 22:40:08 +0100
Subject: [PATCH 2128/3458] glmark2: update to 2021.02.

---
 .../glmark2-2020.04-Build:-Fix-Python-3.patch | 22 -------------------
 srcpkgs/glmark2/template                      | 11 +++++-----
 2 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch

diff --git a/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch b/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch
deleted file mode 100644
index 7cdbe6c6044e..000000000000
--- a/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 06e4728ba7312efa0fd595e30745e60ce88f1a4f Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Sun, 3 May 2020 18:20:05 +0200
-Subject: [PATCH] Build: Fix Python 3 incompatibility
-
----
- wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git wscript wscript
-index aefde70..e09fa78 100644
---- wscript
-+++ wscript
-@@ -20,7 +20,7 @@ FLAVORS = {
-     'x11-gl' : 'glmark2',
-     'x11-glesv2' : 'glmark2-es2',
- }
--FLAVORS_STR = ", ".join(sorted(FLAVORS.keys() + ['all-linux', 'all-win32']))
-+FLAVORS_STR = ", ".join(sorted(list(FLAVORS) + ['all-linux', 'all-win32']))
- 
- def linux_flavors():
-     return [f for f in FLAVORS.keys() if not f.startswith('win32')]
diff --git a/srcpkgs/glmark2/template b/srcpkgs/glmark2/template
index cbc18ec4d8c1..cc4ce4a0aa52 100644
--- a/srcpkgs/glmark2/template
+++ b/srcpkgs/glmark2/template
@@ -1,15 +1,16 @@
 # Template file for 'glmark2'
 pkgname=glmark2
-version=2020.04
+version=2021.02
 revision=1
-build_style=waf3
-configure_args="--with-flavors=x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2"
+build_style=meson
+configure_args="-Dflavors=x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2"
 hostmakedepends="pkg-config wayland-devel"
-makedepends="libjpeg-turbo-devel libpng12-devel libX11-devel MesaLib-devel wayland-devel
+makedepends="libjpeg-turbo-devel libpng-devel libX11-devel MesaLib-devel wayland-devel
  wayland-protocols"
 short_desc="OpenGL 2.0 and ES 2.0 benchmark"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/glmark2/glmark2"
+changelog="https://raw.githubusercontent.com/glmark2/glmark2/master/NEWS"
 distfiles="https://github.com/glmark2/glmark2/archive/${version}.tar.gz"
-checksum=0fa7723111c928a73c04d4fa4adfc15a9dea6d335fe189f59c74ae5af26f99a2
+checksum=bebadb78c13aea5e88ed892e5563101ccb745b75f1dc86a8fc7229f00d78cbf1

From abeb7a73c8d7c2f37978f8884d05b720a26287d8 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 23 Feb 2021 19:00:25 +0300
Subject: [PATCH 2129/3458] font-sarasa-gothic: update to 0.18.2

---
 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 25a9648e4641..46f3e7a012fa 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.17.0
+version=0.18.2
 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=56b693d54ec185acb704d19640daa5bd1f4a98a1bdec5f1d447b9def5f4d6210
+checksum=5e79d01c3e015101eb941dc899ce0b581f7f7cb05a8660409f59a5a1c8f53c89
 
 font_dirs="/usr/share/fonts/TTF"
 

From db9b2a59a4bf3b60c801d07c737113c94e7f06d4 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Tue, 23 Feb 2021 06:04:16 -0700
Subject: [PATCH 2130/3458] wbg: update to 1.0.2.

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

diff --git a/srcpkgs/wbg/template b/srcpkgs/wbg/template
index 28fd6b2d9dcd..61775d8151b9 100644
--- a/srcpkgs/wbg/template
+++ b/srcpkgs/wbg/template
@@ -1,6 +1,6 @@
 # Template file for 'wbg'
 pkgname=wbg
-version=1.0.1
+version=1.0.2
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -12,4 +12,4 @@ maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
 homepage="https://codeberg.org/dnkl/wbg"
 distfiles="https://codeberg.org/dnkl/wbg/archive/${version}.tar.gz"
-checksum=20411bb0aead3775616ceaccd48c2a3028400e33094571acf7b6c0005154ac9d
+checksum=3afcad17233ae3120369eaaf54bde41be8629bcda375d75a2d0d893649e802bc

From de1233640e8624e3e95ab7109cc643c2858f7a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 23 Feb 2021 13:46:06 +0100
Subject: [PATCH 2131/3458] doctl: update to 1.57.0.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a8bff28abc28..838c22200230 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.56.0
+version=1.57.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,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=1b566c84cff43c5dd31c13a2491c80decc8722d4119d219c5e09be783f544356
+checksum=a5a3eda3075f141f419d7bf1bd4e8e0decf729b5a7ff82b5b01a6331c4f2afa9

From cf411fa40f9f2c039696e5bbb164090298178d2a Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 23 Feb 2021 09:32:47 +0100
Subject: [PATCH 2132/3458] volta: update to 1.0.2

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

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d1542354..3b24894707d4 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,6 +1,6 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.1
+version=1.0.2
 revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
@@ -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=8d12a9f8754a982dfcfdb21cef29fa6d087e7e1022d0d3fe66f04b90f081a98a
+checksum=83659888099408dbc44d47a6bba6c3d450ebd11580f74fd3e64ab6c1adbb5724
 
 post_install() {
 	vlicense LICENSE

From af87de8ad8c5ecf0edc7a76eed9edaf4f3c1c5af Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 23 Feb 2021 09:17:43 +0100
Subject: [PATCH 2133/3458] portage: update to 3.0.15.

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

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 4fa784964fe8..091a37412b11 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.14
+version=3.0.15
 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=59bebfa0aa1ff2ae3f27383f0b6c7f5d271050c080f6bfd3da86c2dcf7395aaf
+checksum=58779c9678112804b4fdd9107d3dad4141d6882d0035cde44e174be28f2d5898
 
 conf_files="
 	/etc/dispatch-conf.conf

From 0572a144fdd6bc85942a70942d1ea855a9618f93 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 22 Feb 2021 18:34:13 +0000
Subject: [PATCH 2134/3458] android-file-transfer-linux: update to 4.2.

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

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83b..655713bfbbed 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,6 +1,6 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
-version=4.0
+version=4.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
@@ -12,4 +12,4 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/whoozle/android-file-transfer-linux"
 distfiles="https://github.com/whoozle/android-file-transfer-linux/archive/v${version}.tar.gz"
-checksum=1923a15f276a730ddb9709de43414766d235f74940429ac314b0c42f47c2c471
+checksum=cc607d68e8a18273c9b56975a70a0e68fbdf9d5b903b2727a345a605ff48a19f

From 2e5b24ae14747b4a68427ba3e85cd4fccf9f9ebf Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sun, 21 Feb 2021 13:53:30 +0700
Subject: [PATCH 2135/3458] vivaldi: update to 3.6.2165.40

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 3a1d3388837b..5a02ed74ad89 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.6.2165.36
+version=3.6.2165.40
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=0840172d85bcb0218f3e3f90d548604f0aee219964b44fc944e9e9e2dffbfdf1
+	checksum=7e60bd8c1c452e2208c54190d84646b56646c4f89e4a91f655653bfb68eb868a
 else
 	_debarch=i386
-	checksum=3b8f03111c2ed6b596cd00171684ec3c7803cc6783dc1673ebe36e81909aeff2
+	checksum=c68601c114f80dd0c1b0b801d94aadf82f6711ea9f02e050fd283f9a88fd9401
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From cf1c33f070a33c5457df72201c615810e30c5dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 17:48:47 -0300
Subject: [PATCH 2136/3458] gip: update to 0.7.0.

---
 srcpkgs/gip/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index dd9cde1f4910..7416e81016d1 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,22 +1,16 @@
 # Template file for 'gip'
 pkgname=gip
-version=0.6.0
-revision=2
+version=0.7.0
+revision=1
 build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libressl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/dalance/gip"
 distfiles="https://github.com/dalance/gip/archive/v${version}.tar.gz"
-checksum=b8f5ba15a554ba4cb85a32449a8f665db24ab9dde7c47e7e6e10724fc9a76422
-broken="No longer builds with current Rust (url crate)"
-
-pre_build() {
-	# the defined version (0.2.39 at the time of writing) is buggy on
-	# ppc64*-musl, pin the oldest newer working version; on next update
-	# please check Cargo.lock to verify if this is still necessary
-	cargo update --package libc --precise 0.2.43
-}
+checksum=69a23f438279a570293fab165f94a7e251a49b9b8de96703a0ab2542facffcb9
 
 post_install() {
 	vlicense LICENSE-MIT

From db1c158aa1d5d5f0863c7b3f627a19a8dae1de10 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 20 Feb 2021 11:32:12 -0800
Subject: [PATCH 2137/3458] pinebookpro-base: depend on dracut

The PBP kernel has more modules, and thus needs an initramfs to boot.
Add dracut to ensure that PBP images created by mklive boot correctly.

https://github.com/void-linux/void-mklive/issues/180
---
 srcpkgs/pinebookpro-base/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pinebookpro-base/template b/srcpkgs/pinebookpro-base/template
index a43345eaafa8..42178af017ea 100644
--- a/srcpkgs/pinebookpro-base/template
+++ b/srcpkgs/pinebookpro-base/template
@@ -1,10 +1,11 @@
 # Template file for 'pinebookpro-base'
 pkgname=pinebookpro-base
 version=0.4
-revision=1
+revision=2
 archs="aarch64*"
 build_style=meta
-depends="pinebookpro-kernel linux-firmware pinebookpro-firmware pinebookpro-uboot"
+depends="pinebookpro-kernel linux-firmware pinebookpro-firmware
+ pinebookpro-uboot dracut"
 short_desc="Void Linux Pinebook Pro platform package"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="Public Domain"

From b353ec07cac98aeff6af3f35c587e22d78dc2bbd Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:36:15 +0100
Subject: [PATCH 2138/3458] trackballs: update to 1.3.2.

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

diff --git a/srcpkgs/trackballs/template b/srcpkgs/trackballs/template
index 8e6989658a92..4fe2df36d959 100644
--- a/srcpkgs/trackballs/template
+++ b/srcpkgs/trackballs/template
@@ -1,7 +1,7 @@
 # Template file for 'trackballs'
 pkgname=trackballs
-version=1.3.1
-revision=2
+version=1.3.2
+revision=1
 build_style=cmake
 hostmakedepends="gettext guile pkg-config"
 makedepends="zlib-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel guile-devel"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://trackballs.github.io/"
 distfiles="https://github.com/trackballs/trackballs/archive/v${version}.tar.gz"
-checksum=57f577648847b46abc623c2d53fa7c41ae47a859b5c8bd68b4e347a604fbcebc
+checksum=fd4c3e4860db8ca6e8e7ad870a5973d51323a77ed8d7b40d859d9b277c53fc02

From f5c989c7e5e1b74cd0ff60c1a44473d2d12a4063 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:02:54 +0100
Subject: [PATCH 2139/3458] bluedevil: update to 5.21.1

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

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 78edbcd99d6e..1ed2ec65cdc0 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b3de4e903c5669a63688940513ab7035b90d5950635c824857ad8d6a9adbeb2e
+checksum=56aae53637129110e4b77cf4e569bf140d8c9919524c91aa1874b172997ac92c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 9fcb5e1f88753f540479ebc7ee2731d5f80eace9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:02:56 +0100
Subject: [PATCH 2140/3458] breeze-gtk: update to 5.21.1

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

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 43adc80f87d6..96ade305e689 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b4b4ce599bd23bf54101bdac7417daa4921b297b232622dc5a8a3426b97676ca
+checksum=6736f681411912b1347c4996aa05e24cf7beaf73331424cc3822216bd211b893
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 96a2b131f227925bdea71c8c81342f0e96ff7232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:03 +0100
Subject: [PATCH 2141/3458] breeze: update to 5.21.1

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

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index ee4737452866..a53d72262207 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.20.5
+version=5.21.1
 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"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d43845a34e08d393bac182d9ede863950d33e207c7f2841a8cd419aa182cf507
+checksum=65d95562489f2dc66240b690882f467a4a7990885fd7185337a5006709d3b7f5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 60f3972db9941f10c5a75d488fd8c8547c68e2f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:05 +0100
Subject: [PATCH 2142/3458] kactivitymanagerd: update to 5.21.1

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

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index f6e36c88d077..f9b0a3569760 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c800c2782884cdbb906c99709f8bbce4a45c5b9abde73cf4fa5222acf8d0facb
+checksum=43b605ad194884a058f31eef315bbf2397edaa309c7e79968a1a9349bd9ffcf3
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUN_RESULT_VAR=0"

From 0f346aea57e05abfa7fa55c2177143c7f96b0a50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:07 +0100
Subject: [PATCH 2143/3458] kde-cli-tools: update to 5.21.1

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

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index e891774140f3..63a2eb55e360 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0440b2d0359bca871134bfdbcc71b72c22af8c88601f1abceb83219a1877627c
+checksum=63d1d47b0419ff44098c32c8c206e4e0bbe57c15ab4bdb3e9c6aac9587186520
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From da0b6997122e8af4b192296f67555f96a445a46e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:09 +0100
Subject: [PATCH 2144/3458] kde-gtk-config5: update to 5.21.1

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

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 2c3baa97dc43..5e573fb3c367 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.20.5
+version=5.21.1
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=39a8dd1c143d741846017dc351ccd9161e1dfd710e3d18609327f30044de6eb8
+checksum=ac21ddf13c90a52829a48c51b05408228445ce0999c0221ffcde52977a20075b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From e888442475e94ea3b622686e6f4706864aa41da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:11 +0100
Subject: [PATCH 2145/3458] kdecoration: update to 5.21.1

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

diff --git a/common/shlibs b/common/shlibs
index 89aa301681fd..c9f9bf389e85 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -960,7 +960,7 @@ libsuil-0.so.0 suil-0.6.4_1
 libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
-libkdecorations2private.so.7 kdecoration-5.18.0_1
+libkdecorations2private.so.8 kdecoration-5.21.0_1
 libGlacier2.so.37 libIce-3.7.5_1
 libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_1
 libIce.so.37 libIce-3.7.5_1
@@ -977,6 +977,20 @@ libIceDB.so.37 libIce-3.7.5_1
 libIceXML.so.37 libIce-3.7.5_1
 libIceDiscovery.so.37 libIce-3.7.5_1
 libIceLocatorDiscovery.so.37 libIce-3.7.5_1
+libkdecorations2private.so.8 kdecoration-5.20.90_1
+libGlacier2.so.35 libIce-3.5.0_1
+libIce.so.35 libIce-3.5.0_1
+libIceSSL.so.35 libIce-3.5.0_1
+libIceUtil.so.35 libIce-3.5.0_1
+libIceStormService.so.35 libIce-3.5.0_1
+libIceStorm.so.35 libIce-3.5.0_1
+libFreeze.so.35 libIce-3.5.0_1
+libSlice.so.35 libIce-3.5.0_1
+libIceBox.so.35 libIce-3.5.0_1
+libIceGrid.so.35 libIce-3.5.0_1
+libIcePatch2.so.35 libIce-3.5.0_1
+libIceDB.so.35 libIce-3.5.0_1
+libIceXML.so.35 libIce-3.5.0_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 534634887b02..470ec83f97d2 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6e973a9b18da376ce797be85fc60b3a1d53ae69868fabeadbefae1279c3181cd
+checksum=05945d947e9852ee80e6e846478bd349e2e5bfce1a7c76e41e5945bc2122c8e3
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From ed93e1afad596231146be7d6607e80b3f50f7f45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:14 +0100
Subject: [PATCH 2146/3458] kdeplasma-addons5: update to 5.21.1

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

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 21eb370b7b52..8829ab5943c5 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.20.5
+version=5.21.1
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=56c4bba1fa743d675b340014bfd31c546421ff8e09dfd1ef29d45c278eadd7eb
+checksum=c82d0d955316bcf466a6cf7da2e7b72dbda82358ba83ee2277a4b6a56688f376
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From d64c028e08e05cf29964e0861ab6435c2a9810ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:16 +0100
Subject: [PATCH 2147/3458] kgamma5: update to 5.21.1

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

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 581cd204ebed..d725cbbd8851 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.20.5
+version=5.21.1
 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://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8d765e8f13e7195b0fbd41feee8a1f5a2a605c64141d887c1221f631f5bbc0bf
+checksum=828e4b46e6df4696ff9e187fd5a1c140b64ade506b87a9730d641129c7a1268c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From 98c6a6ae9cee96b066a2ae38edad720ce41f57a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:18 +0100
Subject: [PATCH 2148/3458] khotkeys: update to 5.21.1

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

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index eff06be31ec5..9ada879e7dd2 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=081a132b699b0ce9fa0c05b2e7f2ec7efeea270db5e16a359685e0445bcf88c7
+checksum=0783a904a4bfe94aca9487b8a606df2041cf2d86c5b7c8c92fd2fcff70d0e6ce
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 1d0fc103afa1cd6f487e469abfcb93056048c39e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:20 +0100
Subject: [PATCH 2149/3458] kinfocenter: update to 5.21.1

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

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index df8658dc9ea0..8505d7d624f3 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.20.5
+version=5.21.1
 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, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=55eba3e9f3b64a9508db6a2b4106b243d62d29be2ea08b388bb57297b9db7b4c
+checksum=ad586c8b213443777bab0a0b3044d76acd5b120363b9668ad9c97de20a4ac5bb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 136e2ce6926bb10532cf50d46f8b8e76a67aaf6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:22 +0100
Subject: [PATCH 2150/3458] kmenuedit: update to 5.21.1

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

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 343b05f8eabd..7f44c9ec8c8d 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=eebd0a906538c64b25920a194753102b051f75935743278abef792c3e983f52a
+checksum=053030cb11fc7766bb6f9dd340afaffb04942c78f5d347ad34a9d7649df17ab2

From 9a0f4643129df3dc6f7ffb7d61ee3f23ac6febf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:24 +0100
Subject: [PATCH 2151/3458] kscreen: update to 5.21.1

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

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index edde32d60ed8..8425027bee00 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.20.5
+version=5.21.1
 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, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=de08a3ac81e88befd8d62752f8e46a9fbc244f7369c6e3b642cfb4f65a9e52da
+checksum=834b148d45c876bb6efd260923b78a73cac06f54b7ec13e23c7b9f17414f2970
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From a8555378ec7b5f17fb0fe28345fe5222bd76ecb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:27 +0100
Subject: [PATCH 2152/3458] kscreenlocker: update to 5.21.1

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

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index c6163e96737a..059ea392163d 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,19 +1,19 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons qt5-qmake
  qt5-host-tools gettext kcmutils"
 makedepends="kdeclarative-devel kidletime-devel kcmutils-devel
- kwayland-devel libXi-devel pam-devel libXcursor-devel"
+ libSM-devel kwayland-devel libXi-devel pam-devel libXcursor-devel"
 short_desc="KDE Library and components for secure lock screen architecture"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=802fef234420251eb3f0b50db84f52fe8c5d8859d897ec9ace855d0239a4c01f
+checksum=db2f1507409dd56418761dc2efdd207e06f6878b217b4c725cc02f76b6f6f5e2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From f9fbd49a8c9f4dd8881be1527d5069bb104fa1fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:29 +0100
Subject: [PATCH 2153/3458] ksshaskpass: update to 5.21.1

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

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 31d0dbb8f0b4..c21aaf522c42 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3e135f8e8092bfe9f19dbd6bc12dc052330c4ac8a6a671e835e5e775ab2a65f6
+checksum=f3b75a913643504e8f71eb5135367c3f26d8ee8c3260dde645786a8c079b5b85

From 566f6987001eb3bfef5a5956d8df43244eadfb9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:31 +0100
Subject: [PATCH 2154/3458] ksysguard: update to 5.21.1

---
 srcpkgs/ksysguard/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index a90faea9b1f4..907d95691cfd 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,16 +1,17 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools
- gettext kcoreaddons"
-makedepends="knewstuff-devel libksysguard-devel kinit-devel libsensors-devel"
+ pkg-config gettext kcoreaddons"
+makedepends="knewstuff-devel libksysguard-devel kinit-devel libsensors-devel
+ libnl3-devel libpcap-devel"
 depends="hicolor-icon-theme lm_sensors"
 short_desc="KDE program to monitor various elements of your system"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=32f5227b2c1f91cd64fcee6b401209582cfffb16e2b015c6d6513e9f4d1dab35
+checksum=95f7c9072fe0f0e3dd03b05f820bff07928ede00bc728e56db772c02b464ccba

From d3c6f0add0bed2e1ffa3a50631687dc555f16202 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:33 +0100
Subject: [PATCH 2155/3458] kwallet-pam: update to 5.21.1

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

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 51e68d7afd27..0bb0c95b80b3 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=53e611baeb02e66ff739045ffb4b913f4e963630baad4cfa96ba77b750fdc1f2
+checksum=eb9f228ad1c019f04f41d06b6a039f81d42fbe939d1a6904ded7bb7ba9f26d79

From 12f9fa9950105de1e998f7f1ce5927b33a0703bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:35 +0100
Subject: [PATCH 2156/3458] kwayland-integration: update to 5.21.1

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

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 496c264f057a..635f76541a6f 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=33f364670a1c19b84fe1bda40e543ebcc9e7593e932a7d18b9815f150ac21f67
+checksum=6421c57e6f07058e4cf4ba21d997fc38f7fdf0af922dd48681528fed98a40f68

From 4cd1262ffd74b4092a3fb1b75b26e4501f3db8ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:37 +0100
Subject: [PATCH 2157/3458] kwayland-server: update to 5.21.1

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

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index 2f7ab73c006c..f575fa1e8e9a 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e0f36407ba32721936b0b14894480279f60effc088e4e1f3cde6e5c584945d2a
+checksum=350937f9c426523f1fce5445db290bbb50de6cbf3c11ebbd8081cb815123a101
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4cbf6a2224087b646d3e7d9fd1d9946845fb0e41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:41 +0100
Subject: [PATCH 2158/3458] kwin: update to 5.21.1

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

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index c9d259f71bf0..24fee095ca3f 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,14 +9,14 @@ makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel
  kscreenlocker-devel kinit-devel xcb-util-cursor-devel qt5-multimedia-devel
  kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel
  libICE-devel xcb-util-wm-devel qt5-sensors-devel libcap-devel
- kwayland-server-devel $(vopt_if pipewire pipewire-devel)"
+ kwayland-server-devel $(vopt_if pipewire pipewire-devel) krunner-devel"
 depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.15.3"
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ec142543935a1c9fe9b8e7e73db1bdf58669990d7c1611424062bbdd9e21384e
+checksum=5a044450ffdc1610a73d5db3f3f50d2513de930f4be5c167da703cc7d23abc0c
 
 build_options="pipewire"
 

From 0df01a560894784ef8d1bfb6b6ce4bb746886ecd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:43 +0100
Subject: [PATCH 2159/3458] kwrited: update to 5.21.1

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

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 7d210310dc2e..75874417fd18 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bfb2bb88e6b4e49a69b5c90b4688f3aba3b8e6771221e7c9332293bfc05a1bc0
+checksum=03665581469869162ce4ec355ab3d3882804dfba986caee4bf1c918efb94ba97

From c25f68b8586498f1f3ae53d2a303784123952505 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:45 +0100
Subject: [PATCH 2160/3458] libkscreen: update to 5.21.1

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

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index f97d30e1a019..e139078fa73c 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1ba79cdf4505159108a71f279eac3f746972b395bf1b9b49f2c577a2cf9c8118
+checksum=5f149e038259d840a8c0e043c9d245520e34bfb7fe05c94b686597edb7ad2f43
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 77509fcaae87d41d11a94d9b204f01450968231d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:47 +0100
Subject: [PATCH 2161/3458] libksysguard: update to 5.21.1

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

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 9bba7c323c4b..33025a907991 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a8a5635c88559567342eba77c707269ab23bc0ce1775ce424c0abd57a83e5d6c
+checksum=e846b0ebf1a347e6f8637a70866c17b1aa8e806c910085729b0fcf08ae74ea93
 
 build_options="webengine"
 

From c2029e01c2f0a97372bc096eb37f681ac75a1afa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:49 +0100
Subject: [PATCH 2162/3458] milou: update to 5.21.1

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

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index a5cef1ecbc82..9950cf103a15 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=704c41b4470e4cd84484406c187bf218c9f89f9c46a1024c6dd19af8856cb7c2
+checksum=ae2883686592d3e583461d1f3222478f8b0bd8abe80e57f8e48e6491ca99b524
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 7e414f38ded398d21e211fbd1b4c6d2dccdc920c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:52 +0100
Subject: [PATCH 2163/3458] oxygen: update to 5.21.1

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

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index ef228408cd53..ac91c25e6faa 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=19a74245a6a58f015813b9a7a72cc26622c016975d55bfb548db36d0239ad298
+checksum=8fc30be19b5bbb10f294329733178620de7dd8ac3f6715177925145a64fbabe8

From 612fb800daa19296fa5beba64ef3491afc079b23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:54 +0100
Subject: [PATCH 2164/3458] plasma-browser-integration: update to 5.21.1

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

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 18066c95a3f4..08a5c5ce55e6 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,19 +1,19 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons qt5-host-tools
  gettext qt5-qmake"
 makedepends="qt5-devel kio-devel ki18n-devel krunner-devel kactivities5-devel
- purpose-devel kfilemetadata5-devel"
+ plasma-workspace-devel purpose-devel kfilemetadata5-devel"
 short_desc="Integration of web browsers with the KDE Plasma 5 desktop"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c2a665733e09887782ab4235e9e6b3aab2418f3666fd687ab6431546dbafff0f
+checksum=e3fa9a9e322f33ea6cb47ad4bc60e321259ad6bbeafc729b5e5e8c74088d2955
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 56a389a92fd17f930fbd5ef579c4d2a2a25b02ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:03:59 +0100
Subject: [PATCH 2165/3458] plasma-desktop: update to 5.21.1

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

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 40a65b47d587..e0b176443aa9 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,8 +15,9 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bd656e93f44fd528bcd2e0e4c79cbc1adb837369f9a27291bcc5dcd9df2787b9
+checksum=a514664e50f3213b8afde0dab9b8d6a2b097238d2aad4dcdd359aaa16ff02fd2
 replaces="user-manager>=0"
+python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig-devel kcoreaddons-devel kded

From 049b48a58c851cdfc6795c73e6ab47a27ee7f169 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:01 +0100
Subject: [PATCH 2166/3458] plasma-disks: update to 5.21.1

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

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index c2d8eaf11e2d..dd8378f6b93b 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=219b542853e569756225b6805f1ae81d305c7aa2be81f722704ff82dde709c2d
+checksum=d48a58311f876ea2e5760479c745c74a5bc68ad2b62f991120a52f4cb930c65f

From 80245ee7574fe9a9bbf857f79a308ab045fedf8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:03 +0100
Subject: [PATCH 2167/3458] plasma-integration: update to 5.21.1

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

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index cf42ea48742e..02a58051f937 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.20.5
+version=5.21.1
 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"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a8271e6e61b2e96807ce388c923163352a5e94533355f39edb53389fab95cdf3
+checksum=0743ace10d5fe1eb685a276e9f5926d636de304f4612acc23733b9296b7ea144

From e8ba7ca4174e43b5305d7f47192ab814b11aa4bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:05 +0100
Subject: [PATCH 2168/3458] plasma-nm: update to 5.21.1

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

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index 9ddeb8a4113c..9881eac28771 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=468df2bf99907382125a4822322d23c71e1a59f792eba497d89483dc94180e18
+checksum=c4ab9a208ae3fb8324f59ff8727a2fc4dc5fd132664b444cbce5294ae674e951
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 0f2024bccbfafd3f8f9cb2f9ab0091ccf1c86f74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:07 +0100
Subject: [PATCH 2169/3458] plasma-pa: update to 5.21.1

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

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 5fdb5a311d1f..6aebd4cb6a05 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4d84422753aa362383945e8a8a9e6d6fc853f8d918e7b0b7eb1d24317e5e7377
+checksum=396ed88423c9ef8cd6c2ea65425d6387f7cd2224698f29c434048f18f3de7d9f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 386466cd35e52197bc94f1a5ac6a5fae74a9781f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:10 +0100
Subject: [PATCH 2170/3458] plasma-sdk: update to 5.21.1

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

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 5d82d7cf4a9c..4adc76b57aeb 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=de68f253321f2c58b71c0736fbe17e132b7edcc2c86b526c7db8290bc0b1988d
+checksum=48ec922d4e1b07da05bd3d7dc84b11c818a806569ca38c934e56a985eea32868
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From c772bbd740b4fe33708eccb0a7b1d916e8f8461c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:12 +0100
Subject: [PATCH 2171/3458] plasma-thunderbolt: update to 5.21.1

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

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index a50527700175..710c8630b471 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6013e7b6ffa140f17c128f091d526a561c6e91109da23b3368b1fe62dffd851a
+checksum=fd3b506c321fec4875d263a18fab644fed5daa4ef69f1a9c41f972306697deec
 
 do_check() {
 	: # Requires running dbus and bolt services

From 97900b274826a553a0284b00ecb753e1d156b0c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:14 +0100
Subject: [PATCH 2172/3458] plasma-vault: update to 5.21.1

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

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index f7216f6820b9..30876659d568 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a25ab6348e0f5efc28c3bba2a91d5e5553db75305f7eabf17f1a1050fab7322d
+checksum=0de439fe7941d675fa64a653a026a56ee44c6780cdd616d1c3f10a3d6cadd255
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From ed13d44d69a03cabb9472b71fa9e4b0aae2c99b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:23 +0100
Subject: [PATCH 2173/3458] plasma-workspace-wallpapers: update to 5.21.1

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

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 6c4f2171fa52..5d5edec7713d 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e39bda4d2807c83063b980008e8d9f14add71bc5fa1ddbc059754ea416bbe70f
+checksum=76685909cb48456731b548e56f36e70a86ad763e91fff832fcec350eddffcfdd

From f3ebe859540e5e344f0cad10b39a012e606a6958 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:27 +0100
Subject: [PATCH 2174/3458] plasma-workspace: update to 5.21.1

---
 srcpkgs/plasma-workspace/patches/dbus.patch | 2 +-
 srcpkgs/plasma-workspace/template           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-workspace/patches/dbus.patch b/srcpkgs/plasma-workspace/patches/dbus.patch
index b763be73871a..addb30112609 100644
--- a/srcpkgs/plasma-workspace/patches/dbus.patch
+++ b/srcpkgs/plasma-workspace/patches/dbus.patch
@@ -1,4 +1,4 @@
---- ./login-sessions/plasma.desktop.cmake	2020-05-14 12:53:54.000000000 +0200
+--- ./login-sessions/plasmax11.desktop.cmake	2020-05-14 12:53:54.000000000 +0200
 +++ -	2020-05-20 14:39:34.856212360 +0200
 @@ -1,6 +1,6 @@
  [Desktop Entry]
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 375258c9cf3c..5f090163ca80 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=357ef43092efb4d45f7c6ae9249a538be3484c855d0e35ae3b0b1e8d3db6c624
+checksum=4a30f9b5cb8f24be75f818a01c3fa8a3b70aff3c4552add6f88fcaa85109022b
 
 build_options="pipewire"
 

From 838c3ddfcd0e0b946787a9a9485150f81e980425 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:29 +0100
Subject: [PATCH 2175/3458] polkit-kde-agent: update to 5.21.1

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

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index ec8def557caf..6dc15b5af7c2 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.20.5
+version=5.21.1
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=5ba485c5db38815961ba8737ece74908d9b9a35229f1cd8c7a7df79122b37be6
+checksum=629dd8700c8ae74bb4667f8792fec261c4969b0c6862e50f77b4464707cda6d2

From f8ec067589695e51bd98fc04cc74622a74e05c59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:31 +0100
Subject: [PATCH 2176/3458] powerdevil: update to 5.21.1

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

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 3a05f064e265..97fe8bfc3147 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=32fb5ca72bed38d9bffc47f24a6c4dcee03b1da52b200d0f5bb976f9d48b6ef0
+checksum=8b9c24b0bec1b62923b8c3ef5d64d4cb1bd6b6420aa2413e06955d7a12e54921

From d30c24839e39058d0712ad59258d1b0f8c112802 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:33 +0100
Subject: [PATCH 2177/3458] sddm-kcm: update to 5.21.1

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

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 79cc9b59172e..77b63dab141d 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,17 +1,17 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake
- gettext kauth"
+ gettext kauth kconfig"
 makedepends="kio-devel xcb-util-image-devel libXcursor-devel
- knewstuff-devel"
+ kcmutils-devel knewstuff-devel"
 depends="sddm"
 short_desc="KDE Config Module for SDDM"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5f850e3e3e7dc85f5b13444c6669caf47690bf8e85d4248a4304f56ca7f189ff
+checksum=5007b3a73decb7c01c0643232d3a1aad36951421d1beb0bf84c264612bffe648

From a322ffff0f4d9039b7111e6a2104cc4d92336c7a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:35 +0100
Subject: [PATCH 2178/3458] systemsettings: update to 5.21.1

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

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index fb0cfecb0fe2..ccaed7b41685 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,5 +13,5 @@ short_desc="KDE System settings"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/systemsettings"
-distfiles="${KDE_SITE}/plasma/${version%.1}/${pkgname}-${version}.tar.xz"
-checksum=b2e03bc39a1c7f4e298c8c196a22e22291a5b71ecd972234c6a47d9b284c32ac
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=794eff1ffec90e2aad2c588b4fa643fd9a5dff440f048dcbe27438a1541eef4f

From 69a6bc95f571abfc833f60796c31958d0ec43411 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 11:04:37 +0100
Subject: [PATCH 2179/3458] xdg-desktop-portal-kde: update to 5.21.1

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 4ebbad50f672..40953f3252bc 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.20.5
+version=5.21.1
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f40d5453c30a5761310408513b57d3a7b9cb5f172e163094ca2aa17b4201e71d
+checksum=46aae42065cefae0488ef2959c7768de60a6d0cf3ad65372f83a149c99e7d6f5

From c77f75673195f1c7e576d8e2b8caf7b2d6ecb4de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 20:02:43 +0100
Subject: [PATCH 2180/3458] New package: plasma-systemmonitor-5.21.1

---
 .../patches/disable-applications-page.patch        | 14 ++++++++++++++
 srcpkgs/plasma-systemmonitor/template              | 14 ++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/plasma-systemmonitor/patches/disable-applications-page.patch
 create mode 100644 srcpkgs/plasma-systemmonitor/template

diff --git a/srcpkgs/plasma-systemmonitor/patches/disable-applications-page.patch b/srcpkgs/plasma-systemmonitor/patches/disable-applications-page.patch
new file mode 100644
index 000000000000..b63909ec2f9b
--- /dev/null
+++ b/srcpkgs/plasma-systemmonitor/patches/disable-applications-page.patch
@@ -0,0 +1,14 @@
+The Applications page requires that every application runs in it's own cgroup
+But this behaviour is only implemented in Plasma for Systemd systems.
+So disable by default, since it is pretty much useless for us
+
+--- src/systemmonitor.kcfg	2021-01-21 14:01:55.000000000 +0100
++++ -	2021-01-22 19:12:44.908000104 +0100
+@@ -27,6 +27,7 @@
+             <default>overview.page,applications.page,history.page,processes.page</default>
+         </entry>
+         <entry name="hiddenPages" type="StringList">
++            <default>applications.page</default>
+         </entry>
+     </group>
+ </kcfg>
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
new file mode 100644
index 000000000000..5817f07da8c7
--- /dev/null
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -0,0 +1,14 @@
+# Template file for 'plasma-systemmonitor'
+pkgname=plasma-systemmonitor
+version=5.21.1
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
+ kconfig kcoreaddons"
+makedepends="kirigami2-devel libksysguard-devel kitemmodels-devel"
+short_desc="Application for monitoring system resources"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
+homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=caf40d632c31097e09d98e913dfb9802c8d3aecaf041115be6c447a1b4a5d5d5

From b1538f1988f838250724de24e40a7b349aa876e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 22 Jan 2021 20:15:41 +0100
Subject: [PATCH 2181/3458] New package: plasma-firewall-5.21.1

---
 srcpkgs/plasma-firewall/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/plasma-firewall/template

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
new file mode 100644
index 000000000000..5c5475324087
--- /dev/null
+++ b/srcpkgs/plasma-firewall/template
@@ -0,0 +1,13 @@
+# Template file for 'plasma-firewall'
+pkgname=plasma-firewall
+version=5.21.1
+revision=1
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
+makedepends="extra-cmake-modules kcmutils-devel plasma-framework-devel"
+short_desc="Control Panel for ufw (Uncomplicated Firewall)"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-only OR GPL-3.0-only"
+homepage="https://invent.kde.org/network/plasma-firewall"
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=0b06c722d040031c6587f2d2ee24f7c0470078642ae73b5ad1efc81d6ae207a7

From 38d412a3c8941242c64a17d1b1ebdd8e3092e57d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 22:01:28 +0100
Subject: [PATCH 2182/3458] kde5: update to 5.21.0.

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

diff --git a/srcpkgs/kde5/template b/srcpkgs/kde5/template
index 3d9df2828ec1..b73e197ce78f 100644
--- a/srcpkgs/kde5/template
+++ b/srcpkgs/kde5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5'
 pkgname=kde5
-version=5.20.0
+version=5.21.0
 revision=1
 build_style=meta
 depends="bluedevil>=${version}

From 563b881629d5cc8969b3898d14b1a5f747ea6f95 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Tue, 23 Feb 2021 20:33:48 +0000
Subject: [PATCH 2183/3458] evolution-data-server: update to 3.38.4.

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

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 24be6b0a2b31..8c3709f20d98 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.3
+version=3.38.4
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9732f690b252aa7c0932c761740b5098a19705d1b6e4a5de2fad3a16e57e3ca7
+checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
 
 build_options="gir"
 build_options_default="gir"

From bd2a7ae1247884838b43183ce640ea42386945b6 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, 23 Feb 2021 21:26:02 +0700
Subject: [PATCH 2184/3458] cackey: remove rpath, fix cross build

---
 srcpkgs/cackey/patches/no-rpath.patch | 14 ++++++++++++++
 srcpkgs/cackey/template               |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cackey/patches/no-rpath.patch

diff --git a/srcpkgs/cackey/patches/no-rpath.patch b/srcpkgs/cackey/patches/no-rpath.patch
new file mode 100644
index 000000000000..11384655aa70
--- /dev/null
+++ b/srcpkgs/cackey/patches/no-rpath.patch
@@ -0,0 +1,14 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -212,9 +212,6 @@ fi
+ dnl Set version script, to limit the scope of symbols
+ DC_SETVERSIONSCRIPT(libcackey.vers, libcackey.syms)
+ 
+-dnl Upate LDFLAGS to include setting the run-time linker path to the same as our compile-time linker
+-DC_SYNC_RPATH
+-
+ dnl If we updated LIBOBJS, update SHLIBOBJS -- must be last.
+ DC_SYNC_SHLIBOBJS
+ 
diff --git a/srcpkgs/cackey/template b/srcpkgs/cackey/template
index fecb150a805c..468dcd1c7b1b 100644
--- a/srcpkgs/cackey/template
+++ b/srcpkgs/cackey/template
@@ -3,7 +3,8 @@ pkgname=cackey
 version=0.7.10
 revision=1
 build_style=gnu-configure
-makedepends="pcsclite-devel"
+hostmakedepends="automake"
+makedepends="pcsclite-devel zlib-devel"
 depends="pcsc-tools"
 short_desc="PKCS#11 provider library for using smart cards"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
@@ -11,6 +12,11 @@ license="MIT"
 homepage="http://www.rkeene.org/projects/info/wiki/161"
 distfiles="http://cackey.rkeene.org/download/$version/cackey-$version.tar.gz"
 checksum=e2074055bab8eb1c277bfa3355767c50f792d5b87bf41f9c0d1af0e77f311583
+CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/PCSC"
+
+pre_configure() {
+	autoreconf -fi
+}
 
 post_install() {
 	vlicense LICENSE

From 58a69416eb352bcaa1815b6ab36242a8fffef9d3 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, 24 Feb 2021 07:37:15 +0700
Subject: [PATCH 2185/3458] build-style/ruby-module: fix _vendorlibdir because
 of multilib change

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

diff --git a/common/build-style/ruby-module.sh b/common/build-style/ruby-module.sh
index 10c0abbde368..c45d1cd687e5 100644
--- a/common/build-style/ruby-module.sh
+++ b/common/build-style/ruby-module.sh
@@ -5,5 +5,9 @@
 do_install() {
 	local _vendorlibdir=$(ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]')
 
+	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+		_vendorlibdir="${_vendorlibdir//lib$XBPS_WORDSIZE/lib$XBPS_TARGET_WORDSIZE}"
+	fi
+
 	LANG=C ruby install.rb --destdir=${DESTDIR} --sitelibdir=${_vendorlibdir} ${make_install_args}
 }

From ce1d018e9c7b489e8101cac3fbd7b67b54e77a87 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, 24 Feb 2021 07:50:18 +0700
Subject: [PATCH 2186/3458] kwin: fix build

Added src/ to add patch because it's in kwin's master.
---
 srcpkgs/kwin/patches/musl.patch           |  2 +-
 srcpkgs/kwin/patches/posix-sockaddr.patch | 19 +++++++++++++++++++
 srcpkgs/kwin/template                     |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kwin/patches/posix-sockaddr.patch

diff --git a/srcpkgs/kwin/patches/musl.patch b/srcpkgs/kwin/patches/musl.patch
index 2751e77e10df..4d86750a9cb7 100644
--- a/srcpkgs/kwin/patches/musl.patch
+++ b/srcpkgs/kwin/patches/musl.patch
@@ -1,4 +1,4 @@
---- 3rdparty/xcursor.c	2020-09-19 14:34:54.765245866 +0200
+--- src/3rdparty/xcursor.c	2020-09-19 14:34:54.765245866 +0200
 +++ -	2020-09-19 14:35:18.599411888 +0200
 @@ -27,6 +27,7 @@
  #include <stdio.h>
diff --git a/srcpkgs/kwin/patches/posix-sockaddr.patch b/srcpkgs/kwin/patches/posix-sockaddr.patch
new file mode 100644
index 000000000000..06cce6aa0a2b
--- /dev/null
+++ b/srcpkgs/kwin/patches/posix-sockaddr.patch
@@ -0,0 +1,19 @@
+--- src/helpers/wayland_wrapper/wl-socket.c
++++ src/helpers/wayland_wrapper/wl-socket.c
+@@ -8,6 +8,7 @@
+     SPDX-License-Identifier: GPL-2.0-or-later
+ */
+ 
++#define _BSD_SOURCE
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -155,7 +156,7 @@ struct wl_socket *wl_socket_create()
+         s->fd = socket(PF_LOCAL, SOCK_STREAM, 0);
+ 
+         int size = SUN_LEN(&s->addr);
+-        int ret = bind(s->fd, &s->addr, size);
++        int ret = bind(s->fd, (struct sockaddr*)&s->addr, size);
+         if (ret < 0) {
+             goto fail;
+         }
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 24fee095ca3f..4234b682a060 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -17,6 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=5a044450ffdc1610a73d5db3f3f50d2513de930f4be5c167da703cc7d23abc0c
+patch_args=-Np1
 
 build_options="pipewire"
 

From 44dd5d4ed281e7a20be8bfb6fcc001aedfc0172b 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, 24 Feb 2021 08:07:04 +0700
Subject: [PATCH 2187/3458] kwin: requires atomic support

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

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 4234b682a060..8228a742c820 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -30,6 +30,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	broken="Q_STATIC_ASSERT_X(QAtomicOpsSupport<sizeof(T)>::IsSupported"
+fi
+
 post_extract() {
 	_qt5_dep_ver="${depends#*>=}"
 	_qt5_dep_ver="${_qt5_dep_ver%<*}"

From e756403a39a721b3895c221fddaf2483b2af5b39 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, 24 Feb 2021 08:46:57 +0700
Subject: [PATCH 2188/3458] kwin: build for platform that don't have
 atomic_int64

I can make it built but I can't test it :(
---
 srcpkgs/kwin/patches/atomic-type.patch | 36 ++++++++++++++++++++++++++
 srcpkgs/kwin/template                  |  4 ---
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/kwin/patches/atomic-type.patch

diff --git a/srcpkgs/kwin/patches/atomic-type.patch b/srcpkgs/kwin/patches/atomic-type.patch
new file mode 100644
index 000000000000..39d3878a6d8f
--- /dev/null
+++ b/srcpkgs/kwin/patches/atomic-type.patch
@@ -0,0 +1,36 @@
+--- src/ftrace.h
++++ src/ftrace.h
+@@ -11,6 +11,7 @@
+ 
+ #include <kwinglobals.h>
+ 
++#include <type_traits>
+ #include <QFile>
+ #include <QMutex>
+ #include <QMutexLocker>
+@@ -70,10 +71,15 @@ private:
+ 
+ class KWIN_EXPORT FTraceDuration
+ {
++    using ftrace_context_t = std::conditional<
++        QAtomicOpsSupport<sizeof(qulonglong)>::IsSupported,
++        qulonglong,
++        ulong>::type;
++
+ public:
+     template<typename... Args> FTraceDuration(Args... args)
+     {
+-        static QAtomicInteger<qulonglong> s_context = 0;
++        static QAtomicInteger<ftrace_context_t> s_context = 0;
+         QTextStream stream(&m_message);
+         (stream << ... << args);
+         stream.flush();
+@@ -85,7 +91,7 @@ public:
+ 
+ private:
+     QByteArray m_message;
+-    qulonglong m_context;
++    ftrace_context_t m_context;
+ };
+ 
+ } // namespace KWin
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 8228a742c820..4234b682a060 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -30,10 +30,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	broken="Q_STATIC_ASSERT_X(QAtomicOpsSupport<sizeof(T)>::IsSupported"
-fi
-
 post_extract() {
 	_qt5_dep_ver="${depends#*>=}"
 	_qt5_dep_ver="${_qt5_dep_ver%<*}"

From cb0b51eeb49374f7e1c24ce0d6f434254d7d020b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 23 Feb 2021 22:41:10 +0100
Subject: [PATCH 2189/3458] perl-File-Listing: update to 6.14.

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

diff --git a/srcpkgs/perl-File-Listing/template b/srcpkgs/perl-File-Listing/template
index 1cf6d3f52757..c946062b462a 100644
--- a/srcpkgs/perl-File-Listing/template
+++ b/srcpkgs/perl-File-Listing/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-File-Listing'
 pkgname=perl-File-Listing
-version=6.11
+version=6.14
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/File-Listing"
 distfiles="${CPAN_SITE}/File/File-Listing-$version.tar.gz"
-checksum=c24c14ece10b949e1cb52d64bc28b42cbaebf87e00293a3f7500950d6be0bf6e
+checksum=15b3a4871e23164a36f226381b74d450af41f12cc94985f592a669fcac7b48ff

From 082bf4000300cf5f9e0b63ba0029a62702210ea2 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 23 Feb 2021 22:48:26 +0100
Subject: [PATCH 2190/3458] perl-HTTP-Cookies: update to 6.10.

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

diff --git a/srcpkgs/perl-HTTP-Cookies/template b/srcpkgs/perl-HTTP-Cookies/template
index 6e66003a63f3..3356fd52007d 100644
--- a/srcpkgs/perl-HTTP-Cookies/template
+++ b/srcpkgs/perl-HTTP-Cookies/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-HTTP-Cookies'
 pkgname=perl-HTTP-Cookies
-version=6.09
+version=6.10
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl,  GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTTP-Cookies"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Cookies-$version.tar.gz"
-checksum=903f017afaa5b78599cc90efc14ecccc8cc2ebfb636eb8c02f8f16ba861d1fe0
+checksum=e36f36633c5ce6b5e4b876ffcf74787cc5efe0736dd7f487bdd73c14f0bd7007

From f5c0a1e919b4b76a5c7aacafb462a3d3fb4c3ba7 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 23 Feb 2021 22:48:36 +0100
Subject: [PATCH 2191/3458] perl-HTTP-Message: update to 6.28.

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

diff --git a/srcpkgs/perl-HTTP-Message/template b/srcpkgs/perl-HTTP-Message/template
index 5148fd4612e5..e7d76f1c0a77 100644
--- a/srcpkgs/perl-HTTP-Message/template
+++ b/srcpkgs/perl-HTTP-Message/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-HTTP-Message'
 pkgname=perl-HTTP-Message
-version=6.26
+version=6.28
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/HTTP-Message"
 distfiles="${CPAN_SITE}/HTTP/HTTP-Message-$version.tar.gz"
-checksum=6ce6c359de75c3bb86696a390189b485ec93e3ffc55326b6d044fa900f1725e1
+checksum=04e3168f9576b48d45124ac681a574408ebb6fa8eb2dba6d3fe70c8f6704dbb8

From 387bef6fb5ce8d891346c857bb96c0e6b308fdd1 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 23 Feb 2021 22:51:57 +0100
Subject: [PATCH 2192/3458] perl-Net-HTTP: update to 6.20.

---
 srcpkgs/perl-Net-HTTP/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-Net-HTTP/template b/srcpkgs/perl-Net-HTTP/template
index f4dacede4a30..b722df679235 100644
--- a/srcpkgs/perl-Net-HTTP/template
+++ b/srcpkgs/perl-Net-HTTP/template
@@ -1,7 +1,7 @@
-# Template build file for 'perl-Net-HTTP'.
+# Template file for 'perl-Net-HTTP'
 pkgname=perl-Net-HTTP
-version=6.19
-revision=2
+version=6.20
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Net-HTTP"
 distfiles="${CPAN_SITE}/Net/Net-HTTP-${version}.tar.gz"
-checksum=52b76ec13959522cae64d965f15da3d99dcb445eddd85d2ce4e4f4df385b2fc4
+checksum=92527b2a24512961b8e3637c6216a057751e39b6fa751422ed181ff599779f1e

From af89ae7c13e26b2a0c288fd05a6e8eeb91c37714 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 23 Feb 2021 22:54:52 +0100
Subject: [PATCH 2193/3458] perl-URI: update to 5.07.

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

diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index 791dea0339f3..be6c064720eb 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-URI'
 pkgname=perl-URI
-version=5.05
+version=5.07
 revision=1
 wrksrc="URI-$version"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/URI"
 distfiles="${CPAN_SITE}/URI/URI-${version}.tar.gz"
-checksum=a5c113d2d02706d9fbdca6a86f290c5b05b2f86836d4e7fe1447f063261b79ec
+checksum=eeb6ed2ae212434e2021e29f7556f4024169421a5d8b001a89e65982944131ea

From 85a2a0c49baae6ea770369627e8dfa1bfe0ccd58 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 23 Feb 2021 22:13:49 +0100
Subject: [PATCH 2194/3458] perl-JSON: update to 4.03.

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

diff --git a/srcpkgs/perl-JSON/template b/srcpkgs/perl-JSON/template
index e3d0143717ea..65b19049de70 100644
--- a/srcpkgs/perl-JSON/template
+++ b/srcpkgs/perl-JSON/template
@@ -1,16 +1,16 @@
 # Template file for 'perl-JSON'
 pkgname=perl-JSON
-version=4.02
-revision=2
+version=4.03
+revision=1
 wrksrc="JSON-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-checkdepends="perl-Test-Pod"
 depends="perl"
+checkdepends="perl-Test-Pod"
 short_desc="JSON (JavaScript Object Notation) encoder/decoder"
 maintainer="Steven R <dev@styez.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/JSON"
 distfiles="${CPAN_SITE}/JSON/JSON-${version}.tar.gz"
-checksum=444a88755a89ffa2a5424ab4ed1d11dca61808ebef57e81243424619a9e8627c
+checksum=e41f8761a5e7b9b27af26fe5780d44550d7a6a66bf3078e337d676d07a699941

From ff637f66d1388abec6105063655cfb06f712d212 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 24 Feb 2021 00:06:39 +0100
Subject: [PATCH 2195/3458] perl-Term-ReadLine-Gnu: update to 1.40.

---
 srcpkgs/perl-Term-ReadLine-Gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Term-ReadLine-Gnu/template b/srcpkgs/perl-Term-ReadLine-Gnu/template
index 2dc189ff538b..920627efa287 100644
--- a/srcpkgs/perl-Term-ReadLine-Gnu/template
+++ b/srcpkgs/perl-Term-ReadLine-Gnu/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Term-ReadLine-Gnu'
 pkgname=perl-Term-ReadLine-Gnu
-version=1.36
-revision=3
+version=1.40
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl ncurses-devel readline-devel"
@@ -11,7 +11,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Term-ReadLine-Gnu"
 distfiles="${CPAN_SITE}/Term/${pkgname/perl-/}-${version}.tar.gz"
-checksum=9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925
+checksum=d3a6169aeb1f04f9f05853a4f1c3b26dd265f6f00b790024959cb8f395842774
 
 post_extract() {
 	vsed -i '/if.*guess_malloc_names/s/.*/if(my $extra_defs=""){/' Makefile.PL

From 5d79ce00452a141a5b18b8a0b0bb537840a0a83e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 24 Feb 2021 00:06:50 +0100
Subject: [PATCH 2196/3458] straw-viewer: update to 0.1.3.

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

diff --git a/srcpkgs/straw-viewer/template b/srcpkgs/straw-viewer/template
index 7d2d07045f1f..b3a9137af087 100644
--- a/srcpkgs/straw-viewer/template
+++ b/srcpkgs/straw-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'straw-viewer'
 pkgname=straw-viewer
-version=0.1.2
+version=0.1.3
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -13,7 +13,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/straw-viewer"
 changelog="https://github.com/trizen/straw-viewer/releases"
 distfiles="https://github.com/trizen/straw-viewer/archive/${version}.tar.gz"
-checksum=4ce456143639a4ea88c21f20e37b9a9c19b15055d05c78bcf69a72be2b5a65b6
+checksum=e6afc6a87578a55b17666a79b813657daac93f78aaf810d1aa03fcb4a7354bf4
 
 gtk-straw-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 91a5ccf18649e121f8b61c75c5889c9edb16d49d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 24 Feb 2021 00:23:44 +0100
Subject: [PATCH 2197/3458] youtube-viewer: update to 3.8.2.

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

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index 061a441b2eea..e06295384612 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.8.1
+version=3.8.2
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=fcbebba3e772c262ffe3d8fd6a27cfb0671f0f465e8239253cb7d9c49fc79ab0
+checksum=b12c23f9b254f50c5da071855ee8b815bba445a3e75bc0d84d904d5cfcfc53b1
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk2 perl-File-ShareDir"

From 90497b1770b9dda3bfe409e6a73a91b1e6e16c24 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 18 Feb 2021 09:35:43 -0800
Subject: [PATCH 2198/3458] deadbeef: update to 1.8.7 ; fix build

Build with clang, disable the audioscrobbler plugin (shlib dependency on
a library not shipped in Void), disable soundtouch plugin on i686
(depends on SSE being enabled which was getting dropped somewhere along
the line), avoid trying to bundle the glade source files as
translations.

Closes: #28965 [via git-merge-pr]
---
 .../patch_skip_glade_translations.patch       | 157 ++++++++++++++++++
 srcpkgs/deadbeef/template                     |  44 +++--
 2 files changed, 187 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch

diff --git a/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
new file mode 100644
index 000000000000..a76fecc318b9
--- /dev/null
+++ b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
@@ -0,0 +1,157 @@
+Upstream packages a number of tools which define translations for gettext to
+process. The glade files don't appear to actually have translation marks which
+causes the build to complain and, in the case of packaging, fail.
+
+--- po/POTFILES.skip.orig	2021-02-20 21:51:50.867875091 -0800
++++ po/POTFILES.skip	2021-02-20 21:51:57.689896618 -0800
+@@ -4,3 +4,151 @@
+ plugins/pltbrowser/support.c
+ plugins/gtkui/support.c
++tools/glade/examples/editor/editor.glade
++tools/glade/examples/editor/src/interface.c
++tools/glade/examples/editor/src/support.c
++tools/glade/glade-2.desktop.in
++tools/glade/glade/editor.c
++tools/glade/glade/gbwidget.c
++tools/glade/glade/gbwidgets/gbaboutdialog.c
++tools/glade/glade/gbwidgets/gbaccellabel.c
++tools/glade/glade/gbwidgets/gbalignment.c
++tools/glade/glade/gbwidgets/gbarrow.c
++tools/glade/glade/gbwidgets/gbaspectframe.c
++tools/glade/glade/gbwidgets/gbbutton.c
++tools/glade/glade/gbwidgets/gbcalendar.c
++tools/glade/glade/gbwidgets/gbcellview.c
++tools/glade/glade/gbwidgets/gbcheckbutton.c
++tools/glade/glade/gbwidgets/gbcheckmenuitem.c
++tools/glade/glade/gbwidgets/gbclist.c
++tools/glade/glade/gbwidgets/gbcolorbutton.c
++tools/glade/glade/gbwidgets/gbcolorselection.c
++tools/glade/glade/gbwidgets/gbcolorselectiondialog.c
++tools/glade/glade/gbwidgets/gbcombo.c
++tools/glade/glade/gbwidgets/gbcombobox.c
++tools/glade/glade/gbwidgets/gbcomboboxentry.c
++tools/glade/glade/gbwidgets/gbctree.c
++tools/glade/glade/gbwidgets/gbcurve.c
++tools/glade/glade/gbwidgets/gbcustom.c
++tools/glade/glade/gbwidgets/gbdialog.c
++tools/glade/glade/gbwidgets/gbdrawingarea.c
++tools/glade/glade/gbwidgets/gbentry.c
++tools/glade/glade/gbwidgets/gbeventbox.c
++tools/glade/glade/gbwidgets/gbexpander.c
++tools/glade/glade/gbwidgets/gbfilechooserbutton.c
++tools/glade/glade/gbwidgets/gbfilechooserdialog.c
++tools/glade/glade/gbwidgets/gbfilechooserwidget.c
++tools/glade/glade/gbwidgets/gbfileselection.c
++tools/glade/glade/gbwidgets/gbfixed.c
++tools/glade/glade/gbwidgets/gbfontbutton.c
++tools/glade/glade/gbwidgets/gbfontselection.c
++tools/glade/glade/gbwidgets/gbfontselectiondialog.c
++tools/glade/glade/gbwidgets/gbframe.c
++tools/glade/glade/gbwidgets/gbgammacurve.c
++tools/glade/glade/gbwidgets/gbhandlebox.c
++tools/glade/glade/gbwidgets/gbhbox.c
++tools/glade/glade/gbwidgets/gbhbuttonbox.c
++tools/glade/glade/gbwidgets/gbhpaned.c
++tools/glade/glade/gbwidgets/gbhruler.c
++tools/glade/glade/gbwidgets/gbhscale.c
++tools/glade/glade/gbwidgets/gbhscrollbar.c
++tools/glade/glade/gbwidgets/gbhseparator.c
++tools/glade/glade/gbwidgets/gbiconview.c
++tools/glade/glade/gbwidgets/gbimage.c
++tools/glade/glade/gbwidgets/gbimagemenuitem.c
++tools/glade/glade/gbwidgets/gbinputdialog.c
++tools/glade/glade/gbwidgets/gblabel.c
++tools/glade/glade/gbwidgets/gblayout.c
++tools/glade/glade/gbwidgets/gblist.c
++tools/glade/glade/gbwidgets/gblistitem.c
++tools/glade/glade/gbwidgets/gbmenu.c
++tools/glade/glade/gbwidgets/gbmenubar.c
++tools/glade/glade/gbwidgets/gbmenuitem.c
++tools/glade/glade/gbwidgets/gbmenutoolbutton.c
++tools/glade/glade/gbwidgets/gbnotebook.c
++tools/glade/glade/gbwidgets/gboptionmenu.c
++tools/glade/glade/gbwidgets/gbpreview.c
++tools/glade/glade/gbwidgets/gbprogressbar.c
++tools/glade/glade/gbwidgets/gbradiobutton.c
++tools/glade/glade/gbwidgets/gbradiomenuitem.c
++tools/glade/glade/gbwidgets/gbradiotoolbutton.c
++tools/glade/glade/gbwidgets/gbscrolledwindow.c
++tools/glade/glade/gbwidgets/gbseparatormenuitem.c
++tools/glade/glade/gbwidgets/gbseparatortoolitem.c
++tools/glade/glade/gbwidgets/gbspinbutton.c
++tools/glade/glade/gbwidgets/gbstatusbar.c
++tools/glade/glade/gbwidgets/gbtable.c
++tools/glade/glade/gbwidgets/gbtextview.c
++tools/glade/glade/gbwidgets/gbtogglebutton.c
++tools/glade/glade/gbwidgets/gbtoggletoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolbar.c
++tools/glade/glade/gbwidgets/gbtoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolitem.c
++tools/glade/glade/gbwidgets/gbtreeview.c
++tools/glade/glade/gbwidgets/gbvbox.c
++tools/glade/glade/gbwidgets/gbvbuttonbox.c
++tools/glade/glade/gbwidgets/gbviewport.c
++tools/glade/glade/gbwidgets/gbvpaned.c
++tools/glade/glade/gbwidgets/gbvruler.c
++tools/glade/glade/gbwidgets/gbvscale.c
++tools/glade/glade/gbwidgets/gbvscrollbar.c
++tools/glade/glade/gbwidgets/gbvseparator.c
++tools/glade/glade/gbwidgets/gbwindow.c
++tools/glade/glade/glade.c
++tools/glade/glade/glade_atk.c
++tools/glade/glade/glade_clipboard.c
++tools/glade/glade/glade_gnome.c
++tools/glade/glade/glade_gnomelib.c
++tools/glade/glade/glade_gtk12lib.c
++tools/glade/glade/glade_keys_dialog.c
++tools/glade/glade/glade_menu_editor.c
++tools/glade/glade/glade_palette.c
++tools/glade/glade/glade_project.c
++tools/glade/glade/glade_project_options.c
++tools/glade/glade/glade_project_window.c
++tools/glade/glade/gnome-db/gnomedbcombo.c
++tools/glade/glade/gnome-db/gnomedbconnectprop.c
++tools/glade/glade/gnome-db/gnomedbdsnconfig.c
++tools/glade/glade/gnome-db/gnomedbdsndruid.c
++tools/glade/glade/gnome-db/gnomedbeditor.c
++tools/glade/glade/gnome-db/gnomedberror.c
++tools/glade/glade/gnome-db/gnomedberrordlg.c
++tools/glade/glade/gnome-db/gnomedbform.c
++tools/glade/glade/gnome-db/gnomedbgraybar.c
++tools/glade/glade/gnome-db/gnomedbgrid.c
++tools/glade/glade/gnome-db/gnomedblogin.c
++tools/glade/glade/gnome-db/gnomedblogindlg.c
++tools/glade/glade/gnome-db/gnomedbprovidersel.c
++tools/glade/glade/gnome-db/gnomedbsourcesel.c
++tools/glade/glade/gnome-db/gnomedbtableeditor.c
++tools/glade/glade/gnome/bonobodock.c
++tools/glade/glade/gnome/bonobodockitem.c
++tools/glade/glade/gnome/gnomeabout.c
++tools/glade/glade/gnome/gnomeapp.c
++tools/glade/glade/gnome/gnomeappbar.c
++tools/glade/glade/gnome/gnomecanvas.c
++tools/glade/glade/gnome/gnomecolorpicker.c
++tools/glade/glade/gnome/gnomecontrol.c
++tools/glade/glade/gnome/gnomedateedit.c
++tools/glade/glade/gnome/gnomedialog.c
++tools/glade/glade/gnome/gnomedruid.c
++tools/glade/glade/gnome/gnomedruidpageedge.c
++tools/glade/glade/gnome/gnomedruidpagestandard.c
++tools/glade/glade/gnome/gnomeentry.c
++tools/glade/glade/gnome/gnomefileentry.c
++tools/glade/glade/gnome/gnomefontpicker.c
++tools/glade/glade/gnome/gnomehref.c
++tools/glade/glade/gnome/gnomeiconentry.c
++tools/glade/glade/gnome/gnomeiconlist.c
++tools/glade/glade/gnome/gnomeiconselection.c
++tools/glade/glade/gnome/gnomemessagebox.c
++tools/glade/glade/gnome/gnomepixmap.c
++tools/glade/glade/gnome/gnomepixmapentry.c
++tools/glade/glade/gnome/gnomepropertybox.c
++tools/glade/glade/main.c
++tools/glade/glade/palette.c
++tools/glade/glade/property.c
++tools/glade/glade/save.c
++tools/glade/glade/source.c
++tools/glade/glade/tree.c
++tools/glade/glade/utils.c
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index bd2823649a1b..5666c1d97c92 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,33 +1,49 @@
 # Template file for 'deadbeef'
 pkgname=deadbeef
-version=1.8.3
+version=1.8.7
 revision=1
 build_style=gnu-configure
-configure_args="--disable-oss $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
+configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
 hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
- yasm $(vopt_if gtk3 glib-devel)"
+ yasm clang glib-devel"
 makedepends="
- alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel imlib2-devel jansson-devel
- libcddb-devel libcdio-devel libcurl-devel libflac-devel libmad-devel
- libpng-devel libsamplerate-devel libsndfile-devel libvorbis-devel libzip-devel
- mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel
- $(vopt_if gtk3 gtk+3-devel gtk+-devel)"
+ alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel gtk+3-devel imlib2-devel
+ jansson-devel libcddb-devel libcdio-devel libcurl-devel libflac-devel
+ libmad-devel libpng-devel libsamplerate-devel libsndfile-devel libvorbis-devel
+ libzip-devel mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Ultimate Music Player for GNU/Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://deadbeef.sourceforge.net"
-changelog="http://deadbeef.sourceforge.net/news0.html"
-distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f239af734dea096083e9fb907ef262099a54c2c6c93683ed76b132d41f10ccd8
-build_options="gtk3"
-build_options_default="gtk3"
+_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
+_mp4p_commit=f111d7aa10d4516f5e02465245e9202db83b7c10
+homepage="https://deadbeef.sourceforge.io"
+changelog="https://deadbeef.sourceforge.io/news0.html"
+distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
+ https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz
+ https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz"
+checksum="cbfe873d5bd84b70011dd6131b249fea8c89318c37411696a890c55029ac3e27
+ c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286
+ 35b58679dbfec2c3a2688b1896afb0fb73b5184ac05d5bdbb787a86b5c00430d"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
+# The soundtouchup plugin was made default in 1.8.4 and fails to build on i686.
+# Fixing that might be a good maintainer task.
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" --disable-soundtouch" ;;
+esac
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
+post_extract() {
+	rm -rf external/apbuild
+	rm -rf external/mp4p
+	mv -v ../apbuild-${_apbuild_commit} external/apbuild
+	mv -v ../mp4p-${_mp4p_commit} external/mp4p
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From ba6a9f53f8b4e6c32abd8e72ad1a80e9b8d5ceaf Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Wed, 17 Feb 2021 14:53:44 -0700
Subject: [PATCH 2199/3458] yad: update to 8.0

- patch: add `#include <locale.h>` for `browser.c`
(otherwise compile error on musl)
---
 srcpkgs/yad/patches/browser.c.patch | 11 +++++++++++
 srcpkgs/yad/template                |  7 ++++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/yad/patches/browser.c.patch

diff --git a/srcpkgs/yad/patches/browser.c.patch b/srcpkgs/yad/patches/browser.c.patch
new file mode 100644
index 000000000000..fa7f33cdbb6f
--- /dev/null
+++ b/srcpkgs/yad/patches/browser.c.patch
@@ -0,0 +1,11 @@
+--- src/browser.c	2021-02-23 16:13:54.703468769 -0700
++++ src/browser.c.new	2021-02-23 16:14:36.647362079 -0700
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include <config.h>
+-
++#include <locale.h>
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <gdk/gdkkeysyms.h>
diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 80b0c97df6ef..332804d9a441 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,17 +1,18 @@
 # Template file for 'yad'
 pkgname=yad
-version=7.3
+version=8.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-icon-browser"
 hostmakedepends="automake gettext-devel glib-devel intltool pkg-config"
 makedepends="gtk+3-devel webkit2gtk-devel gtksourceview-devel gspell-devel"
-short_desc="Yet Another Dialog"
+short_desc="Yet Another Dialog - create/interact with GTK+ dialog boxes"
 maintainer="Benjamin Slade <slade@lambda-y.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/v1cont/yad"
+changelog="https://raw.githubusercontent.com/v1cont/yad/master/NEWS"
 distfiles="https://github.com/v1cont/yad/releases/download/v${version}/yad-${version}.tar.xz"
-checksum=5768ffacc29903f6735d397883eeb9f049061978b78e5a8b4be5c273a06193dc
+checksum=5c9538b7f242de715249e9f7d30108c0706d23219b5b1bb85cfead6ae77abff3
 
 pre_configure() {
 	autoreconf -ivf

From b4a94c67fedcba0b7870f1f36bfc12e722a6db65 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Feb 2021 16:49:10 +0100
Subject: [PATCH 2200/3458] sidplayfp: update to 2.1.0.

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

diff --git a/srcpkgs/sidplayfp/template b/srcpkgs/sidplayfp/template
index 9607f389eeca..e2544b8022c7 100644
--- a/srcpkgs/sidplayfp/template
+++ b/srcpkgs/sidplayfp/template
@@ -1,6 +1,6 @@
 # Template file for 'sidplayfp'
 pkgname=sidplayfp
-version=2.0.3
+version=2.1.0
 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=35e6f87a297316b491589cb658762e7df4cc2337203e2f5e80f399a9d64d8f00
+checksum=a8f99bd915e54988fc983372bdbef4094a09cfea6c73b75d2c6d33921f26ab69

From 61a983fd1469466c8c90df4cbf7ed7b5b8ac1fc5 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 18 Feb 2021 22:04:08 +0100
Subject: [PATCH 2201/3458] libgcrypt: update to 1.9.2.

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

diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index 9426d1e9825c..da057a81fd85 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,6 +1,6 @@
 # Template file for 'libgcrypt'
 pkgname=libgcrypt
-version=1.9.1
+version=1.9.2
 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=c5a67a8b9b2bd370fb415ed1ee31c7172e5683076493cf4a3678a0fbdf0265d9
+checksum=b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_sys_symbol_underscore=no"

From e8a7cdd52dd068d99788a87a066312e23de0c2a8 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 18 Feb 2021 21:59:25 +0100
Subject: [PATCH 2202/3458] libedit: update to 20210216.3.1.

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

diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template
index f9251dacd3cb..09c69eb90322 100644
--- a/srcpkgs/libedit/template
+++ b/srcpkgs/libedit/template
@@ -1,6 +1,6 @@
 # Template file for 'libedit'
 pkgname=libedit
-_datever=20191231
+_datever=20210216
 _distver=3.1
 version="${_datever}.${_distver}"
 revision=1
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.thrysoee.dk/editline/"
 distfiles="http://www.thrysoee.dk/editline/libedit-${_datever}-${_distver}.tar.gz"
-checksum=dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071
+checksum=2283f741d2aab935c8c52c04b57bf952d02c2c02e651172f8ac811f77b1fc77a
 
 post_install() {
 	vlicense COPYING

From 01d4a5635b7cc61520581800fbe07bf5f5e69364 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 18 Feb 2021 21:58:47 +0100
Subject: [PATCH 2203/3458] liburcu: update to 0.12.2.

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

diff --git a/srcpkgs/liburcu/template b/srcpkgs/liburcu/template
index 38b7ab4a072f..a767d1795997 100644
--- a/srcpkgs/liburcu/template
+++ b/srcpkgs/liburcu/template
@@ -1,6 +1,6 @@
 # Template file for 'liburcu'
 pkgname=liburcu
-version=0.12.1
+version=0.12.2
 revision=1
 wrksrc="userspace-rcu-${version}"
 build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Simon Thoby <simonthoby@live.fr>"
 license="LGPL-2.1-or-later"
 homepage="https://liburcu.org"
 distfiles="https://www.lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"
-checksum=bbfaead0345642b97e0de90f889dfbab4b2643a6a5e5c6bb59cd0d26fc0bcd0e
+checksum=4eefc11e4f6c212fc7d84d871e1cc139da0669a46ff3fda557a6fdd4d74ca67b
 
 liburcu-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 38c120ef8b1feb9345ac103332615634db9d7c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 24 Feb 2021 04:36:20 +0100
Subject: [PATCH 2204/3458] firefox-esr: update to 78.8.0

---
 .../patches/ff85-ppc64-xptcall.patch          | 63 -------------------
 srcpkgs/firefox-esr/template                  |  4 +-
 2 files changed, 2 insertions(+), 65 deletions(-)
 delete 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
deleted file mode 100644
index b270d836f2f4..000000000000
--- a/srcpkgs/firefox-esr/patches/ff85-ppc64-xptcall.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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-esr/template b/srcpkgs/firefox-esr/template
index e0b2eabade01..56c0ae7cb4bc 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.1
+version=78.8.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=5042783e2cf94d21dd990d2083800f05bc32f8ba65532a715c7be3cb7716b837
+checksum=1cf2dfdee2e31fd0a5ecced6275a33fa11bee1d2a7c65e23350b26992584a110
 lib32disabled=yes
 conflicts="firefox>=0"
 

From d3dfaf9227ae98635a0ee30d7be1a65a7c93022e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 24 Feb 2021 04:53:57 +0100
Subject: [PATCH 2205/3458] firefox-esr-i18n: update to 78.8.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 13f5cbdb804e..32724397ee39 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.1
+version=78.8.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-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"
+checksum="7f0782919012140a2eb30fe22b011b2a9c43248ea1037a8bae85c18e68e4285e
+ 25387a38fc9fb8aded62119033b98b72f8c8229e90dfb7403352d578cc6528cc
+ ab375580808e6f4599f4c2c0643885c33f5863eacfb966c05984165c4c5a7ad1
+ abd9a55274de8aedab52164dbb61275971f81e454dae9e6f63c5b3545da91c3b
+ e3e2758c38736c05855ea61dc9b54d3ea4830cce5441cb5121022c7996ec1759
+ e7efd2e42c4c8f858e85b0342e1179d0e7e3f2e3c8fc815a9fd37b25030a4869
+ 64579e748d87dc1eb63fea3bb00408759d48ba3226e66afcbf48c554fe32dc0e
+ ab898e74b67d0e3dd39a516b7ee642050847b03512b59461a7dd7077e8719e59
+ b3355aeb801c41ac1a4dd70f1c26ef440ef5e7f85b1c52ef1517d99544f5e614
+ 7ce0eba825fa22519c2ec15db24321cdd795c2f086d5c35861e1c36693cf15a7
+ 6645dce4ba62d3e4fb387f572dd56c9c794148d9f08aeae3600e2f69073bc6ee
+ d4cd2b9edd691962f6e579ea59525d8756a2bcbaa08f180efd9725b82377c8bc
+ 061d0023fcb04bd93fcfa72c8d4b43614bb2037eb6feccaa7ef889ceff2598c5
+ 360dcd18c92376fe36261ec8fd338fc2c1d2142e3f2851d26d2f6c66a28438a7
+ e1774876227de045ef25d5618a22be81c2990259726ae1ebdaa07667de5b73a0
+ def26117eef49e2cdc340527d8e6712803b0da5d729574ffa82789cc1de94a8d
+ a50344da84226cc163d72e9c50e8dde9d1f73598b9a0dd3107dc0bda5728de70
+ 2b52d1d1809bfd704e130fccf229b9e01d14cb012de14ad84508ae516be6f0db
+ 5894674b57a0095e4d0173f5ad7a7f34f69a89f8bcbae74ce304ed38613231fa
+ 092f137b5155b599f2dbd1c2dd3c69877222f43628633ae9ff6b684b970bbea8
+ 72038ab140d7e89ff17f2b498dd8ae3c872b3dc846038c4d68ac742d6b5a4229
+ 6cf32136e9d634fa5bbc4f5f7dedc0b20ad7f3138e9952b5a28a98f46c8b6d02
+ 37230145ed4d4c60798f4c1562bef24645af563b387f7df27684b4aa946c35e7
+ 5d7c57b5a1a361deb43eb7990adb7a3f40e5dd65799e814a99707b4556e7c353
+ 1613ce3a8fc3696a2cb55eb179ee563236388755065ee102c238b88c6b523983
+ 4c27a15f06f72aed3e95f32eaee8eacfa9bebca54ee7bf9615dbd4725101bbdd
+ e1c659fcbc02435e5f4e99c5d0b0efc94809b26010ae448165246b8f6fc8eb56
+ a3f23e82e18cf9fed95e56feea74ab39d46fae2c9cac5208ea24fae2b098600a
+ e7f9aa97ddc952f61cfcfc5e85400fce57a3a4ce58d883d1412c84bd351450b6
+ 1fdc53d91df16e7ccd82aeb94ca75620e74160b86db89288067d7e3557ebd476
+ 6b5820aeaba3307743adc13df898f6136e349f085d50d69aa4542a35ef8a4956
+ 8a1314cbd61b1ddcc0a1b048c9cf6a73a17bc44c7103cdc3f3befe5c3ab8c5d2
+ a672cd6fe8e193441a9df8ce900727c41a92ccec0b402b18539c5fb0fbd316d4
+ b6aeb12ae4ea45bd344fd1763f15a3ce5e6a69fe3f0a5644ebcfc35b246ba544
+ a57253a35ad63f78c4e4a53477b52a3c59feee1003c8e7376ae03a6a5ec7035d
+ 9e64eaa8fe170ae8ada477cf9f68aca9e3a0c1a45cbb8ac05f27fcb21b86abc5
+ 69d8297a877a44836bff65af73218152b7bf0ed796996b020d1101af54b0d8bd
+ 93422ec57211be52fb9d967beefc8e56aa1de24b80a3ae7ce8e331a6fcec2e74
+ 8eaddc78b47e54e52b4d86c7329f6ab923909a8202694c32bf069a1899d4dc55
+ 25d33eb6d9a6c401ac9bf608a8151fa408a654cd737aab07273a132db3b60be7
+ 8e6e17c9760a93d53342bc3d6257ac30f11477e3f8b9a9f752f8d9adf26550dd
+ 73e51cc2f87b13efb074d98e5c8148952e5379562a7e73ad9cb36ca374b1a6b8
+ 17c5d45278fba93625fd9d00eccbfd3c739923a30873050ffda8f2ae12df6a86
+ c4df8dd56ebca61488ecf55fb893f5cbfa2600249b45e382a8a0a9d9152ae704
+ 29d4e5587319023c7f1490ae364be792ffea6c8a70003a87d1d68a5deafea660
+ 9a0f31c479973454eca83c3e0e00cdbb4fc99f2d933bdc07bd0040d2c11d6ad2
+ 7fc60239662a92e17d1d98e541468f09e3d11c7d6782caefc66a7af9b36a4c38
+ 357d06e25fd60cc71a4099bfa5f1105b49a9059748fa5918012b7bbe481aca4b
+ aa7678ed21dc12960e1caac3a0cf4a096297f98f125f9b723da1718b366bd213
+ 8370f53002d8606b5fd535832347a5392075df802f62512f6e9db0cf6697978f
+ 3fe01327107ea48bb372ecd940f6e3bb5a317d517ccfef1e3e4db0d64e68d022
+ af0b696bc5c16de8b285d889bbae049a087469b4dec330b1179c0e0e4a566da4
+ 05c56f48e1b523e7e5cc37b31870347f7d8139a7ca678d6208f2ee56b40cdd92
+ 5b000fe576ee76c39762c864a74d3d1b8cceb764f79b679a5ba293ac6035d39d
+ 91a9c4c3bc53412dc839c59effa82e329848f2021cef5cd4ad9f66a0379baa74
+ 3925fb837da23f0082fcb645f153e7832cbda5e7298427d2cedd87ca438f5e6e
+ 98e7ae2a552d020820cc28e71c59fc17650589c5df58817b98d1a32a651b1731
+ 6d30e58330e3fc166003a8d6899f0c310c654b5fd8dfe7f0f7fe3e5592320b13
+ 4409a6110b26dee020222f3fa62c2fb7a05c80a2529afc039163ddb839a94851
+ 57a59face2e0a28792239fca9d973341fbe915dc3ef44fd14392c22d34ed5c59
+ cc7cc0492a45923b4b716961152774bb4757506d07c147af013e6b19ab60db53
+ b49316db77d0ab229c2ff8cde3e12c664900d01544d45dc421d39a1917bd3bf4
+ c4fa2099b45412fc6d2c230862a6dd94121ceefdc5adaca9ac31417e18ce4ee1
+ 6bc73fa7897b2fd0017294293eb3b4b718917f2b2c281d6ac500002c70774ba4
+ 2c718b8646ad8b79929df9f49aa520be0884fdcf58ed13f1fcf60bea089cad25
+ 58062ec5f74f5157c3fea735e838733cbb4dc2fdeba841eefb1cf01971cfcac6
+ 07aae280e3d7a2d5f8a56dc1ec59af454fd3a3e2f67de7620bfedeab2df63747
+ 1b873373b1bdaccf670f1ea3fc791dc54b658e334bd4cbf2ddd83ad47366b19a
+ 855fac5cd2207307242348c031c52a9c108f11b32bc52d2ae6e7dbdc4f8e4cef
+ fcb1a530764c3249cc834402d3ec2c2e34d0f0ff4843f0d25111b66c98b531ce
+ 56990cd4e5be208f326833c55c5c7f02b5a417a7659c8dab47242f2ace7f7eb5
+ 556ef6257e3273caecf779cc2d2cf2bd5e4fdf7956e1754adf3e71433d08a393
+ b5187594fbbf654c944cda8be3f16b179d073e72b66285186ea22fddff5160b9
+ f4add1da3f3de9b71acfdf19ac6e7872a78d2dd02161cca9dcefaeedf78234a6
+ 788cdc6760bf43898819378597fdafe6715a192cb81ba5b1b011fac9275e9c2c
+ f78ccc32a5c154af1e0fe59b9aa501b12b4d0ad8c3013492ffa6e0ce7752ddf5
+ 1bb9968d140fbbea0ce0be266255bd6695099aa875412eb9c10bfafc078c68b0
+ 3a65e9f5c6d56248fab29a7d512bfe78ff39ffe7869961157f56bf48e8bfe1d1
+ 81e749e6cae036fd5b2c93ef826426277294662c6d34e1e5d6245c35c523ba8e
+ e437d9e94bf4bceec2be8a50545de83d47825eda8eeb8756743c63734c1bcdbc
+ ca9e8a120a8308375ae02b416a0d019f50ae423535e3da7b687ae097b63713be
+ 9330f2860e7c11c6189d25197d0fad07da2a06a42c145903196705f2da75db67
+ c3230128f9df010390d0ce29e886c7afd8e1e4471e5ffd863c3a3ecb3b7b18e2
+ eaa24f8bcab9933e8e51dda52bcbe0c9a186c99ab73c8f0402713c8327a2b0fc
+ 4ee297dc895a92378068fd51fb8d2eaa02e0067216549ad28520568635bd0e5c
+ 2ac679a8d6e40db227f07b8598e4dc4abede0f7cdfb9a79249832b89e9ada5dc
+ 83e5282025df6b591da40f3f20f4c41adaf9bc8d8903c5729d02f2ccb0d49ecd
+ f8eaba78a6cb08193e05fb247144a2ce0e9d41c209fa19ebd1995a7ac531a055
+ a3afb00ab3a494702ec5396f7d95c342472a93d31f5b406f37f0e75f4d8553e2
+ 7655e926b6b82227d1bb8eb41eac3160e43591c6c6adfeb1e967d28bc2c2dcad
+ dda55049cfed59a6a12ca986a47390c62ff3c34e82846b6769b7898cc162d95b
+ 8d513578c69e9971b4a9ba00d9def9de83c851200d38df791f7ee7f4c42a4bb4
+ 968ee7ab12abb69035d97e5481a4daa052debf9097896e775c3e49a52b5c56e0"

From 5eb95522f9793850f24c2e8b04913b9c449c6dbd Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 18 Feb 2021 22:00:40 +0100
Subject: [PATCH 2206/3458] dateutils: update to 0.4.8.

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

diff --git a/srcpkgs/dateutils/template b/srcpkgs/dateutils/template
index dc0b31b5bfff..df3cd26ca6d5 100644
--- a/srcpkgs/dateutils/template
+++ b/srcpkgs/dateutils/template
@@ -1,6 +1,6 @@
 # Template file for 'dateutils'
 pkgname=dateutils
-version=0.4.7
+version=0.4.8
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -10,7 +10,7 @@ license="BSD-3-Clause"
 homepage="http://www.fresse.org/dateutils/"
 changelog="http://www.fresse.org/dateutils/changelog.html"
 distfiles="https://bitbucket.org/hroptatyr/dateutils/downloads/${pkgname}-${version}.tar.xz"
-checksum=49725457f5bef45ea424baade8999a6e54496e357f64280474ff7134a54f599a
+checksum=3f7054a24cf3e3ea2c32a6b1f7474334c25b54e9c45c96b03f75eaaecc70c100
 
 post_extract() {
 	vsed -i '/sysctl\.h/d' build-aux/yuck.c

From 3152fed76339815f9a4e34857348cdb40464c09a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 23 Feb 2021 12:12:42 -0500
Subject: [PATCH 2207/3458] python3-svg.path: update to 4.1.

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

diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template
index 8b94cf795b49..c5372b1416ae 100644
--- a/srcpkgs/python3-svg.path/template
+++ b/srcpkgs/python3-svg.path/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-svg.path'
 pkgname=python3-svg.path
-version=4.0.2
-revision=2
+version=4.1
+revision=1
 wrksrc="svg.path-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://github.com/regebro/svg.path"
 distfiles="https://github.com/regebro/svg.path/archive/${version}.tar.gz"
-checksum=60fc147f1734e5beb108b464cdf2418baefa1d03168fdb9733baed84bc040b50
+checksum=8fe78a5ff8f379c78dac4a3ba623068a8a2af434dace24103a053e06525d400d
 
 post_install() {
 	vlicense LICENSE.txt

From cfae70dd9547f4ba572b100d528a2a1651309e94 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 23 Feb 2021 12:40:38 -0500
Subject: [PATCH 2208/3458] python3-trimesh: update to 3.9.7.

Unit tests fail on x86. Upstream issue: https://github.com/mikedh/trimesh/issues/690
---
 srcpkgs/python3-trimesh/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index 4a03839937ed..c23cb17455de 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.9.3
+version=3.9.7
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -10,13 +10,14 @@ depends="python3-numpy python3-scipy python3-networkx python3-lxml
  python3-pyglet python3-shapely python3-rtree python3-Pillow python3-svg.path
  python3-jsonschema python3-psutil python3-chardet python3-sympy python3-msgpack
  python3-pycollada python3-requests"
+# unit tests fail on x86 https://github.com/mikedh/trimesh/issues/690
 checkdepends="$depends python3-pytest"
 short_desc="Python3 library for loading and using triangular meshes"
 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=54f4f57a5fdbed7d95ddb4b26d34c3c7a2ddf3126833c9352515fb91b03b3eac
+checksum=44aaa4363391f68743ce5110cc950c03706ac562cc34f194249c91e1f0cde35d
 
 post_install() {
 	vlicense LICENSE.md

From 37e39cb7dc248858b1517324a92e89757223d447 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 16 Feb 2021 18:19:22 -0600
Subject: [PATCH 2209/3458] gns3-gui: update to 2.2.18.

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

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 1d7d84c4c654..be6745aa8856 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.17
-revision=2
+version=2.2.18
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema python3-sentry
@@ -13,7 +13,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=@2200216046969000e6f076707d2ea3938a0777dc82e3d940cc41dc26c7fd46b5
+checksum=@02c339cd8f53b7315697f5f6402ce7a15b4d669df93fc45b5691c1e9b2ba7b45
 
 post_patch() {
 	# relax requirements

From 6aa27bb5c2e6d592d06dcf20ab4299b7194ff421 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 16 Feb 2021 18:19:16 -0600
Subject: [PATCH 2210/3458] gns3-server: update to 2.2.18.

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

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 96ae642279ee..f8f637609bba 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.17
+version=2.2.18
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,8 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=@476c23fc41c0f92c816557f56e8a8184009b4cf0477c4d94156d9ff06db9256b
+checksum=@e8e24139964c6a87a9c133994ca13e8fa2c1c7d1cbc23bfdda0a488f5d203947
+make_check=no
 
 post_patch() {
 	# relax requirements

From 1d51111b042cb9d188ec74e3994ce3a316fa5eb5 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Thu, 11 Feb 2021 21:21:49 +0100
Subject: [PATCH 2211/3458] nextcloud-client: update to 3.1.2, no shibboleth
 and webkit support, kwallet subpackage

* shibboleth is "highly deprecated" by upstream, will be removed in 3.2.
* webkit support is currently ineffective and difficult to fix.
* fix ~dolphin build options
* nextcloud-client-kwallet: dedicated package for kwallet as credential storage

Closes: #26774
---
 srcpkgs/nextcloud-client-kwallet              |   1 +
 .../files/kwallet/README.voidlinux            |   6 +
 .../files/kwallet/nextcloud.kwallet           |   4 +
 .../patches/no-webengine-support.patch        | 371 ------------------
 .../patches/no-webengine-support.patch.args   |   1 -
 srcpkgs/nextcloud-client/patches/qt5.15.patch |  10 -
 srcpkgs/nextcloud-client/template             |  44 ++-
 7 files changed, 37 insertions(+), 400 deletions(-)
 create mode 120000 srcpkgs/nextcloud-client-kwallet
 create mode 100644 srcpkgs/nextcloud-client/files/kwallet/README.voidlinux
 create mode 100644 srcpkgs/nextcloud-client/files/kwallet/nextcloud.kwallet
 delete mode 100644 srcpkgs/nextcloud-client/patches/no-webengine-support.patch
 delete mode 100644 srcpkgs/nextcloud-client/patches/no-webengine-support.patch.args
 delete mode 100644 srcpkgs/nextcloud-client/patches/qt5.15.patch

diff --git a/srcpkgs/nextcloud-client-kwallet b/srcpkgs/nextcloud-client-kwallet
new file mode 120000
index 000000000000..50c67ada861c
--- /dev/null
+++ b/srcpkgs/nextcloud-client-kwallet
@@ -0,0 +1 @@
+nextcloud-client
\ No newline at end of file
diff --git a/srcpkgs/nextcloud-client/files/kwallet/README.voidlinux b/srcpkgs/nextcloud-client/files/kwallet/README.voidlinux
new file mode 100644
index 000000000000..d0a5e1dabed5
--- /dev/null
+++ b/srcpkgs/nextcloud-client/files/kwallet/README.voidlinux
@@ -0,0 +1,6 @@
+nextcloud-client-kwallet package provides a wrapper of nextcloud-client.
+It enforces nextcloud-client to use kwallet as its credential storage.
+This is usefull when user's desktop environment is not KDE/plasma.
+
+Nextcloud-client relies on qtkeychain to choose an appropriate storage backend.
+But qtkeychain chooses kwallet over gnome-keyring only if the DE is KDE/Plasma.
diff --git a/srcpkgs/nextcloud-client/files/kwallet/nextcloud.kwallet b/srcpkgs/nextcloud-client/files/kwallet/nextcloud.kwallet
new file mode 100644
index 000000000000..7236b7df5a38
--- /dev/null
+++ b/srcpkgs/nextcloud-client/files/kwallet/nextcloud.kwallet
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Force usage of KDE kwallet as credential storage via qtkeychain as much as possible.
+# related to https://github.com/void-linux/void-packages/issues/26774
+exec env DESKTOP_SESSION=kde KDE_SESSION_VERSION=5 /usr/bin/nextcloud "$@"
diff --git a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch b/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
deleted file mode 100644
index 0d2642870c63..000000000000
--- a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-source: https://github.com/nextcloud/desktop/pull/2204/
-*partial* pick since 2nd commit 1f577e5 is broken ("Try to preserve flow2")
-
-src/gui/CMakeLists.txt diff modified to support nextcloud client 3.1.0
-(git commit is then partially modified)
-
-From 5b6bde1c206c9b1edb0472a823776bdc91488db3 Mon Sep 17 00:00:00 2001
-From: Max Rees <maxcrees@me.com>
-Date: Sun, 23 Feb 2020 23:09:29 -0600
-Subject: [PATCH 1/2] Add support for compiling without QtWebEngine (webflow /
- flow2 support)
-
-Signed-off-by: Max Rees <maxcrees@me.com>
-Signed-off-by: theova <theova@member.fsf.org>
----
- CMakeLists.txt                       |  7 +++++++
- src/CMakeLists.txt                   |  6 +++++-
- src/gui/CMakeLists.txt               | 24 ++++++++++++++-------
- src/gui/accountmanager.cpp           |  2 ++
- src/gui/creds/credentialsfactory.cpp |  4 ++++
- src/gui/wizard/owncloudsetuppage.cpp |  4 ++++
- src/gui/wizard/owncloudwizard.cpp    | 31 +++++++++++++++++++++++++++-
- src/gui/wizard/owncloudwizard.h      |  6 ++++++
- src/libsync/networkjobs.cpp          |  8 +++++++
- 9 files changed, 82 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5df238838..4a333dbdd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -176,6 +176,13 @@ if(NO_SHIBBOLETH)
-    add_definitions(-DNO_SHIBBOLETH=1)
- endif()
- 
-+# Disable webengine-based components
-+option(NO_WEBENGINE "Build without webflow / flow2 support so QtWebEngine isn't required" OFF)
-+if(NO_WEBENGINE)
-+   message("Compiling without webengine")
-+   add_definitions(-DNO_WEBENGINE=1)
-+endif()
-+
- if(APPLE)
-   set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
- endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a79edfcfb..c8ef114a4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,7 +4,11 @@ endif()
- 
- set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
- 
--find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
-+find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED)
-+
-+if(NOT NO_WEBENGINE)
-+    find_package(Qt5 5.12 COMPONENTS WebEngineWidgets WebEngine REQUIRED)
-+endif()
- 
- if(NOT TOKEN_AUTH_ONLY)
-     find_package(Qt5Keychain REQUIRED)
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 2f1e99e2b..c5be00c37 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -119,23 +119,16 @@
-     creds/credentialsfactory.cpp
-     creds/httpcredentialsgui.cpp
-     creds/oauth.cpp
--    creds/flow2auth.cpp
--    creds/webflowcredentials.cpp
--    creds/webflowcredentialsdialog.cpp
-     wizard/postfixlineedit.cpp
-     wizard/abstractcredswizardpage.cpp
-     wizard/owncloudadvancedsetuppage.cpp
-     wizard/owncloudconnectionmethoddialog.cpp
-     wizard/owncloudhttpcredspage.cpp
-     wizard/owncloudoauthcredspage.cpp
--    wizard/flow2authcredspage.cpp
--    wizard/flow2authwidget.cpp
-     wizard/owncloudsetuppage.cpp
-     wizard/owncloudwizardcommon.cpp
-     wizard/owncloudwizard.cpp
-     wizard/owncloudwizardresultpage.cpp
--    wizard/webviewpage.cpp
--    wizard/webview.cpp
-     wizard/slideshow.cpp
- )
- 
-@@ -156,6 +149,18 @@
-     )
- endif()
- 
-+IF(NOT NO_WEBENGINE)
-+    list(APPEND client_SRCS
-+        creds/flow2auth.cpp
-+        creds/webflowcredentials.cpp
-+        creds/webflowcredentialsdialog.cpp
-+        wizard/flow2authcredspage.cpp
-+        wizard/flow2authwidget.cpp
-+        wizard/webviewpage.cpp
-+        wizard/webview.cpp
-+    )
-+endif()
-+
- IF( APPLE )
-     list(APPEND client_SRCS cocoainitializer_mac.mm)
-     list(APPEND client_SRCS socketapisocket_mac.mm)
-@@ -328,8 +333,11 @@
- set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
-         INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
- 
--target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
-+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2)
- target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
-+IF(NOT NO_WEBENGINE)
-+    target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::WebEngineWidgets )
-+endif()
- IF(BUILD_UPDATER)
-     target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
- endif()
-diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
-index 34c4cbc3e..372c52f44 100644
---- a/src/gui/accountmanager.cpp
-+++ b/src/gui/accountmanager.cpp
-@@ -253,6 +253,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
-         acc->setUrl(urlConfig.toUrl());
-     }
- 
-+#ifndef NO_WEBENGINE
-     // Migrate to webflow
-     if (authType == QLatin1String("http")) {
-         authType = "webflow";
-@@ -266,6 +267,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
-             settings.remove(key);
-         }
-     }
-+#endif
- 
-     qCInfo(lcAccountManager) << "Account for" << acc->url() << "using auth type" << authType;
- 
-diff --git a/src/gui/creds/credentialsfactory.cpp b/src/gui/creds/credentialsfactory.cpp
-index 6062f70eb..723196d08 100644
---- a/src/gui/creds/credentialsfactory.cpp
-+++ b/src/gui/creds/credentialsfactory.cpp
-@@ -21,7 +21,9 @@
- #ifndef NO_SHIBBOLETH
- #include "creds/shibbolethcredentials.h"
- #endif
-+#ifndef NO_WEBENGINE
- #include "creds/webflowcredentials.h"
-+#endif
- 
- namespace OCC {
- 
-@@ -40,8 +42,10 @@ namespace CredentialsFactory {
-         } else if (type == "shibboleth") {
-             return new ShibbolethCredentials;
- #endif
-+#ifndef NO_WEBENGINE
-         } else if (type == "webflow") {
-             return new WebFlowCredentials;
-+#endif
-         } else {
-             qCWarning(lcGuiCredentials, "Unknown credentials type: %s", qPrintable(type));
-             return new DummyCredentials;
-diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
-index 71f1c19c9..d997125a8 100644
---- a/src/gui/wizard/owncloudsetuppage.cpp
-+++ b/src/gui/wizard/owncloudsetuppage.cpp
-@@ -139,7 +139,11 @@ void OwncloudSetupPage::slotLogin()
- void OwncloudSetupPage::slotGotoProviderList()
- {
-     _ocWizard->setRegistration(true);
-+#ifndef NO_WEBENGINE
-     _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
-+#else
-+    _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::Basic);
-+#endif
-     _authTypeKnown = true;
-     _checking = false;
-     emit completeChanged();
-diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
-index 912222dca..463c19d48 100644
---- a/src/gui/wizard/owncloudwizard.cpp
-+++ b/src/gui/wizard/owncloudwizard.cpp
-@@ -27,8 +27,10 @@
- #endif
- #include "wizard/owncloudadvancedsetuppage.h"
- #include "wizard/owncloudwizardresultpage.h"
-+#ifndef NO_WEBENGINE
- #include "wizard/webviewpage.h"
- #include "wizard/flow2authcredspage.h"
-+#endif
- 
- #include "QProgressIndicator.h"
- 
-@@ -50,22 +52,30 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
- #ifndef NO_SHIBBOLETH
-     , _shibbolethCredsPage(new OwncloudShibbolethCredsPage)
- #endif
-+#ifndef NO_WEBENGINE
-     , _flow2CredsPage(new Flow2AuthCredsPage)
-+#endif
-     , _advancedSetupPage(new OwncloudAdvancedSetupPage)
-     , _resultPage(new OwncloudWizardResultPage)
-+#ifndef NO_WEBENGINE
-     , _webViewPage(new WebViewPage(this))
-+#endif
- {
-     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-     setPage(WizardCommon::Page_ServerSetup, _setupPage);
-     setPage(WizardCommon::Page_HttpCreds, _httpCredsPage);
-     setPage(WizardCommon::Page_OAuthCreds, _browserCredsPage);
-+#ifndef NO_WEBENGINE
-     setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage);
-+#endif
- #ifndef NO_SHIBBOLETH
-     setPage(WizardCommon::Page_ShibbolethCreds, _shibbolethCredsPage);
- #endif
-     setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage);
-     setPage(WizardCommon::Page_Result, _resultPage);
-+#ifndef NO_WEBENGINE
-     setPage(WizardCommon::Page_WebView, _webViewPage);
-+#endif
- 
-     connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished);
- 
-@@ -77,11 +87,15 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
-     connect(_setupPage, &OwncloudSetupPage::determineAuthType, this, &OwncloudWizard::determineAuthType);
-     connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-     connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-+#ifndef NO_WEBENGINE
-     connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-+#endif
- #ifndef NO_SHIBBOLETH
-     connect(_shibbolethCredsPage, &OwncloudShibbolethCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
- #endif
-+#ifndef NO_WEBENGINE
-     connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-+#endif
-     connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders,
-         this, &OwncloudWizard::createLocalAndRemoteFolders);
-     connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration);
-@@ -103,12 +117,16 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
-     // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
-     connect(this, &OwncloudWizard::styleChanged, _setupPage, &OwncloudSetupPage::slotStyleChanged);
-     connect(this, &OwncloudWizard::styleChanged, _advancedSetupPage, &OwncloudAdvancedSetupPage::slotStyleChanged);
-+#ifndef NO_WEBENGINE
-     connect(this, &OwncloudWizard::styleChanged, _flow2CredsPage, &Flow2AuthCredsPage::slotStyleChanged);
-+#endif
- 
-     customizeStyle();
- 
-+#ifndef NO_WEBENGINE
-     // allow Flow2 page to poll on window activation
-     connect(this, &OwncloudWizard::onActivate, _flow2CredsPage, &Flow2AuthCredsPage::slotPollNow);
-+#endif
- }
- 
- void OwncloudWizard::setAccount(AccountPtr account)
-@@ -177,9 +195,11 @@ void OwncloudWizard::successfulStep()
-         _browserCredsPage->setConnected();
-         break;
- 
-+#ifndef NO_WEBENGINE
-     case WizardCommon::Page_Flow2AuthCreds:
-         _flow2CredsPage->setConnected();
-         break;
-+#endif
- 
- #ifndef NO_SHIBBOLETH
-     case WizardCommon::Page_ShibbolethCreds:
-@@ -187,9 +207,11 @@ void OwncloudWizard::successfulStep()
-         break;
- #endif
- 
-+#ifndef NO_WEBENGINE
-     case WizardCommon::Page_WebView:
-         _webViewPage->setConnected();
-         break;
-+#endif
- 
-     case WizardCommon::Page_AdvancedSetup:
-         _advancedSetupPage->directoriesCreated();
-@@ -214,10 +236,12 @@ void OwncloudWizard::setAuthType(DetermineAuthTypeJob::AuthType type)
- #endif
-         if (type == DetermineAuthTypeJob::OAuth) {
-         _credentialsPage = _browserCredsPage;
-+#ifndef NO_WEBENGINE
-     } else if (type == DetermineAuthTypeJob::LoginFlowV2) {
-         _credentialsPage = _flow2CredsPage;
-     } else if (type == DetermineAuthTypeJob::WebViewFlow) {
-         _credentialsPage = _webViewPage;
-+#endif
-     } else { // try Basic auth even for "Unknown"
-         _credentialsPage = _httpCredsPage;
-     }
-@@ -242,7 +266,12 @@ void OwncloudWizard::slotCurrentPageChanged(int id)
-     }
- 
-     setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup);
--    if (id == WizardCommon::Page_AdvancedSetup && (_credentialsPage == _browserCredsPage || _credentialsPage == _flow2CredsPage)) {
-+    if (id == WizardCommon::Page_AdvancedSetup
-+           && (_credentialsPage == _browserCredsPage
-+#ifndef NO_WEBENGINE
-+           || _credentialsPage == _flow2CredsPage
-+#endif
-+           )) {
-         // For OAuth, disable the back button in the Page_AdvancedSetup because we don't want
-         // to re-open the browser.
-         button(QWizard::BackButton)->setEnabled(false);
-diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
-index ee6161ca5..c0ee06403 100644
---- a/src/gui/wizard/owncloudwizard.h
-+++ b/src/gui/wizard/owncloudwizard.h
-@@ -39,8 +39,10 @@ class OwncloudAdvancedSetupPage;
- class OwncloudWizardResultPage;
- class AbstractCredentials;
- class AbstractCredentialsWizardPage;
-+#ifndef NO_WEBENGINE
- class WebViewPage;
- class Flow2AuthCredsPage;
-+#endif
- 
- /**
-  * @brief The OwncloudWizard class
-@@ -114,11 +116,15 @@ private:
- #ifndef NO_SHIBBOLETH
-     OwncloudShibbolethCredsPage *_shibbolethCredsPage;
- #endif
-+#ifndef NO_WEBENGINE
-     Flow2AuthCredsPage *_flow2CredsPage;
-+#endif
-     OwncloudAdvancedSetupPage *_advancedSetupPage;
-     OwncloudWizardResultPage *_resultPage;
-     AbstractCredentialsWizardPage *_credentialsPage = nullptr;
-+#ifndef NO_WEBENGINE
-     WebViewPage *_webViewPage;
-+#endif
- 
-     QStringList _setupLog;
- 
-diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
-index d40ccede4..0125f778b 100644
---- a/src/libsync/networkjobs.cpp
-+++ b/src/libsync/networkjobs.cpp
-@@ -966,12 +966,20 @@ void DetermineAuthTypeJob::checkAllDone()
- 
-     // WebViewFlow > OAuth > Shib > Basic
-     if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
-+#ifndef NO_WEBENGINE
-         result = WebViewFlow;
-+#else
-+        result = Basic;
-+#endif
-     }
- 
-     // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
-     if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) {
-+#ifndef NO_WEBENGINE
-         result = LoginFlowV2;
-+#else
-+        result = Basic;
-+#endif
-     }
- 
-     // If we determined that we need the webview flow (GS for example) then we switch to that
--- 
-2.28.0
-
diff --git a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch.args b/srcpkgs/nextcloud-client/patches/no-webengine-support.patch.args
deleted file mode 100644
index 2eba1cb3c5ce..000000000000
--- a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1
diff --git a/srcpkgs/nextcloud-client/patches/qt5.15.patch b/srcpkgs/nextcloud-client/patches/qt5.15.patch
deleted file mode 100644
index 60d459c5fd44..000000000000
--- a/srcpkgs/nextcloud-client/patches/qt5.15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libsync/networkjobs.cpp	2020-03-03 20:32:31.000000000 +0100
-+++ -	2020-07-05 00:46:17.255659367 +0200
-@@ -30,6 +30,7 @@
- #include <QCoreApplication>
- #include <QJsonDocument>
- #include <QJsonObject>
-+#include <QPainterPath>
- #include <QPainter>
- 
- #include "networkjobs.h"
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a63194..cb674c0999de 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,18 +1,16 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.1.1
+version=3.1.2
 revision=1
 wrksrc="desktop-${version}"
 build_style=cmake
-configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')
- $(vopt_if webengine '' '-DNO_WEBENGINE=True')"
+configure_args="-Wno-dev -DNO_SHIBBOLETH=True"
 hostmakedepends="pkg-config"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
- qt5-quickcontrols2-devel
+ qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
  $(vopt_if dolphin 'extra-cmake-modules kio-devel')
- $(vopt_if shibboleth 'qt5-webkit-devel')
- $(vopt_if webengine 'qt5-webengine-devel')"
+ qt5-webengine-devel"
 depends="qt5-graphicaleffects"
 checkdepends="cmocka-devel"
 conf_files="/etc/Nextcloud/sync-exclude.lst"
@@ -21,19 +19,11 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=e296156a4de033a59f9b3210fe17fdfb8bb7aebefb715ae4e3b85e627e40a87f
+checksum=2fb2c18f479be2a04cf999f037def705c4be0087816af727038f0c71cb2c6189
 
-build_options="dolphin shibboleth webengine"
+build_options="dolphin"
 desc_option_dolphin="Build KDE dolphin support"
-desc_option_shibboleth="Build Shibboleth support (needs Qt5 WebKit)"
-desc_option_webengine="Build Qt5 WebEngine support"
-build_options_default="dolphin shibboleth"
-
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
-		build_options_default+=" webengine"
-	fi
-fi
+build_options_default="dolphin"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools"
@@ -41,7 +31,8 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')"
 fi
 
-subpackages="$(vopt_if dolphin 'nextcloud-client-dolphin') nextcloud-client-devel"
+subpackages="nextcloud-client-kwallet nextcloud-client-devel"
+subpackages+=" $(vopt_if dolphin 'nextcloud-client-dolphin')"
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DUNIT_TESTING=1"
@@ -53,6 +44,23 @@ if [ "$XBPS_CHECK_PKGS" ]; then
 	esac
 fi
 
+nextcloud-client-kwallet_package() {
+	short_desc+=" - kwallet credential backend"
+	depends="nextcloud-client>=${version}_${revision} kwallet"
+	pkg_install() {
+		vbin ${FILESDIR}/kwallet/nextcloud.kwallet
+		vmkdir usr/share/applications
+		cp build/src/gui/com.nextcloud.desktopclient.nextcloud.desktop \
+		   ${DESTDIR}/usr/share/applications/nextcloud-kwallet.desktop
+		vsed -i -e 's,^Exec=.*,Exec=/usr/bin/nextcloud.kwallet,' \
+		     -e 's,\(^Name=.*\),\1 - use kwallet,' \
+		     -e 's,\(^Comment=.*\),\1 - use kwallet credential storage,' \
+		     -e '/^# Translations/,$d' \
+		     ${DESTDIR}/usr/share/applications/nextcloud-kwallet.desktop
+		vdoc ${FILESDIR}/kwallet/README.voidlinux
+	}
+}
+
 nextcloud-client-dolphin_package() {
 	short_desc+=" - KDE dolphin integration"
 	depends="nextcloud-client>=${version}_${revision}"

From 06a116ca76b1d6f7f4e1cd399904b8072bf48a93 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 16 Feb 2021 00:16:33 +0200
Subject: [PATCH 2212/3458] skalibs: update to 2.10.0.2.

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

diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index cd1ff83ced91..38363d38fd7b 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,6 +1,6 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.10.0.1
+version=2.10.0.2
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --enable-static --enable-shared
@@ -14,7 +14,7 @@ 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=4ffbae8fdcd5108916bbea8eb6f795106d2c3189039e331bcd4b8e00e9971cb2
+checksum=8bba3d7650bab83d4ea2ad21d6bfb5479a8652e362a478fcb783b3c7cf891e0f
 
 post_install() {
 	vlicense COPYING LICENSE

From f8f4d619f1779b661dde294e09d1ecf339822e42 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 16 Feb 2021 00:16:39 +0200
Subject: [PATCH 2213/3458] execline: update to 2.8.0.0.

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

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 326a843b962e..a2bf5437f0b4 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,7 +1,7 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.7.0.1
-revision=2
+version=2.8.0.0
+revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -13,7 +13,7 @@ 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=cdf61164f97f764a06aba36986d549159df56f2d1a4b3bbf5467ee91ad8fdcdd
+checksum=e7744b4a400eda68b83dcfb1bce65e454606279882d83d8230ddf8afda25766d
 
 CFLAGS="-fPIC"
 

From 3438f06b4e77358fcbece38e6102b5b0a2b71f54 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 16 Feb 2021 00:16:44 +0200
Subject: [PATCH 2214/3458] s6: update to 2.10.0.2.

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

diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 1dd9bd9c9879..70e65e51a5c9 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,6 +1,6 @@
 # Template file for 's6'
 pkgname=s6
-version=2.10.0.1
+version=2.10.0.2
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -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=d0026f0fb4790febbd45f66bdcded54fab4a27ac2f579c075267a21154a0d1f5
+checksum=b23afce87080b848b89499e85ebd93c20269e6db23f6ef65e58386c9cecd6c21
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)

From e2802750a4f67e4870a868a323f83cc7370ba96f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 16 Feb 2021 00:16:57 +0200
Subject: [PATCH 2215/3458] s6-networking: update to 2.4.1.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 969f65823f15..de517c3f3a34 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=2
+version=2.4.1.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=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
+checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
 build_options="bearssl libressl"
 build_options_default="bearssl"

From 0f080240c490b019da9485e11089c084a73de114 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 16 Feb 2021 21:28:55 +0200
Subject: [PATCH 2216/3458] s6-man-pages: update to 2.10.0.2.1.

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

diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template
index 8301518fdf97..f95e50d24b25 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.2
+version=2.10.0.2.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,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=d7d8d16662d8fc9ccdb73ab24576c1f88718103d1a46d2c063bde9d234b79c7f
+checksum=4b831ed89f6a53550626f28d09ea594042321ac6a81d42175b0c52de041ba3cf
 
 
 do_install() {

From fd5ded8514c8a3cb6984cbd2a5f6db60f97aca90 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 16 Feb 2021 21:30:51 +0200
Subject: [PATCH 2217/3458] execline-man-pages: update to 2.8.0.0.1.

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

diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
index 54f720e8f163..5309ac930b02 100644
--- a/srcpkgs/execline-man-pages/template
+++ b/srcpkgs/execline-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 'execline-man-pages'
 pkgname=execline-man-pages
-version=2.7.0.1.2
+version=2.8.0.0.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/execline-man-pages"
 distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
-checksum=e81ae14e87d72c56308b14b1d854a6e56476bc17c48d83d89701e05b67579b8c
+checksum=c99e4bfce6aab2bdccb1ec08af063b6434a43bf4aa8bfa0efca98b4f11c8588e
 
 do_install() {
 	vmkdir usr/share/man/man1

From 70ed1546c7944ec038a7b7a42d0e97946b3af0b1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 17 Feb 2021 20:10:19 +0200
Subject: [PATCH 2218/3458] s6-networking-man-pages: update to 2.4.1.0.1.

---
 srcpkgs/s6-networking-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template
index f8b5f43a308b..8e4f95b5efb4 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.2
+version=2.4.1.0.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ 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=a1e80966d7536ee38b7a54fd0acafd6d75885bbf81c7d79fb6c901db3743131a
+checksum=e864679744eee8ba8f44297c76422c7a955f6bd973b3462c6ad2406c2d870c6d
 
 do_install() {
 	vmkdir usr/share/man/man1

From ea77461e7e6a2aad70c947a1a0b06a96ac32fa90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 22:59:56 -0300
Subject: [PATCH 2219/3458] goat: remove package.

Never got an upstream release, so doesn't really fit packaging
guidelines. Inactive since 2016.
---
 srcpkgs/goat/template             | 15 ---------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 srcpkgs/goat/template

diff --git a/srcpkgs/goat/template b/srcpkgs/goat/template
deleted file mode 100644
index c7eb49d2c240..000000000000
--- a/srcpkgs/goat/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'goat'
-pkgname=goat
-version=0.0.0.28022016
-revision=10
-build_style=go
-_commit=2184ebe13497ec587e6f48b9381883285fa0071c
-hostmakedepends="git"
-wrksrc="$pkgname-$_commit"
-short_desc="Render ASCII art as SVG diagrams"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="MIT"
-go_import_path="github.com/blampe/goat"
-homepage="http://$go_import_path"
-distfiles="$homepage/archive/$_commit.tar.gz"
-checksum=f87e66db8423a4113be414501091a8cb00f3775fcc5047ca038e6d15f0420244
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9fb4d0f9bed3..c17637f391ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -49,6 +49,7 @@ replaces="
  glibmm-doc<=2.64.2_2
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
+ goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
  goproxy<=7.0_1
  go-gdm<=1.4_7

From 5a357e1107a9f67023f7b75f6acefb70474a062f Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 18 Feb 2021 20:17:21 +0100
Subject: [PATCH 2220/3458] netsniff-ng: update to 0.6.8.

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

diff --git a/srcpkgs/netsniff-ng/template b/srcpkgs/netsniff-ng/template
index fde3edc45c1d..7d6e73baab5d 100644
--- a/srcpkgs/netsniff-ng/template
+++ b/srcpkgs/netsniff-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'netsniff-ng'
 pkgname=netsniff-ng
-version=0.6.6
-revision=2
+version=0.6.8
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --disable-geoip"
 hostmakedepends="pkg-config flex bison which"
@@ -12,7 +12,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://netsniff-ng.org/"
 distfiles="http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-${version}.tar.gz"
-checksum=0a7092937209585b361400493d81ea1123a529494203824c0cd8e95562072c5e
+checksum=ca22e98208003eb7f75b2d177378848f7178dab83f5c320a0fffb409bdfbb160
 
 CFLAGS="-fcommon"
 

From 2ab71308fd2aa5c185452948c2ce4eed7c473f8a Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 18 Feb 2021 20:56:34 +0100
Subject: [PATCH 2221/3458] strace: update to 5.11.

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

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index a030b371ca3e..658366d1bbf2 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,6 +1,6 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.10
+version=5.11
 revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules --with-libunwind"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c
+checksum=ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*|ppc64*) configure_args+=" --enable-mpers=no" ;;

From 8e2bba8d47f221516f47656a0785abf663ec2755 Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Sun, 24 Jan 2021 15:19:40 -0300
Subject: [PATCH 2222/3458] luarocks-lua53: update to 3.5.0

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

diff --git a/srcpkgs/luarocks-lua53/template b/srcpkgs/luarocks-lua53/template
index 78a41ea5a51c..05f94d1acb54 100644
--- a/srcpkgs/luarocks-lua53/template
+++ b/srcpkgs/luarocks-lua53/template
@@ -1,7 +1,7 @@
 # Template file for 'luarocks-lua53'
 pkgname=luarocks-lua53
-version=3.3.1
-revision=4
+version=3.5.0
+revision=1
 wrksrc=luarocks-${version}
 build_style=configure
 configure_args="
@@ -18,7 +18,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://luarocks.org/"
 distfiles="https://luarocks.org/releases/luarocks-${version}.tar.gz"
-checksum=eb20cd9814df05535d9aae98da532217c590fc07d48d90ca237e2a7cdcf284fe
+checksum=701d0cc0c7e97cc2cf2c2f4068fce45e52a8854f5dc6c9e49e2014202eec9a4f
 alternatives="
  luarocks:luarocks:/usr/bin/luarocks-5.3
  luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.3"

From 061cdfd116375149433741ecaeae464552e1fe3d Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 24 Jan 2021 17:35:14 +0100
Subject: [PATCH 2223/3458] lua54: update to 5.4.2.

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

diff --git a/srcpkgs/lua54/template b/srcpkgs/lua54/template
index c5c9c2b02403..1eddc5ceb30a 100644
--- a/srcpkgs/lua54/template
+++ b/srcpkgs/lua54/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54'
 pkgname=lua54
-version=5.4.1
-revision=2
+version=5.4.2
+revision=1
 wrksrc=lua-${version}
 makedepends="ncurses-devel readline-devel"
 short_desc="Powerful, fast, lightweight, embeddable scripting language (5.4.x)"
@@ -9,7 +9,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="MIT"
 homepage="https://www.lua.org"
 distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz"
-checksum=4ba786c3705eb9db6567af29c91a01b81f1c0ac3124fdbf6cd94bdd9e53cca7d
+checksum=11570d97e9d7303c0a59567ed1ac7c648340cd0db10d5fd594c09223ef2f524f
 
 alternatives="
  lua:lua:/usr/bin/lua5.4

From 0328cc2811b165e5c33b435126e2cf4efaa9ba8f Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Mon, 25 Jan 2021 05:01:20 +1100
Subject: [PATCH 2224/3458] dumb: Package dumbplay & split libaldmb, take
 ownership

This is a second go at #18472 with (in my opinion) a better approach using
subpackages instead of build time options.

libaldmb is a separate library that isn't used by the rest of the package
and splitting it avoids a bunch of unnecessary X11 & other desktop
dependencies on `dumb`.

For the reference player I created a `dumbplay` subpackage which keeps the SDL2
dependency out of the main library package, the tiny dumbout util has minimal
dependencies and thus probably belongs in the main package.

I also updated the homepage which still pointed to the old pre-fork page.
---
 common/shlibs         |  2 +-
 srcpkgs/aldumb        |  1 +
 srcpkgs/dumb/template | 31 ++++++++++++++++++++++++-------
 srcpkgs/dumbplay      |  1 +
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/aldumb
 create mode 120000 srcpkgs/dumbplay

diff --git a/common/shlibs b/common/shlibs
index c9f9bf389e85..8ef87dfefa9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1780,7 +1780,7 @@ libsox.so.3 sox-14.4.2_1
 libsoxr.so.0 libsoxr-0.1.2_1
 libsoxr-lsr.so.0 libsoxr-0.1.2_1
 libdumb.so.2 dumb-2.0.3_1
-libaldmb.so.2 dumb-2.0.3_1
+libaldmb.so.2 aldumb-2.0.3_3
 libframe.so.6 frame-2.5.0_1
 libgrail.so.6 grail-3.1.0_1
 libgeis.so.1 geis-2.2.16_1
diff --git a/srcpkgs/aldumb b/srcpkgs/aldumb
new file mode 120000
index 000000000000..6509fa65327d
--- /dev/null
+++ b/srcpkgs/aldumb
@@ -0,0 +1 @@
+dumb
\ No newline at end of file
diff --git a/srcpkgs/dumb/template b/srcpkgs/dumb/template
index 21c11c4c2cab..87f5ff89890f 100644
--- a/srcpkgs/dumb/template
+++ b/srcpkgs/dumb/template
@@ -1,15 +1,15 @@
 # Template file for 'dumb'
 pkgname=dumb
 version=2.0.3
-revision=2
+revision=3
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF"
+configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=ON"
 hostmakedepends="allegro4-devel"
-makedepends="allegro4-devel"
+makedepends="allegro4-devel argtable-devel SDL2-devel"
 short_desc="IT, XM, S3M and MOD player library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="custom:DUMB"
-homepage="http://dumb.sourceforge.net/"
+homepage="https://github.com/kode54/dumb"
 distfiles="https://github.com/kode54/dumb/archive/${version}.tar.gz"
 checksum=99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9
 
@@ -31,8 +31,25 @@ dumb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove "usr/lib/*.so"
-		vmove usr/include
+		vmove usr/lib/libdumb.so
+		vmove usr/include/dumb.h
 		vmove usr/lib/pkgconfig
 	}
 }
+
+aldumb_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${sourcepkg}-devel>=${version}_${revision}"
+	short_desc+=", Allegro4 integration"
+	pkg_install() {
+		vmove "usr/lib/libaldmb.so*"
+		vmove usr/include/aldumb.h
+	}
+}
+
+dumbplay_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc="IT, XM, S3M, MOD player & conversion programs using DUMB and SDL2"
+	pkg_install() {
+		vmove usr/bin/dumbplay
+	}
+}
diff --git a/srcpkgs/dumbplay b/srcpkgs/dumbplay
new file mode 120000
index 000000000000..6509fa65327d
--- /dev/null
+++ b/srcpkgs/dumbplay
@@ -0,0 +1 @@
+dumb
\ No newline at end of file

From 1e5898cfc12cbf92b2ce6908880c3791db452060 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 19 Feb 2021 00:47:33 -0800
Subject: [PATCH 2225/3458] python3-BeautifulSoup4: update to 4.9.3

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

diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
index 66ba690cf366..b9c83a0b6c61 100644
--- a/srcpkgs/python3-BeautifulSoup4/template
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-BeautifulSoup4'
 pkgname=python3-BeautifulSoup4
-version=4.8.2
-revision=3
+version=4.9.3
+revision=1
 wrksrc="beautifulsoup4-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,8 +10,9 @@ short_desc="Python3 HTML/XML parser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.crummy.com/software/BeautifulSoup"
+changelog="https://bazaar.launchpad.net/%7Eleonardr/beautifulsoup/bs4/view/head:/CHANGELOG"
 distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
+checksum=84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25
 
 do_check() {
 	:

From 6984375204f8977a9ef63482d97c94abd310ec61 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 18 Feb 2021 22:22:31 -0700
Subject: [PATCH 2226/3458] wayfire: enable optimized binary

Recommended by upstream author to improve performance and lower CPU use.
---
 srcpkgs/wayfire/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index fb3b85aef2c0..ab6136b72473 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,7 +1,7 @@
 # Template file for 'wayfire'
 pkgname=wayfire
 version=0.7.0
-revision=1
+revision=2
 _utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
 _touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson
@@ -20,6 +20,10 @@ checksum="b1a94ad2843db19e78cbd361ceebaade4507647ad893d5b5117a9fc7724ce41c
  d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
  2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
 
+# Optimization for nested STL calls
+CXXFLAGS="-O3"
+LDFLAGS="-Wl,-O1"
+
 build_options="image"
 build_options_default="image"
 desc_option_image="Enable JPEG and PNG support"

From 84ff14063caca190851df3a2548304c57cfbc269 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Mon, 15 Feb 2021 10:53:20 +0100
Subject: [PATCH 2227/3458] python3-libtmux: update to 0.8.5

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
---
 srcpkgs/python3-libtmux/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-libtmux/template b/srcpkgs/python3-libtmux/template
index c6363ece8bf3..e1c7918acf65 100644
--- a/srcpkgs/python3-libtmux/template
+++ b/srcpkgs/python3-libtmux/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libtmux'
 pkgname=python3-libtmux
-version=0.8.1
+version=0.8.5
 revision=4
 wrksrc="libtmux-${version}"
 build_style=python3-module
@@ -11,7 +11,9 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="MIT"
 homepage="https://github.com/tmux-python/libtmux"
 distfiles="${PYPI_SITE}/l/libtmux/libtmux-${version}.tar.gz"
-checksum=5d4963cc4af53046cabd0997152af05a0a419e4c63af6737389b50f637c3852a
+checksum=1d35b9f8451944d31c5ed22ed9e6c8e18034adcc75718fcc5b27fbd9621543e1
+# Disable check which uses pip to pull external python packages
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 748e1e4935d501bc2b2d6a72860e8180f37ee8e8 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Mon, 15 Feb 2021 10:53:46 +0100
Subject: [PATCH 2228/3458] python3-tmuxp: update to 1.7.2

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
Closes: #27876 [via git-merge-pr]
---
 srcpkgs/python3-tmuxp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tmuxp/template b/srcpkgs/python3-tmuxp/template
index 1b0ff8fc7618..a8b755c343ed 100644
--- a/srcpkgs/python3-tmuxp/template
+++ b/srcpkgs/python3-tmuxp/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tmuxp'
 pkgname=python3-tmuxp
-version=1.6.2
+version=1.7.2
 revision=3
 wrksrc="tmuxp-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
 license="MIT"
 homepage="https://github.com/tmux-python/tmuxp/"
 distfiles="${PYPI_SITE}/t/tmuxp/tmuxp-${version}.tar.gz"
-checksum=feec0be98a60c8cd8557bce388156202496dd9c8998e6913e595e939aeb0f735
+checksum=14296b62db260420d4600dcd805408ea908b3a78d4ea0a6a403d092fdbf6d075
 conflicts="python-tmuxp>=0"
 
 post_patch() {

From a5d4f38f34fff6c58acd07f84b09d93feddadc96 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 24 Feb 2021 00:26:39 +0300
Subject: [PATCH 2229/3458] luakit: update to 2.3

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

diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template
index 00e5d21c783a..4fa00bb75712 100644
--- a/srcpkgs/luakit/template
+++ b/srcpkgs/luakit/template
@@ -1,7 +1,7 @@
 # Template file for 'luakit'
 pkgname=luakit
 reverts="2017.08.10_1"
-version=2.2.1
+version=2.3
 revision=1
 conf_files="/etc/xdg/luakit/*.lua"
 hostmakedepends="pkg-config LuaJIT"
@@ -13,11 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://luakit.github.io/"
 changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md"
 distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz"
-checksum=f35359f5863fabe2b9d426f4d3ef6d29ce5bb3bac7b4c8e0824242f89868c80e
-
-case "${XBPS_TARGET_MACHINE}" in
-	aarch64) broken="LuaJIT-devel marked as unsupported";;
-esac
+checksum=c7026b4f0bdfa44f43798b80f87548d3e7ad56f5b923fc43b9c712bf18496095
 
 CFLAGS="-fcommon"
 

From cb3caa4fac4186e0ffd448201c497a66b8808a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 24 Feb 2021 07:27:26 +0100
Subject: [PATCH 2230/3458] elogind: fix mips*

---
 srcpkgs/elogind/patches/mips.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/elogind/patches/mips.patch

diff --git a/srcpkgs/elogind/patches/mips.patch b/srcpkgs/elogind/patches/mips.patch
new file mode 100644
index 000000000000..bce29b86ce5f
--- /dev/null
+++ b/srcpkgs/elogind/patches/mips.patch
@@ -0,0 +1,11 @@
+--- src/basic/missing_syscall.h	2021-01-15 08:12:02.000000000 +0100
++++ src/basic/missing_syscall.h	2021-02-24 07:20:32.026355819 +0100
+@@ -11,7 +11,7 @@
+ #include <sys/wait.h>
+ #include <unistd.h>
+ 
+-#ifdef ARCH_MIPS
++#if defined(_MIPSEL) || defined(_MIPSEB)
+ #include <asm/sgidefs.h>
+ #endif
+ 

From 69a79d39c8ff28ff7e9516c520c95dc875c80587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 24 Feb 2021 01:10:15 -0300
Subject: [PATCH 2231/3458] gnome-shell: enable screencast.

pipewire-devel was missing as makedepends.

Fixes #28987.
Solution taken from same issue, kudos @maop:
https://build.opensuse.org/request/show/859147
---
 srcpkgs/gnome-shell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 448ad9323811..c2c623830777 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
 version=3.38.3
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
@@ -12,7 +12,7 @@ makedepends="at-spi2-atk evolution-data-server-devel folks-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
+ libnma-devel polkit-devel pulseaudio-devel pipewire-devel
  startup-notification-devel telepathy-logger-devel gnome-autoar-devel"
 depends="elogind glxinfo gnome-control-center gsettings-desktop-schemas upower"
 short_desc="GNOME core user interface"

From 740d2bea34487b64950c4e055dcc56553a1f9a1a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 Feb 2021 10:36:38 +0100
Subject: [PATCH 2232/3458] qed: update to 1.0.3.

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

diff --git a/srcpkgs/qed/template b/srcpkgs/qed/template
index 58be554924e1..d66a017a2679 100644
--- a/srcpkgs/qed/template
+++ b/srcpkgs/qed/template
@@ -1,6 +1,6 @@
 # Template file for 'qed'
 pkgname=qed
-version=1.0.2
+version=1.0.3
 revision=1
 wrksrc="QED-${version}"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"  # Usenix Tape
 homepage="https://github.com/phonologus/QED"
 distfiles="https://github.com/phonologus/QED/archive/v${version}.tar.gz"
-checksum=e0d27f76bfd9089623233e68eba9d23a3c221e15418c70fddef7e4a03535bdfd
+checksum=a17830ebac244184aa9d52d934a5d938859bb75e4a1a2c7ff5d4e1a8a2600e97
 
 do_install() {
 	vbin qed

From 4d072efe5ad02e60a36ebfd8c2dac2b435d5cc40 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 Feb 2021 10:37:59 +0100
Subject: [PATCH 2233/3458] wireguard-tools: update to 1.0.20210223.

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

diff --git a/srcpkgs/wireguard-tools/template b/srcpkgs/wireguard-tools/template
index 77cda6ed66d6..8ff7d48dedcf 100644
--- a/srcpkgs/wireguard-tools/template
+++ b/srcpkgs/wireguard-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'wireguard-tools'
 pkgname=wireguard-tools
-version=1.0.20200827
+version=1.0.20210223
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.wireguard.com/"
 distfiles="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"
-checksum=51bc85e33a5b3cf353786ae64b0f1216d7a871447f058b6137f793eb0f53b7fd
+checksum=1f72da217044622d79e0bab57779e136a3df795e3761a3fc1dc0941a9055877c
 make_dirs="/etc/wireguard 0700 root root"
 
 post_extract() {

From 21812659f108f1ea42b656a84bc119978232abd4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 24 Feb 2021 10:40:46 +0100
Subject: [PATCH 2234/3458] s-nail: update to 14.9.22.

---
 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 6c2c55085aa9..0497dac816b8 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.21
+version=14.9.22
 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=bf21d72531f85b8882c5a583ce96c901104ce0102a287c7ad680ef068c2ceafd
+checksum=e5dfb7d5bcc5d2d1126f2e826569ee0f149aac3f2a8a6b7c23985ffc3a1def0b
 
 provides="mail-${version}_${revision}"
 

From 8e9255c9a5899e7eda24f0dfb85f0677fbe77a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 24 Feb 2021 11:56:54 +0100
Subject: [PATCH 2235/3458] log4cplus: update to 2.0.6

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

diff --git a/srcpkgs/log4cplus/template b/srcpkgs/log4cplus/template
index 6ec37176958a..ce018b8e1368 100644
--- a/srcpkgs/log4cplus/template
+++ b/srcpkgs/log4cplus/template
@@ -1,6 +1,6 @@
 # Template file for 'log4cplus'
 pkgname=log4cplus
-version=2.0.5
+version=2.0.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-working-locale"
@@ -10,7 +10,7 @@ license="Apache-2.0"
 homepage="https://github.com/log4cplus/log4cplus"
 #changelog="https://raw.githubusercontent.com/log4cplus/log4cplus/master/ChangeLog"
 distfiles="https://github.com/log4cplus/log4cplus/releases/download/REL_${version//./_}/log4cplus-${version}.tar.xz"
-checksum=6046f0867ce4734f298418c7b7db0d35c27403090bb751d98e6e76aa4935f1af
+checksum=73519a5e47c40cf375aa6cd28a703b01908b5dcd3f4cb4290db2fef237c8180c
 
 log4cplus-devel_package() {
 	short_desc+=" - development files"

From 75ddc1bf0ab4abba61114d643307aa2a762fb717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 24 Feb 2021 12:24:12 +0100
Subject: [PATCH 2236/3458] rocksndiamonds: update to 4.2.3.0

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

diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index bd76648459f8..5d4cba4d7664 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
 # Template file for 'rocksndiamonds'
 pkgname=rocksndiamonds
-version=4.2.2.1
+version=4.2.3.0
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,24 +10,23 @@ 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=56d3578548cdb439695fad7a8d2339ded9be355969f4fe3e43c89735d9815166
+checksum=d931216d1dc52d98565dc178881b8e29b992293c043223889d67cd3e6fcf718c
 replaces="rocksndiamonds-data>=0"
 
 do_build() {
+	vsed -i Makefile -e "s;^\(MAKE_CMD = \$(MAKE)\);& ${makejobs};"
 	CFLAGS+=" -DTARGET_SDL2"
 	CFLAGS+=" -DRO_GAME_DIR='\"/usr/share/${pkgname}\"'"
 	CFLAGS+=" -DRW_GAME_DIR='\"/var/lib/${pkgname}\"'"
 	CFLAGS+=" $(sdl2-config --cflags)"
 	LDFLAGS+=" $(sdl2-config --libs) -lSDL2_image -lSDL2_mixer -lSDL2_net -lm -lz"
-	make ${makejobs} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	make CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 do_install() {
 	vmkdir usr/share/${pkgname}
 	cp -aR graphics levels music sounds ${DESTDIR}/usr/share/${pkgname}
 	vbin rocksndiamonds
-	# Manual page is no longer supplied (WTF)
-	# vman rocksndiamonds.1
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 	vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps
 }

From cd9033d67e290f43e3340077e22a123695ab180d 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, 23 Feb 2021 20:05:17 +0700
Subject: [PATCH 2237/3458] common/gnu-configure-args: set exec_prefix to
 ${prefix}

autotools will pass its configure_args to subdir if required,
if we don't init exec_prefix, it will pass --libdir=NONE/lib{32,64} to
subdir configure.
---
 common/environment/configure/gnu-configure-args.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index dafbf5dc110c..c3ab67a78555 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -18,6 +18,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
 # This is to make sure 32-bit and 64-bit libs can coexist when looking
 # up things (the opposite-libdir is always symlinked as libNN)
 export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
+export configure_args+=" --exec-prefix=\${prefix}"
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 

From 2e5f0bc5511ad5d917d65de6058776f57bf7e4f1 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, 23 Feb 2021 20:15:14 +0700
Subject: [PATCH 2238/3458] openmpi: un-bundle libevent

While we're at it, move:
	/usr/lib/ompi_monitoring_prof.so

back to main package and put inside /usr/lib/openmpi
---
 srcpkgs/openmpi/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index f8ef1ef07799..5f962b4fd38d 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -1,11 +1,12 @@
 # Template file for 'openmpi'
 pkgname=openmpi
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="gcc-fortran libgomp-devel perl"
-makedepends="libgfortran-devel libgomp-devel libhwloc-devel zlib-devel"
+hostmakedepends="gcc-fortran libgomp-devel perl pkg-config"
+makedepends="libgfortran-devel libgomp-devel libhwloc-devel zlib-devel
+ libevent-devel"
 conf_files="
  /etc/openmpi-default-hostfile
  /etc/openmpi-mca-params.conf
@@ -42,6 +43,8 @@ pre_configure() {
 
 post_install() {
 	vlicense LICENSE
+	# https://github.com/void-linux/void-packages/pull/28996#issuecomment-784255185
+	mv "${DESTDIR}/usr/lib/ompi_monitoring_prof.so" "${DESTDIR}/usr/lib/openmpi"
 }
 
 libopenmpi_package() {

From 895267fb95d9f209b91a96225e02f47e6b7435b4 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, 24 Feb 2021 18:54:41 +0700
Subject: [PATCH 2239/3458] libcprops: mark nocross

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

diff --git a/srcpkgs/libcprops/template b/srcpkgs/libcprops/template
index 98e78b88e246..3460841477a1 100644
--- a/srcpkgs/libcprops/template
+++ b/srcpkgs/libcprops/template
@@ -4,13 +4,14 @@ version=0.1.12
 revision=2
 build_style=gnu-configure
 configure_args="--disable-cpsp --disable-cpsvc"
-hostmakedepends="flex makedepend"
+hostmakedepends="flex makedepend which"
 short_desc="C prototyping tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://cprops.sourceforge.net/"
 license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/cprops/${pkgname}-${version}.tar.bz2"
 checksum=3737772d2718a2c550adf4ca92cc492e613aa9200aae2bbaaf128d90f4ef67f2
+nocross="autotools TRY_RUN checking for PTHREAD_MUTEX_RECURSIVE"
 
 libcprops-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 82f6d74b144afef40a9eb1aee4948e84ed1e10b1 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, 24 Feb 2021 19:23:57 +0700
Subject: [PATCH 2240/3458] liquidwar: nocross

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

diff --git a/srcpkgs/liquidwar/template b/srcpkgs/liquidwar/template
index cfa3e279d49e..69bc87d1b1a7 100644
--- a/srcpkgs/liquidwar/template
+++ b/srcpkgs/liquidwar/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.ufoot.org/liquidwar"
 distfiles="http://www.ufoot.org/download/${pkgname}/v5/${version}/${pkgname}-${version}.tar.gz"
 checksum=dad0aa84dd416cad055421ed9b40df39efae78d3df759c0583c64c54f7f2ff5f
+nocross="run build artifarts"
 
 CFLAGS="-fcommon"
 

From d02ff3518b934c7be0f6f0add803ed1af8fdd0c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 24 Feb 2021 13:26:50 +0100
Subject: [PATCH 2241/3458] mame: update to 0.229

---
 srcpkgs/mame/template | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index cd6dbb58ed78..f636ba2db699 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -1,6 +1,6 @@
 # Template file for 'mame'
 pkgname=mame
-version=0228
+version=0229
 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=1d8e6f20491492f8b15892ff958f9b067c48eb90cc2fc974b08bde297e657244
+checksum=414921771ada0804a8c7f3540e33338e8495e16a3bca78a5a2b355abafa51e6a
 nodebug=yes
 replaces="sdlmame>=0 sdlmess>=0"
 
@@ -71,21 +71,21 @@ do_configure() {
 				grep -rlw -- -m64 | xargs sed -i "s;-m64;;"
 			;;
 		esac
-		make ${makejobs} ${_options} \
-			CC="$CC_host" \
-			CXX="$CXX_host" \
-			LD="$CXX_host" \
-			CFLAGS="$CFLAGS_host" \
-			CXXFLAGS="$CXXFLAGS_host" \
-			LDFLAGS="$LDFLAGS_host" \
-			genie
-	else
-		make ${makejobs} ${_options} genie
+		CC="$CC_host"
+		CXX="$CXX_host"
+		LD="$CXX_host"
+		CFLAGS="$CFLAGS_host"
+		CXXFLAGS="$CXXFLAGS_host"
+		LDFLAGS="$LDFLAGS_host"
 	fi
+	make CC="$CC" CXX="$CXX" LD="$CXX" \
+		CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
+		${makejobs} ${_options} genie
 }
 
 do_build() {
-	# The build sometimes fails due to parallelism but the 2nd try then passes.
+	# The build sometimes fails due to parallelism and generated files
+	# not being ready but the 2nd try then passes.
 	make OVERRIDE_CC="$CC" OVERRIDE_CXX="$CXX" OVERRIDE_LD="$CXX" ${makejobs} ${_options} || \
 	make OVERRIDE_CC="$CC" OVERRIDE_CXX="$CXX" OVERRIDE_LD="$CXX" ${makejobs} ${_options}
 }

From 9cd9e85ede5125265e5ed9497e61e61eef7d0c48 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, 24 Feb 2021 19:31:02 +0700
Subject: [PATCH 2242/3458] php-igbinary: fix build

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

diff --git a/srcpkgs/php-igbinary/template b/srcpkgs/php-igbinary/template
index 9f90c88de3ce..d969703a7c37 100644
--- a/srcpkgs/php-igbinary/template
+++ b/srcpkgs/php-igbinary/template
@@ -4,7 +4,7 @@ version=3.1.2
 revision=1
 wrksrc="igbinary-${version}"
 build_style=gnu-configure
-hostmakedepends="autoconf"
+hostmakedepends="autoconf php-devel"
 makedepends="php-devel"
 depends="php>7.4.3"
 short_desc="Igbinary is a drop in replacement for the standard php serializer"

From f026a00146b5adbc9350ac10799f43714da4bf47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 24 Feb 2021 09:53:56 +0100
Subject: [PATCH 2243/3458] croc: update to 8.6.8.

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

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 1844acf62e9b..7285728d0ab4 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=8.6.7
+version=8.6.8
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=4124fa4528d2cf3c63cf23e8598f976dfcd702858404cc69f4cd27245ebe0c33
+checksum=71dc45ab9511bc2a8807562632a6393e264ac59c500d6a17e2e1b01269d4d8e3
 
 post_install() {
 	vlicense LICENSE

From e69212672eb35ff2f7291cec0d3761dca91699a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 24 Feb 2021 10:15:58 +0100
Subject: [PATCH 2244/3458] qpdf: update to 10.2.0.

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

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index cf58e81e445d..9ad808360cf6 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.1.0
+version=10.2.0
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=e0516398ac1cdaa1ebce2b822ccdd8afbadea43b0b57304c147a17639a1402b0
+checksum=4c627307cb40ddcf2b293dafa3943ce5744a72d7c1614e129b6acaef0ea771d3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 865ea0efeaec1232a5107e39a464b5ecde7e5a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 23 Feb 2021 08:55:34 +0100
Subject: [PATCH 2245/3458] gendesk: update to 1.0.8.

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

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 51904d9d14df..7b9eaab6164b 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,6 +1,6 @@
 # Template file for 'gendesk'
 pkgname=gendesk
-version=1.0.6
+version=1.0.8
 revision=1
 build_style=go
 go_import_path=github.com/xyproto/gendesk
@@ -12,7 +12,7 @@ license="MIT"
 homepage="http://roboticoverlords.org/gendesk/"
 distfiles="https://github.com/xyproto/gendesk/archive/${version}.tar.gz
  http://roboticoverlords.org/images/default.png"
-checksum="924606ca1c15a140b70f363c4a0ac46fb3ad4d05bc39db400d0b0e41dd4456bb
+checksum="548ca9b5bd81174414857ece85d6afd8e021c8ac769584c0f573896b845e8fe1
  4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837"
 skip_extraction="default.png"
 

From 7df74c42ea8a16fd1f76f9e1661fd8ae8b61c53a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 24 Feb 2021 13:14:15 +0100
Subject: [PATCH 2246/3458] renderdoc: update to 1.12.

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

diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template
index faf2dc654c3d..7240e9ebc307 100644
--- a/srcpkgs/renderdoc/template
+++ b/srcpkgs/renderdoc/template
@@ -1,6 +1,6 @@
 # Template file for 'renderdoc'
 pkgname=renderdoc
-version=1.10
+version=1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON
@@ -14,7 +14,7 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="MIT"
 homepage="https://github.com/baldurk/renderdoc"
 distfiles="https://github.com/baldurk/${pkgname}/archive/v${version}.tar.gz"
-checksum=6200099987c7cfc52360d24845742883dcfe6cb31b71c6f85372a543a9608486
+checksum=4dece1b4cb859a76533b28fcd50e17321acfaa81c3435500a006c4a5ba15fddb
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"

From f8365209e3668c6525cf84703597f3525b65416c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 23 Feb 2021 21:29:09 +0100
Subject: [PATCH 2247/3458] New package: pipe-viewer-0.0.7

---
 srcpkgs/pipe-viewer-gtk      |  1 +
 srcpkgs/pipe-viewer/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/pipe-viewer-gtk
 create mode 100644 srcpkgs/pipe-viewer/template

diff --git a/srcpkgs/pipe-viewer-gtk b/srcpkgs/pipe-viewer-gtk
new file mode 120000
index 000000000000..672a26eb4bcb
--- /dev/null
+++ b/srcpkgs/pipe-viewer-gtk
@@ -0,0 +1 @@
+pipe-viewer
\ No newline at end of file
diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
new file mode 100644
index 000000000000..32991f6806bc
--- /dev/null
+++ b/srcpkgs/pipe-viewer/template
@@ -0,0 +1,28 @@
+# Template file for 'pipe-viewer'
+pkgname=pipe-viewer
+version=0.0.7
+revision=1
+build_style=perl-ModuleBuild
+configure_args="--gtk"
+hostmakedepends="perl-Module-Build"
+makedepends="perl"
+depends="perl-Data-Dump perl-JSON perl-LWP-Protocol-https perl-Term-ReadLine-Gnu
+ perl-Unicode-LineBreak perl-JSON-XS"
+checkdepends="perl-Test-Pod"
+short_desc="Search and play videos from YouTube without an API key"
+maintainer="Roberto Ricci <ricci@disroot.org>"
+license="Artistic-2.0"
+homepage="https://github.com/trizen/pipe-viewer"
+changelog="https://github.com/trizen/pipe-viewer/releases"
+distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz"
+checksum=5e1211ec963aa2a187bcb0983227c5667e6c580bfc9de93dcb582388cc1baf22
+
+pipe-viewer-gtk_package() {
+	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"
+	short_desc+=" - GTK interface"
+	pkg_install() {
+		vmove usr/bin/gtk-pipe-viewer
+		vmove "usr/share/perl5/vendor_perl/auto/share/dist/WWW-PipeViewer/gtk-*"
+		vmove usr/share/perl5/vendor_perl/auto/share/dist/WWW-PipeViewer/icons
+	}
+}

From b5c15f2272495057976632d4d6805028a22730b0 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Wed, 24 Feb 2021 14:08:56 +0100
Subject: [PATCH 2248/3458] runc: update to 1.0.0_15 (rc93)

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

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index b2709fa24400..55ae081fc641 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,8 +1,8 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.0.0
-revision=14
-_subver="rc92"
+revision=15
+_subver="rc93"
 _ver="$version-$_subver"
 wrksrc="$pkgname-$_ver"
 build_style=go
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/opencontainers/runc"
 distfiles="https://github.com/opencontainers/runc/releases/download/v${_ver}/runc.tar.xz"
-checksum=2f76b623b550588db98e2be72e74aae426f5d4cf736bd92afb91dd5586816daf
+checksum=70ee0fcf45b17f0da93dd4c4d174046a3584080dcc07c5468914d33d57c8202d
 
 post_build() {
 	make man

From d692c8f66a2d8eb6b677805ffe69e5be8d685384 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Sun, 21 Feb 2021 17:54:24 +0100
Subject: [PATCH 2249/3458] htop: enable sensors support

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

diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index 2693e232c4b1..96fd8b5de168 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -1,11 +1,12 @@
 # Template file for 'htop'
 pkgname=htop
 version=3.0.5
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-unicode --enable-cgroup --enable-taskstats"
+# NOTE: change --with-sensors to --enable-sensors next update
+configure_args="--enable-unicode --with-sensors"
 hostmakedepends="automake"
-makedepends="ncurses-devel"
+makedepends="ncurses-devel libsensors-devel"
 short_desc="Interactive process viewer"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-only"

From 1b18e05be9cc649ac2b696260ee56c7b7a8eb43c Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <e.zagorodniy@gmail.com>
Date: Sat, 13 Feb 2021 13:20:20 +0200
Subject: [PATCH 2250/3458] dcron: make cron.* dirs match root.crontab

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

diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template
index 378039d5670c..eb975fd13a30 100644
--- a/srcpkgs/dcron/template
+++ b/srcpkgs/dcron/template
@@ -1,7 +1,7 @@
 # Template file for 'dcron'
 pkgname=dcron
 version=4.5
-revision=33
+revision=34
 conf_files="/var/spool/cron/root"
 short_desc="Dillon's lightweight cron daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -23,9 +23,9 @@ alternatives="
 make_dirs="
  /etc/cron.d 0755 root root
  /etc/cron.hourly 0755 root root
+ /etc/cron.daily 0755 root root
  /etc/cron.weekly 0755 root root
  /etc/cron.monthly 0755 root root
- /etc/cron.yearly 0755 root root
  /var/spool/cronstamps 0755 root root"
 
 do_configure() {

From c542ead8035cd7deb763e1e9dbba20a7500cf5da Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 15 Feb 2021 15:55:47 +0200
Subject: [PATCH 2251/3458] 66: clean default $PATH, change system-dir.

---
 srcpkgs/66/INSTALL.msg                        | 10 ++--
 ...021570c3037d716a1cb5d95eb06727d1745a5.diff | 47 +++++++++++++++++++
 srcpkgs/66/template                           | 15 ++++--
 3 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff

diff --git a/srcpkgs/66/INSTALL.msg b/srcpkgs/66/INSTALL.msg
index 4eb62e16d376..48212a333c1e 100644
--- a/srcpkgs/66/INSTALL.msg
+++ b/srcpkgs/66/INSTALL.msg
@@ -1,4 +1,6 @@
-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.
+CAUTION: package revision 0.6.1.1_2 changes the default system-dir
+from /var/lib/66 to /etc/66/lib. The change requires user intervention.
+Users who upgrade from an earlier version should either copy the 
+contents of the old dir to the new one after installation, or re-create
+trees and re-enable services. That should be done before rebooting/halting
+the system.
diff --git a/srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff b/srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff
new file mode 100644
index 000000000000..001ee8097c28
--- /dev/null
+++ b/srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff
@@ -0,0 +1,47 @@
+diff --git a/src/66/66-inservice.c b/src/66/66-inservice.c
+index cfe5995e4fb861b749edca9a324f0207f26facc7..03fda5587df20e796300333c2db9d4847b1aa5b9 100644
+--- a/src/66/66-inservice.c
++++ b/src/66/66-inservice.c
+@@ -621,6 +621,7 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
+ 
+         FOREACH_SASTR(&list,pos) {
+ 
++            ssize_t upstream = 0 ;
+             sa.len = 0 ;
+             salink.len = newlen ;
+             if (!stralloc_cats(&salink,"/") ||
+@@ -630,8 +631,25 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
+             if (!file_readputsa_g(&sa,salink.s))
+                 log_dieusys(LOG_EXIT_SYS,"read environment file") ;
+ 
+-            if (NOFIELD) {
++            /** Remove warning message */
++            if (list.s[pos] == '.') {
++
++                char t[sa.len + 1] ;
++
++                upstream = str_contain(sa.s,"[ENDWARN]") ;
+ 
++                if (upstream == -1)
++                    log_die(LOG_EXIT_SYS,"invalid upstream configuration file! Do you have modified it? Tries to enable the service again.") ;
++
++                auto_strings(t,sa.s + upstream) ;
++
++                sa.len = 0 ;
++
++                if (!auto_stra(&sa,t))
++                    log_die_nomem("stralloc") ;
++            }
++
++            if (NOFIELD) {
+ 
+                 char *m = "environment variables from: " ;
+                 size_t mlen = strlen(m) ;
+@@ -640,6 +658,7 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
+                 if (!stralloc_inserts(&sa,0,msg) ||
+                 !stralloc_0(&sa))
+                     log_die_nomem("stralloc") ;
++
+             }
+ 
+             if (pos)
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 1a81ba6b8986..a89b5257868a 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,14 +1,15 @@
 # Template file for '66'
 pkgname=66
 version=0.6.1.1
-revision=1
+revision=2
 wrksrc="66-v${version}"
 build_style=configure
 configure_args="--prefix=/usr
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib
  --with-s6-log-timestamp=iso
- --with-s6-log-user=_s6log"
+ --with-s6-log-user=_s6log
+ --with-system-dir=/etc/66/lib"
 hostmakedepends="pkg-config lowdown"
 makedepends="oblibs-devel skalibs-devel execline-devel s6-devel s6-rc-devel"
 short_desc="Small tools built around s6 and s6-rc programs"
@@ -18,11 +19,19 @@ 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=4f80d94851a8c26e9666ea0f274890fc3abb6185ca1fe9fd8e2ad71e27a2ade9
+patch_args=" -Np1"
 
-conf_files="/etc/66/init /etc/66/init.conf"
+conf_files="/etc/66/init.conf"
 
 system_accounts="_s6log"
 
+pre_configure() {
+
+	# Clean the default $PATH for service scripts
+	vsed -i "s@PATH=/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin@PATH=/usr/bin:/usr/sbin@" \
+	 "${wrksrc}/skel/init.conf"
+}
+
 post_install() {
 	vdoc README.md
 	vlicense LICENSE

From 046a5a6eb7f68f9d2fcffac454971e873ac455e7 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 13 Feb 2021 18:44:35 -0800
Subject: [PATCH 2252/3458] busybox: update to 1.32.1

---
 srcpkgs/busybox/files/dotconfig               | 36 +++++---
 srcpkgs/busybox/files/dotconfig.d/huge.patch  | 92 +++++++++----------
 .../busybox/files/dotconfig.d/sysklogd.patch  | 14 ++-
 .../busybox/files/dotconfig.d/udhcpc.patch    | 26 +++---
 srcpkgs/busybox/patches/missing-stime.patch   | 32 -------
 .../testsuite-fix-cpio-and-patch-tests.patch  | 79 ----------------
 srcpkgs/busybox/patches/time64.patch          | 38 --------
 srcpkgs/busybox/template                      |  8 +-
 8 files changed, 92 insertions(+), 233 deletions(-)
 delete mode 100644 srcpkgs/busybox/patches/missing-stime.patch
 delete mode 100644 srcpkgs/busybox/patches/testsuite-fix-cpio-and-patch-tests.patch
 delete mode 100644 srcpkgs/busybox/patches/time64.patch

diff --git a/srcpkgs/busybox/files/dotconfig b/srcpkgs/busybox/files/dotconfig
index b3c2a607ecc5..b661bbda790c 100644
--- a/srcpkgs/busybox/files/dotconfig
+++ b/srcpkgs/busybox/files/dotconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.29.1
-# Sun Jul 15 12:26:38 2018
+# Busybox version: 1.32.1
+# Sat Feb 13 17:25:59 2021
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -24,8 +24,8 @@ CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_PIDFILE is not set
 CONFIG_PID_FILE_PATH=""
 CONFIG_BUSYBOX=y
-# CONFIG_FEATURE_INSTALLER is not set
 # CONFIG_FEATURE_SHOW_SCRIPT is not set
+# CONFIG_FEATURE_INSTALLER is not set
 # CONFIG_INSTALL_NO_USR is not set
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
@@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install"
 # CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
@@ -237,7 +238,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FACTOR=y
 CONFIG_FALSE=y
 CONFIG_FOLD=y
-CONFIG_FSYNC=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 # CONFIG_HOSTID is not set
@@ -304,6 +304,7 @@ CONFIG_STTY=y
 CONFIG_SUM=y
 CONFIG_SYNC=y
 CONFIG_FEATURE_SYNC_FANCY=y
+CONFIG_FSYNC=y
 CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -458,6 +459,7 @@ CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_QUIT=y
 CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -654,7 +656,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=n
+# CONFIG_FEATURE_MOUNT_NFS is not set
 CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
@@ -688,6 +690,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y
 CONFIG_SWITCH_ROOT=y
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
 CONFIG_UEVENT=y
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -738,6 +741,11 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 # CONFIG_BC is not set
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_BIG is not set
+CONFIG_FEATURE_DC_LIBM=y
+# CONFIG_FEATURE_BC_INTERACTIVE is not set
+# CONFIG_FEATURE_BC_LONG_OPTIONS is not set
 # CONFIG_BEEP is not set
 CONFIG_FEATURE_BEEP_FREQ=0
 CONFIG_FEATURE_BEEP_LENGTH_MS=0
@@ -756,9 +764,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
 # 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
@@ -803,6 +808,7 @@ CONFIG_LSSCSI=y
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 # CONFIG_MAN is not set
 # CONFIG_MICROCOM is not set
+# CONFIG_MIM is not set
 # CONFIG_MT is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
@@ -944,6 +950,7 @@ CONFIG_FEATURE_TELNET_WIDTH=y
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_TFTP is not set
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
 # CONFIG_TFTPD is not set
 # CONFIG_FEATURE_TFTP_GET is not set
 # CONFIG_FEATURE_TFTP_PUT is not set
@@ -981,13 +988,9 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
-
-#
-# Common options for DHCP applets
-#
 # CONFIG_FEATURE_UDHCP_PORT is not set
-# CONFIG_UDHCP_DEBUG is not set
-# CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS is not set
+CONFIG_UDHCP_DEBUG=0
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
 # CONFIG_FEATURE_UDHCP_8021Q is not set
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
@@ -1092,6 +1095,7 @@ CONFIG_SH_IS_ASH=y
 # CONFIG_BASH_IS_ASH is not set
 # CONFIG_BASH_IS_HUSH is not set
 CONFIG_BASH_IS_NONE=y
+CONFIG_SHELL_ASH=y
 CONFIG_ASH=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_INTERNAL_GLOB=y
@@ -1112,6 +1116,7 @@ CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
 CONFIG_CTTYHACK=y
 # CONFIG_HUSH is not set
+# CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_BRACE_EXPANSION is not set
 # CONFIG_HUSH_LINENO_VAR is not set
@@ -1157,9 +1162,9 @@ CONFIG_FEATURE_SH_MATH_BASE=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set
 CONFIG_FEATURE_SH_READ_FRAC=y
 CONFIG_FEATURE_SH_HISTFILESIZE=y
+# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set
 
 #
 # System Logging Utilities
@@ -1174,6 +1179,7 @@ CONFIG_LOGGER=y
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
 # CONFIG_FEATURE_SYSLOGD_CFG is not set
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/srcpkgs/busybox/files/dotconfig.d/huge.patch b/srcpkgs/busybox/files/dotconfig.d/huge.patch
index 1ef1465cffd2..b31b7974ecd6 100644
--- a/srcpkgs/busybox/files/dotconfig.d/huge.patch
+++ b/srcpkgs/busybox/files/dotconfig.d/huge.patch
@@ -1,4 +1,4 @@
-@@ -93,7 +93,7 @@
+@@ -94,7 +94,7 @@
  CONFIG_PASSWORD_MINLEN=6
  CONFIG_MD5_SMALL=1
  CONFIG_SHA3_SMALL=1
@@ -7,7 +7,7 @@
  # CONFIG_FEATURE_ETC_NETWORKS is not set
  # CONFIG_FEATURE_ETC_SERVICES is not set
  CONFIG_FEATURE_EDITING=y
-@@ -124,7 +124,7 @@
+@@ -125,7 +125,7 @@
  CONFIG_FEATURE_USE_SENDFILE=y
  CONFIG_FEATURE_COPYBUF_KB=4
  CONFIG_FEATURE_SKIP_ROOTFS=y
@@ -16,7 +16,7 @@
  # CONFIG_IOCTL_HEX2STR_ERROR is not set
  # CONFIG_FEATURE_HWIB is not set
  
-@@ -158,9 +158,9 @@
+@@ -159,9 +159,9 @@
  CONFIG_BZIP2=y
  CONFIG_BZIP2_SMALL=8
  CONFIG_FEATURE_BZIP2_DECOMPRESS=y
@@ -29,7 +29,7 @@
  # CONFIG_DPKG is not set
  # CONFIG_DPKG_DEB is not set
  CONFIG_GZIP=y
-@@ -191,7 +191,7 @@
+@@ -192,7 +192,7 @@
  CONFIG_FEATURE_UNZIP_BZIP2=y
  CONFIG_FEATURE_UNZIP_LZMA=y
  CONFIG_FEATURE_UNZIP_XZ=y
@@ -38,7 +38,7 @@
  
  #
  # Coreutils
-@@ -205,7 +205,7 @@
+@@ -206,7 +206,7 @@
  CONFIG_CHOWN=y
  CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
  CONFIG_CHROOT=y
@@ -47,7 +47,7 @@
  CONFIG_COMM=y
  CONFIG_CP=y
  CONFIG_FEATURE_CP_LONG_OPTIONS=y
-@@ -213,11 +213,11 @@
+@@ -214,11 +214,11 @@
  CONFIG_CUT=y
  CONFIG_DATE=y
  CONFIG_FEATURE_DATE_ISOFMT=y
@@ -61,7 +61,7 @@
  CONFIG_FEATURE_DD_IBS_OBS=y
  CONFIG_FEATURE_DD_STATUS=y
  CONFIG_DF=y
-@@ -267,7 +266,7 @@
+@@ -267,7 +267,7 @@
  #
  # Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
  #
@@ -70,7 +70,7 @@
  CONFIG_MKDIR=y
  CONFIG_MKFIFO=y
  CONFIG_MKNOD=y
-@@ -313,7 +313,7 @@
+@@ -314,7 +314,7 @@
  CONFIG_TEST1=y
  CONFIG_TEST2=y
  CONFIG_FEATURE_TEST_64=y
@@ -79,7 +79,7 @@
  CONFIG_TOUCH=y
  CONFIG_FEATURE_TOUCH_NODEREF=y
  CONFIG_FEATURE_TOUCH_SUSV3=y
-@@ -328,7 +328,7 @@
+@@ -329,7 +329,7 @@
  CONFIG_BB_ARCH=y
  CONFIG_UNIQ=y
  CONFIG_UNLINK=y
@@ -88,7 +88,7 @@
  CONFIG_UUDECODE=y
  CONFIG_BASE64=y
  CONFIG_UUENCODE=y
-@@ -371,7 +371,7 @@
+@@ -372,7 +372,7 @@
  # CONFIG_FEATURE_LOADFONT_PSF2 is not set
  # CONFIG_FEATURE_LOADFONT_RAW is not set
  CONFIG_LOADKMAP=y
@@ -97,7 +97,7 @@
  CONFIG_RESET=y
  # CONFIG_RESIZE is not set
  # CONFIG_FEATURE_RESIZE_PRINT is not set
-@@ -543,7 +543,7 @@
+@@ -545,7 +545,7 @@
  #
  CONFIG_CHATTR=y
  # CONFIG_FSCK is not set
@@ -106,7 +106,7 @@
  # CONFIG_TUNE2FS is not set
  
  #
-@@ -586,7 +586,7 @@
+@@ -588,7 +588,7 @@
  CONFIG_BLKID=y
  CONFIG_FEATURE_BLKID_TYPE=y
  # CONFIG_BLOCKDEV is not set
@@ -115,7 +115,7 @@
  # CONFIG_CHRT is not set
  CONFIG_DMESG=y
  CONFIG_FEATURE_DMESG_PRETTY=y
-@@ -639,13 +639,13 @@
+@@ -641,13 +641,13 @@
  CONFIG_FEATURE_MDEV_DAEMON=y
  # CONFIG_MESG is not set
  # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
@@ -133,13 +133,7 @@
  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
+@@ -661,19 +661,19 @@
  CONFIG_FEATURE_MOUNT_FLAGS=y
  CONFIG_FEATURE_MOUNT_FSTAB=y
  CONFIG_FEATURE_MOUNT_OTHERTAB=y
@@ -155,33 +149,40 @@
  # CONFIG_READPROFILE is not set
  CONFIG_RENICE=y
 -# CONFIG_REV is not set
-+CONFIG_REV=y
- # CONFIG_RTCWAKE is not set
+-# CONFIG_RTCWAKE is not set
 -# CONFIG_SCRIPT is not set
 -# CONFIG_SCRIPTREPLAY is not set
++CONFIG_REV=y
++CONFIG_RTCWAKE=y
 +CONFIG_SCRIPT=y
 +CONFIG_SCRIPTREPLAY=y
  CONFIG_SETARCH=y
  CONFIG_LINUX32=y
  CONFIG_LINUX64=y
-@@ -686,8 +686,8 @@
+@@ -688,9 +688,9 @@
  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_FEATURE_TASKSET_CPULIST is not set
 +CONFIG_TASKSET=y
 +CONFIG_FEATURE_TASKSET_FANCY=y
++CONFIG_FEATURE_TASKSET_CPULIST=y
  CONFIG_UEVENT=y
  CONFIG_UMOUNT=y
  CONFIG_FEATURE_UMOUNT_ALL=y
-@@ -737,7 +737,12 @@
+@@ -740,12 +740,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_DC=y
+-# CONFIG_FEATURE_DC_BIG is not set
+-CONFIG_FEATURE_DC_LIBM=y
+-# CONFIG_FEATURE_BC_INTERACTIVE is not set
+-# CONFIG_FEATURE_BC_LONG_OPTIONS is not set
 +CONFIG_FEATURE_DC_BIG=y
 +# CONFIG_FEATURE_DC_LIBM is not set
 +CONFIG_FEATURE_BC_INTERACTIVE=y
@@ -189,26 +190,16 @@
  # 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 @@
+@@ -807,7 +807,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_MIM is not set
  # CONFIG_MT is not set
  # CONFIG_NANDWRITE is not set
- # CONFIG_NANDDUMP is not set
-@@ -813,7 +815,7 @@
+@@ -819,7 +819,7 @@
  # CONFIG_RUNLEVEL is not set
  # CONFIG_RX is not set
  CONFIG_SETFATTR=y
@@ -217,7 +208,7 @@
  CONFIG_STRINGS=y
  CONFIG_TIME=y
  CONFIG_TS=y
-@@ -836,20 +838,20 @@
+@@ -842,20 +842,20 @@
  CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
  # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
  # CONFIG_FEATURE_TLS_SHA1 is not set
@@ -248,7 +239,7 @@
  CONFIG_HOSTNAME=y
  CONFIG_DNSDOMAINNAME=y
  CONFIG_HTTPD=y
-@@ -880,12 +882,12 @@
+@@ -886,12 +886,12 @@
  # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
  # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
  # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
@@ -267,7 +258,7 @@
  # CONFIG_FEATURE_INETD_RPC is not set
  CONFIG_IP=y
  CONFIG_IPADDR=y
-@@ -906,11 +908,11 @@
+@@ -912,11 +912,11 @@
  # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
  # CONFIG_FEATURE_IPCALC_FANCY is not set
  # CONFIG_FAKEIDENTD is not set
@@ -283,7 +274,7 @@
  CONFIG_NC_SERVER=y
  CONFIG_NC_EXTRA=y
  # CONFIG_NC_110_COMPAT is not set
-@@ -928,13 +930,13 @@
+@@ -934,13 +934,13 @@
  CONFIG_PING6=y
  CONFIG_FEATURE_FANCY_PING=y
  # CONFIG_PSCAN is not set
@@ -300,12 +291,13 @@
  CONFIG_TELNET=y
  CONFIG_FEATURE_TELNET_TTYPE=y
  CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-@@ -942,20 +944,21 @@
+@@ -948,21 +948,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_FEATURE_TFTP_HPA_COMPAT is not set
 -# CONFIG_TFTPD is not set
 -# CONFIG_FEATURE_TFTP_GET is not set
 -# CONFIG_FEATURE_TFTP_PUT is not set
@@ -334,7 +326,7 @@
  # CONFIG_VCONFIG is not set
  CONFIG_WGET=y
  CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-@@ -966,21 +969,21 @@
+@@ -973,21 +973,21 @@
  CONFIG_FEATURE_WGET_OPENSSL=y
  CONFIG_WHOIS=y
  # CONFIG_ZCIP is not set
@@ -350,7 +342,7 @@
  CONFIG_UDHCPC=y
  CONFIG_FEATURE_UDHCPC_ARPING=y
  CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
- CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 -# CONFIG_UDHCPC6 is not set
 -# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 -# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -364,7 +356,7 @@
  
  #
  # Common options for DHCP applets
-@@ -1002,13 +1005,13 @@
+@@ -1009,13 +1009,13 @@
  #
  # Mail Utilities
  #
@@ -383,7 +375,7 @@
  
  #
  # Process Utilities
-@@ -1021,7 +1024,7 @@
+@@ -1028,7 +1028,7 @@
  CONFIG_KILLALL5=y
  CONFIG_LSOF=y
  CONFIG_MPSTAT=y
@@ -392,7 +384,7 @@
  CONFIG_PGREP=y
  CONFIG_PKILL=y
  CONFIG_PIDOF=y
-@@ -1037,7 +1040,7 @@
+@@ -1044,7 +1044,7 @@
  CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y
  CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
  CONFIG_PSTREE=y
@@ -401,7 +393,7 @@
  # CONFIG_SMEMCAP is not set
  CONFIG_BB_SYSCTL=y
  CONFIG_TOP=y
-@@ -1050,7 +1053,7 @@
+@@ -1057,7 +1057,7 @@
  CONFIG_FEATURE_TOPMEM=y
  CONFIG_UPTIME=y
  # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
@@ -410,7 +402,7 @@
  CONFIG_FEATURE_SHOW_THREADS=y
  
  #
-@@ -1068,7 +1071,7 @@
+@@ -1075,7 +1075,7 @@
  CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
  # CONFIG_SVC is not set
  CONFIG_SVOK=y
diff --git a/srcpkgs/busybox/files/dotconfig.d/sysklogd.patch b/srcpkgs/busybox/files/dotconfig.d/sysklogd.patch
index f051b8f8355f..a6a7d549584b 100644
--- a/srcpkgs/busybox/files/dotconfig.d/sysklogd.patch
+++ b/srcpkgs/busybox/files/dotconfig.d/sysklogd.patch
@@ -1,23 +1,27 @@
-@@ -1147,17 +1147,17 @@
+@@ -1173,18 +1173,18 @@
  #
  # System Logging Utilities
  #
 -# CONFIG_KLOGD is not set
+-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
 +CONFIG_KLOGD=y
- # CONFIG_FEATURE_KLOGD_KLOGCTL is not set
++CONFIG_FEATURE_KLOGD_KLOGCTL=y
  CONFIG_LOGGER=y
 -# CONFIG_LOGREAD is not set
-+CONFIG_LOGREAD=y
- # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
 -# CONFIG_SYSLOGD is not set
 -# CONFIG_FEATURE_ROTATE_LOGFILE is not set
 -# CONFIG_FEATURE_REMOTE_LOG is not set
 -# CONFIG_FEATURE_SYSLOGD_DUP is not set
+-# CONFIG_FEATURE_SYSLOGD_CFG is not set
++CONFIG_LOGREAD=y
++CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
 +CONFIG_SYSLOGD=y
 +CONFIG_FEATURE_ROTATE_LOGFILE=y
 +CONFIG_FEATURE_REMOTE_LOG=y
 +CONFIG_FEATURE_SYSLOGD_DUP=y
- # CONFIG_FEATURE_SYSLOGD_CFG is not set
++CONFIG_FEATURE_SYSLOGD_CFG=y
+ # CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
 -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 -# CONFIG_FEATURE_IPC_SYSLOG is not set
 -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/srcpkgs/busybox/files/dotconfig.d/udhcpc.patch b/srcpkgs/busybox/files/dotconfig.d/udhcpc.patch
index 059ea72a3c12..14ae8cccbbb8 100644
--- a/srcpkgs/busybox/files/dotconfig.d/udhcpc.patch
+++ b/srcpkgs/busybox/files/dotconfig.d/udhcpc.patch
@@ -1,30 +1,34 @@
-@@ -957,9 +957,9 @@
+@@ -979,20 +979,24 @@
  CONFIG_DHCPD_LEASES_FILE=""
  # CONFIG_DUMPLEASES is not set
  # CONFIG_DHCPRELAY is not set
 -# CONFIG_UDHCPC is not set
 -# CONFIG_FEATURE_UDHCPC_ARPING is not set
 -# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
+-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 +CONFIG_UDHCPC=y
 +CONFIG_FEATURE_UDHCPC_ARPING=y
 +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
- CONFIG_UDHCPC_DEFAULT_SCRIPT=""
++CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
  # CONFIG_UDHCPC6 is not set
  # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
-@@ -970,11 +970,11 @@
- #
- # Common options for DHCP applets
- #
+ # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
+ # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
+ # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
 -# CONFIG_FEATURE_UDHCP_PORT is not set
--# CONFIG_UDHCP_DEBUG is not set
--# CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS is not set
+-CONFIG_UDHCP_DEBUG=0
+-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set
 -# CONFIG_FEATURE_UDHCP_8021Q is not set
++
++#
++# Common options for DHCP applets
++#
 +CONFIG_FEATURE_UDHCP_PORT=y
-+CONFIG_UDHCP_DEBUG=0
-+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
++CONFIG_UDHCP_DEBUG=2
++CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 +CONFIG_FEATURE_UDHCP_RFC3397=y
 +CONFIG_FEATURE_UDHCP_8021Q=y
  CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
- 
+
  #
diff --git a/srcpkgs/busybox/patches/missing-stime.patch b/srcpkgs/busybox/patches/missing-stime.patch
deleted file mode 100644
index 7cef477c7568..000000000000
--- a/srcpkgs/busybox/patches/missing-stime.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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/patches/testsuite-fix-cpio-and-patch-tests.patch b/srcpkgs/busybox/patches/testsuite-fix-cpio-and-patch-tests.patch
deleted file mode 100644
index 8dd3034be2e5..000000000000
--- a/srcpkgs/busybox/patches/testsuite-fix-cpio-and-patch-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 9a522cf388e321b47f9462bbbd7726323095f8db Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jul 2017 13:41:32 +0200
-Subject: [PATCH 11/11] testsuite: fix cpio tests
-
-The cpio tests don't search for the right output line correctly,
-using a hardcoded tail offset. Instead, grep for the file entry
-just added.
-
-The reverse-hunk patch tests seem to get the output order wrong,
-and the tests pass when this is corrected.
----
- testsuite/cpio.tests  | 6 +++---
- testsuite/patch.tests | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
---- testsuite/cpio.tests
-+++ testsuite/cpio.tests
-@@ -129,7 +129,7 @@ SKIP=
- 
- optional FEATURE_CPIO_O
- testing "cpio uses by default uid/gid" \
--"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- $user/$group
- 0
-@@ -138,7 +138,7 @@ SKIP=
- 
- optional FEATURE_CPIO_O
- testing "cpio -R with create" \
--"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- 1234/5678
- 0
-@@ -147,7 +147,7 @@ SKIP=
- 
- optional FEATURE_CPIO_O
- testing "cpio -R with extract" \
--"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- 8765/4321
- 0
---- testsuite/patch.tests
-+++ testsuite/patch.tests
-@@ -75,12 +75,12 @@ zxc
- testing "patch detects already applied hunk" \
- 	'patch 2>&1; echo $?; cat input' \
- "\
-+patching file input
- Possibly reversed hunk 1 at 4
- Hunk 1 FAILED 1/1.
-  abc
- +def
-  123
--patching file input
- 1
- abc
- def
-@@ -103,12 +103,12 @@ def
- testing "patch detects already applied hunk at the EOF" \
- 	'patch 2>&1; echo $?; cat input' \
- "\
-+patching file input
- Possibly reversed hunk 1 at 4
- Hunk 1 FAILED 1/1.
-  abc
-  123
- +456
--patching file input
- 1
- abc
- 123
--- 
-2.13.2
-
-
diff --git a/srcpkgs/busybox/patches/time64.patch b/srcpkgs/busybox/patches/time64.patch
deleted file mode 100644
index fc6531e85b0e..000000000000
--- a/srcpkgs/busybox/patches/time64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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 */
--		syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
-+		clock_gettime(CLOCK_REALTIME, &ts);
- #else
- 		time(&ts.tv_sec);
- #endif
-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 (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)
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 57728f1fe1fc..de8a606f02df 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,7 +1,7 @@
 # Template file for 'busybox'
 pkgname=busybox
-version=1.31.1
-revision=6
+version=1.32.1
+revision=1
 hostmakedepends="perl"
 checkdepends="tar which zip"
 short_desc="Swiss Army Knife of Embedded Linux"
@@ -9,7 +9,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
 homepage="http://www.busybox.net"
 distfiles="${homepage}/downloads/busybox-${version}.tar.bz2"
-checksum=d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998
+checksum=9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee
 
 _alternatives_core="
  ash:ash:/usr/bin/busybox
@@ -33,6 +33,7 @@ _patch_config() {
 	while [ "$1" ]; do
 		local p="$1"
 		shift
+		echo "Applying $p..."
 		patch "${t}/.config" <"${FILESDIR}/dotconfig.d/${p}.patch"
 	done
 }
@@ -63,6 +64,7 @@ do_configure() {
 	_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" oldconfig
 		make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" prepare "${makejobs}"
 	done
 

From 51c7f2b164936e759d0de2a6500fbafc42fcb876 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 11 Feb 2021 11:48:34 -0500
Subject: [PATCH 2253/3458] python3-numpy-stl: update to 2.15.1.

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

diff --git a/srcpkgs/python3-numpy-stl/template b/srcpkgs/python3-numpy-stl/template
index 32a16c54fa02..83756860cdae 100644
--- a/srcpkgs/python3-numpy-stl/template
+++ b/srcpkgs/python3-numpy-stl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy-stl'
 pkgname=python3-numpy-stl
-version=2.13.0
+version=2.15.1
 revision=1
 wrksrc="numpy-stl-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/WoLpH/numpy-stl/"
 distfiles="https://github.com/WoLpH/numpy-stl/archive/v${version}.tar.gz"
-checksum=15a4bc07e7c707a62ebadc477de57511cfeb5bc51556f75d5b4fd91a687e514e
+checksum=ab64a7a06c28bd47a1db1768cb2b1b486b383d5e07daad6e3ee555ab22485419
 
 conflicts="python-numpy-stl>=0"
 

From 583d4c425a9a769f618a3af67c9968e38a336754 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 24 Feb 2021 10:45:53 -0600
Subject: [PATCH 2254/3458] ssh-audit: update to 2.4.0.

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

diff --git a/srcpkgs/ssh-audit/template b/srcpkgs/ssh-audit/template
index bfb8ec4466b6..eef4fcb68ef8 100644
--- a/srcpkgs/ssh-audit/template
+++ b/srcpkgs/ssh-audit/template
@@ -1,6 +1,6 @@
 # Template file for 'ssh-audit'
 pkgname=ssh-audit
-version=2.3.1
+version=2.4.0
 revision=1
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/jtesta/ssh-audit"
 distfiles="https://github.com/jtesta/ssh-audit/archive/v${version}.tar.gz"
-checksum=3d81c2620f53e7e0fe359e94524f28b58d53aa4e77292e2c9c555e174993d314
+checksum=87c634171d3e0c69297fceeb98dead9a816d5d56c8dcd138f8411fdf58085b6f
 python_version=3
 
 do_check() {

From 10eb379c6363d085afde94870dfc98a4228d6d13 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 24 Feb 2021 10:56:34 -0600
Subject: [PATCH 2255/3458] python3-yara: update to 4.0.5.

---
 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 5ed2b7c791f2..8235913d2774 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.4
+version=4.0.5
 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=5fa5eb71311e306aa389931d2b7dac6cc71979a4c5c3d62e368717630aafa063
+checksum=2c99f3858eddfd0efa179b0713df3df95912eb5323c44a1136dd3e17dbc954da

From 38095a7349b67e599eed538c4865ff26996c5bb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 24 Feb 2021 18:18:09 +0100
Subject: [PATCH 2256/3458] common/shlibs: remove libIce-3.5.0 entries

they were re-added by accident
---
 common/shlibs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8ef87dfefa9c..a3c5b5181f91 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -978,19 +978,6 @@ libIceXML.so.37 libIce-3.7.5_1
 libIceDiscovery.so.37 libIce-3.7.5_1
 libIceLocatorDiscovery.so.37 libIce-3.7.5_1
 libkdecorations2private.so.8 kdecoration-5.20.90_1
-libGlacier2.so.35 libIce-3.5.0_1
-libIce.so.35 libIce-3.5.0_1
-libIceSSL.so.35 libIce-3.5.0_1
-libIceUtil.so.35 libIce-3.5.0_1
-libIceStormService.so.35 libIce-3.5.0_1
-libIceStorm.so.35 libIce-3.5.0_1
-libFreeze.so.35 libIce-3.5.0_1
-libSlice.so.35 libIce-3.5.0_1
-libIceBox.so.35 libIce-3.5.0_1
-libIceGrid.so.35 libIce-3.5.0_1
-libIcePatch2.so.35 libIce-3.5.0_1
-libIceDB.so.35 libIce-3.5.0_1
-libIceXML.so.35 libIce-3.5.0_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1

From ed96f01a34112b42fdea0412cf33bbbc18032314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 24 Feb 2021 22:46:18 +0100
Subject: [PATCH 2257/3458] diffoscope: update to 167.

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

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 037039b74435..c07d20d86612 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,8 +1,10 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=163
+version=167
 revision=1
 build_style=python3-module
+# file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
+make_check_args="-k not((test_wasm)and((test_identification)or(test_no_differences)))"
 hostmakedepends="python3-setuptools"
 depends="python3-magic python3-libarchive-c python3-setuptools
  python3-argcomplete binwalk python3-defusedxml python3-distro
@@ -15,4 +17,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=1afeea6e383bdd2626a9e9b827ff487723c0de581d9f9f4d4f5fc9b65728662a
+checksum=d95cef5b3eef49fa1c811c1ac103f7f7cca4a0ebabc674e4283b51f28309d242

From f0ac35f6edadecebfa8778ee5e90224e87adf2bd 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, 25 Feb 2021 07:45:16 +0700
Subject: [PATCH 2258/3458] jasper: update to 2.0.25.

CVE-2021-26927
---
 srcpkgs/jasper/patches/CVE-2018-9055.patch | 61 ----------------------
 srcpkgs/jasper/template                    |  5 +-
 2 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/jasper/patches/CVE-2018-9055.patch

diff --git a/srcpkgs/jasper/patches/CVE-2018-9055.patch b/srcpkgs/jasper/patches/CVE-2018-9055.patch
deleted file mode 100644
index 34a06d982790..000000000000
--- a/srcpkgs/jasper/patches/CVE-2018-9055.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From a7cfb760db46d2405dd180bc7c302f6311e605a3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
-Date: Thu, 29 Mar 2018 16:33:15 +0200
-Subject: [PATCH] CVE-2018-9055
-
----
- src/libjasper/jpc/jpc_math.c | 4 ++--
- src/libjasper/jpc/jpc_math.h | 5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/libjasper/jpc/jpc_math.c b/src/libjasper/jpc/jpc_math.c
-index 2b70844..1b18880 100644
---- a/src/libjasper/jpc/jpc_math.c
-+++ b/src/libjasper/jpc/jpc_math.c
-@@ -86,7 +86,7 @@
- 
- /* Calculate the integer quantity floor(log2(x)), where x is a positive
-   integer. */
--int jpc_floorlog2(int x)
-+int jpc_floorlog2(int_fast32_t x)
- {
- 	int y;
- 
-@@ -105,7 +105,7 @@ int jpc_floorlog2(int x)
-   integer. */
- /* This function is the basically the same as ceillog2(x), except that the
-   allowable range for x is slightly different. */
--int jpc_firstone(int x)
-+int jpc_firstone(int_fast32_t x)
- {
- 	int n;
- 
-diff --git a/src/libjasper/jpc/jpc_math.h b/src/libjasper/jpc/jpc_math.h
-index e8e0978..0b75f4f 100644
---- a/src/libjasper/jpc/jpc_math.h
-+++ b/src/libjasper/jpc/jpc_math.h
-@@ -67,6 +67,7 @@
- \******************************************************************************/
- 
- #include	<assert.h>
-+#include	<stdint.h>
- 
- /******************************************************************************\
- * Macros
-@@ -90,10 +91,10 @@
- 
- /* Calculate the bit position of the first leading one in a nonnegative
-   integer. */
--int jpc_firstone(int x);
-+int jpc_firstone(int_fast32_t x);
- 
- /* Calculate the integer quantity floor(log2(x)), where x is a positive
-   integer. */
--int jpc_floorlog2(int x);
-+int jpc_floorlog2(int_fast32_t x);
- 
- #endif
--- 
-2.16.2
-
-
diff --git a/srcpkgs/jasper/template b/srcpkgs/jasper/template
index f04ea1858190..ae02985e45d0 100644
--- a/srcpkgs/jasper/template
+++ b/srcpkgs/jasper/template
@@ -1,16 +1,17 @@
 # Template file for 'jasper'
 pkgname=jasper
-version=2.0.16
+version=2.0.25
 revision=1
 wrksrc="${pkgname}-version-${version}"
 build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None"
 makedepends="libjpeg-turbo-devel"
 short_desc="Software-based reference implementation of the JPEG-2000 codec"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="JasPer-2.0"
 homepage="http://www.ece.uvic.ca/~mdadams/jasper"
 distfiles="https://github.com/mdadams/jasper/archive/version-${version}.tar.gz"
-checksum=f1d8b90f231184d99968f361884e2054a1714fdbbd9944ba1ae4ebdcc9bbfdb1
+checksum=f5bc48e2884bcabd2aca1737baff4ca962ec665b6eb673966ced1f7adea07edb
 patch_args="-Np1"
 
 post_install() {

From 49605106f8e0fd3cfe4025a5a952ae0217d40740 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, 25 Feb 2021 07:56:11 +0700
Subject: [PATCH 2259/3458] libebml: update to 1.4.2.

CVE-2021-3405
---
 srcpkgs/libebml/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libebml/template b/srcpkgs/libebml/template
index 6fa20f7667c6..d0bd2da24694 100644
--- a/srcpkgs/libebml/template
+++ b/srcpkgs/libebml/template
@@ -1,15 +1,15 @@
 # Template file for 'libebml'
 pkgname=libebml
-version=1.4.1
+version=1.4.2
 revision=1
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON"
+configure_args="-DCMAKE_BUILD_TYPE=None -DBUILD_SHARED_LIBS=ON"
 short_desc="Extensible Binary Meta Language library"
 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=6e94c669405061aa0d25a523b9f1bea8ac73536e37721a110b3372c7f8717032
+checksum=41c7237ce05828fb220f62086018b080af4db4bb142f31bec0022c925889b9f2
 
 libebml-devel_package() {
 	depends="libebml>=${version}_${revision}"

From 0408e2c1e487c14587ef569257c07cafcb174d5c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 21:09:33 -0500
Subject: [PATCH 2260/3458] python3: update to 3.9.2.

---
 ...cbe694743cee120457aa6626712f7799a932.patch | 186 ------------------
 srcpkgs/python3/template                      |   8 +-
 2 files changed, 4 insertions(+), 190 deletions(-)
 delete mode 100644 srcpkgs/python3/patches/c347cbe694743cee120457aa6626712f7799a932.patch

diff --git a/srcpkgs/python3/patches/c347cbe694743cee120457aa6626712f7799a932.patch b/srcpkgs/python3/patches/c347cbe694743cee120457aa6626712f7799a932.patch
deleted file mode 100644
index 59fd8ad5eb2a..000000000000
--- a/srcpkgs/python3/patches/c347cbe694743cee120457aa6626712f7799a932.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From c347cbe694743cee120457aa6626712f7799a932 Mon Sep 17 00:00:00 2001
-From: "Miss Islington (bot)"
- <31488909+miss-islington@users.noreply.github.com>
-Date: Mon, 18 Jan 2021 13:29:31 -0800
-Subject: [PATCH] closes bpo-42938: Replace snprintf with Python unicode
- formatting in ctypes param reprs. (GH-24247)
-
-(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7)
-
-Co-authored-by: Benjamin Peterson <benjamin@python.org>
-
-Co-authored-by: Benjamin Peterson <benjamin@python.org>
----
- Lib/ctypes/test/test_parameters.py            | 43 ++++++++++++++++
- .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst  |  2 +
- Modules/_ctypes/callproc.c                    | 51 +++++++------------
- 3 files changed, 64 insertions(+), 32 deletions(-)
- create mode 100644 Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
-
-diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py
-index e4c25fd880cef..531894fdec838 100644
---- Lib/ctypes/test/test_parameters.py
-+++ Lib/ctypes/test/test_parameters.py
-@@ -201,6 +201,49 @@ def __dict__(self):
-         with self.assertRaises(ZeroDivisionError):
-             WorseStruct().__setstate__({}, b'foo')
- 
-+    def test_parameter_repr(self):
-+        from ctypes import (
-+            c_bool,
-+            c_char,
-+            c_wchar,
-+            c_byte,
-+            c_ubyte,
-+            c_short,
-+            c_ushort,
-+            c_int,
-+            c_uint,
-+            c_long,
-+            c_ulong,
-+            c_longlong,
-+            c_ulonglong,
-+            c_float,
-+            c_double,
-+            c_longdouble,
-+            c_char_p,
-+            c_wchar_p,
-+            c_void_p,
-+        )
-+        self.assertRegex(repr(c_bool.from_param(True)), r"^<cparam '\?' at 0x[A-Fa-f0-9]+>$")
-+        self.assertEqual(repr(c_char.from_param(97)), "<cparam 'c' ('a')>")
-+        self.assertRegex(repr(c_wchar.from_param('a')), r"^<cparam 'u' at 0x[A-Fa-f0-9]+>$")
-+        self.assertEqual(repr(c_byte.from_param(98)), "<cparam 'b' (98)>")
-+        self.assertEqual(repr(c_ubyte.from_param(98)), "<cparam 'B' (98)>")
-+        self.assertEqual(repr(c_short.from_param(511)), "<cparam 'h' (511)>")
-+        self.assertEqual(repr(c_ushort.from_param(511)), "<cparam 'H' (511)>")
-+        self.assertRegex(repr(c_int.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
-+        self.assertRegex(repr(c_uint.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
-+        self.assertRegex(repr(c_long.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
-+        self.assertRegex(repr(c_ulong.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
-+        self.assertRegex(repr(c_longlong.from_param(20000)), r"^<cparam '[liq]' \(20000\)>$")
-+        self.assertRegex(repr(c_ulonglong.from_param(20000)), r"^<cparam '[LIQ]' \(20000\)>$")
-+        self.assertEqual(repr(c_float.from_param(1.5)), "<cparam 'f' (1.5)>")
-+        self.assertEqual(repr(c_double.from_param(1.5)), "<cparam 'd' (1.5)>")
-+        self.assertEqual(repr(c_double.from_param(1e300)), "<cparam 'd' (1e+300)>")
-+        self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^<cparam ('d' \(1.5\)|'g' at 0x[A-Fa-f0-9]+)>$")
-+        self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^<cparam 'z' \(0x[A-Fa-f0-9]+\)>$")
-+        self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^<cparam 'Z' \(0x[A-Fa-f0-9]+\)>$")
-+        self.assertRegex(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' \(0x0*12\)>$")
-+
- ################################################################
- 
- if __name__ == '__main__':
-diff --git a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
-new file mode 100644
-index 0000000000000..7df65a156feab
---- /dev/null
-+++ b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst
-@@ -0,0 +1,2 @@
-+Avoid static buffers when computing the repr of :class:`ctypes.c_double` and
-+:class:`ctypes.c_longdouble` values.
-diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
-index b0a36a30248f7..f2506de54498e 100644
---- Modules/_ctypes/callproc.c
-+++ Modules/_ctypes/callproc.c
-@@ -489,58 +489,47 @@ is_literal_char(unsigned char c)
- static PyObject *
- PyCArg_repr(PyCArgObject *self)
- {
--    char buffer[256];
-     switch(self->tag) {
-     case 'b':
-     case 'B':
--        sprintf(buffer, "<cparam '%c' (%d)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%d)>",
-             self->tag, self->value.b);
--        break;
-     case 'h':
-     case 'H':
--        sprintf(buffer, "<cparam '%c' (%d)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%d)>",
-             self->tag, self->value.h);
--        break;
-     case 'i':
-     case 'I':
--        sprintf(buffer, "<cparam '%c' (%d)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%d)>",
-             self->tag, self->value.i);
--        break;
-     case 'l':
-     case 'L':
--        sprintf(buffer, "<cparam '%c' (%ld)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%ld)>",
-             self->tag, self->value.l);
--        break;
- 
-     case 'q':
-     case 'Q':
--        sprintf(buffer,
--#ifdef MS_WIN32
--            "<cparam '%c' (%I64d)>",
--#else
--            "<cparam '%c' (%lld)>",
--#endif
-+        return PyUnicode_FromFormat("<cparam '%c' (%lld)>",
-             self->tag, self->value.q);
--        break;
-     case 'd':
--        sprintf(buffer, "<cparam '%c' (%f)>",
--            self->tag, self->value.d);
--        break;
--    case 'f':
--        sprintf(buffer, "<cparam '%c' (%f)>",
--            self->tag, self->value.f);
--        break;
--
-+    case 'f': {
-+        PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d);
-+        if (f == NULL) {
-+            return NULL;
-+        }
-+        PyObject *result = PyUnicode_FromFormat("<cparam '%c' (%R)>", self->tag, f);
-+        Py_DECREF(f);
-+        return result;
-+    }
-     case 'c':
-         if (is_literal_char((unsigned char)self->value.c)) {
--            sprintf(buffer, "<cparam '%c' ('%c')>",
-+            return PyUnicode_FromFormat("<cparam '%c' ('%c')>",
-                 self->tag, self->value.c);
-         }
-         else {
--            sprintf(buffer, "<cparam '%c' ('\\x%02x')>",
-+            return PyUnicode_FromFormat("<cparam '%c' ('\\x%02x')>",
-                 self->tag, (unsigned char)self->value.c);
-         }
--        break;
- 
- /* Hm, are these 'z' and 'Z' codes useful at all?
-    Shouldn't they be replaced by the functionality of c_string
-@@ -549,22 +538,20 @@ PyCArg_repr(PyCArgObject *self)
-     case 'z':
-     case 'Z':
-     case 'P':
--        sprintf(buffer, "<cparam '%c' (%p)>",
-+        return PyUnicode_FromFormat("<cparam '%c' (%p)>",
-             self->tag, self->value.p);
-         break;
- 
-     default:
-         if (is_literal_char((unsigned char)self->tag)) {
--            sprintf(buffer, "<cparam '%c' at %p>",
-+            return PyUnicode_FromFormat("<cparam '%c' at %p>",
-                 (unsigned char)self->tag, (void *)self);
-         }
-         else {
--            sprintf(buffer, "<cparam 0x%02x at %p>",
-+            return PyUnicode_FromFormat("<cparam 0x%02x at %p>",
-                 (unsigned char)self->tag, (void *)self);
-         }
--        break;
-     }
--    return PyUnicode_FromString(buffer);
- }
- 
- static PyMemberDef PyCArgType_members[] = {
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 5f517d9f044b..8ba2baee2b15 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,21 +3,21 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.9.1
-revision=2
+version=3.9.2
+revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
 makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
-checkdepends="$depends iana-etc"
+checkdepends="$depends iana-etc tzdata"
 short_desc="Python programming language (${version%.*} series)"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff
+checksum=3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From ce20fd0d3ca1678ba5d3e01469a2fc9de6fb9c5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 20 Feb 2021 21:09:36 -0500
Subject: [PATCH 2261/3458] python3-tkinter: update to 3.9.2.

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

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906ba..a7b4fa914b58 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -7,7 +7,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.9.1
+version=3.9.2
 revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="
@@ -22,7 +22,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff
+checksum=3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d
 
 pre_configure() {
 	# Ensure that internal copies of expat and libffi are not used.

From a4fc63e700366cab97c8eea34f304632196ef855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 25 Feb 2021 04:18:05 +0100
Subject: [PATCH 2262/3458] mame: try to reduce impact on aarch64 builders

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

diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index f636ba2db699..bc498d82863a 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -52,6 +52,10 @@ if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	LDFLAGS+=" -Wl,--no-keep-memory"
 else
 	_options+=" PTR64=1"
+	if [ "${XBPS_TARGET_MACHINE%-musl}" = "aarch64" ]; then
+		# Help to reduce impact on our aarch64 builders
+		LDFLAGS+=" -Wl,--no-keep-memory"
+	fi
 fi
 if [ "$build_option_qt" ]; then
 	_options+=" USE_QTDEBUG=1"

From 263b0172303d6f13152076c3f9a5c55ae4167682 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Feb 2021 12:54:28 +0100
Subject: [PATCH 2263/3458] seaweedfs: update to 2.26.

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

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 0e2c0ecacf24..8954c53c65bf 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,6 +1,6 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
-version=2.02
+version=2.26
 revision=1
 build_style=go
 go_import_path="github.com/chrislusf/seaweedfs"
@@ -11,4 +11,4 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/chrislusf/seaweedfs"
 distfiles="https://github.com/chrislusf/seaweedfs/archive/${version}.tar.gz"
-checksum=22e16c9fb7b210c236f3d1c3ac40478610bb1886cdd68034b8410d25bb7c3880
+checksum=42a95498bc858ee55e699bc1418a926c8c9a38ae581535f33f683b634feb2e79

From 74dd4802658495001966f7458e4937001853e22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 25 Feb 2021 05:41:47 +0100
Subject: [PATCH 2264/3458] xf86-video-mga: fix mips*

---
 srcpkgs/xf86-video-mga/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template
index 26183e8236d9..33f0f89ce2cb 100644
--- a/srcpkgs/xf86-video-mga/template
+++ b/srcpkgs/xf86-video-mga/template
@@ -15,6 +15,7 @@ checksum=268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79
 lib32disabled=yes
 
 LDFLAGS="-Wl,-z,lazy"
+CFLAGS="-fcommon"
 
 pre_configure() {
 	autoreconf -if

From 1042b8f47bfcf03875a479dfb9a849a1c278ade9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 25 Feb 2021 05:43:28 +0100
Subject: [PATCH 2265/3458] xf86-video-cirrus: fix mips*

---
 srcpkgs/xf86-video-cirrus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template
index 1cef78742e86..f4f7c3a2f0a1 100644
--- a/srcpkgs/xf86-video-cirrus/template
+++ b/srcpkgs/xf86-video-cirrus/template
@@ -15,7 +15,7 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
 checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab
 
 LDFLAGS="-Wl,-z,lazy"
-CFLAGS="-Wno-pointer-arith -Wno-discarded-qualifiers -Wno-unused-label"
+CFLAGS="-fcommon -Wno-pointer-arith -Wno-discarded-qualifiers -Wno-unused-label"
 
 post_install() {
 	vlicense COPYING

From 78fc757b10d8ff8d5533ee82c6c6c40a71b92a6a Mon Sep 17 00:00:00 2001
From: Leonid Bobrov <curiousbeaver@disroot.org>
Date: Thu, 25 Feb 2021 09:36:52 +0200
Subject: [PATCH 2266/3458] New package: tklib-0.7

Closes: #29043 [via git-merge-pr]
---
 srcpkgs/tklib/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/tklib/template

diff --git a/srcpkgs/tklib/template b/srcpkgs/tklib/template
new file mode 100644
index 000000000000..4b7bde9bcc05
--- /dev/null
+++ b/srcpkgs/tklib/template
@@ -0,0 +1,18 @@
+# Template file for 'tklib'
+pkgname=tklib
+version=0.7
+revision=1
+wrksrc="tklib-tklib-${version}"
+build_style=gnu-configure
+hostmakedepends="pkg-config tcllib tk"
+depends="tcllib tk"
+short_desc="Companion to Tcllib, for Tk related packages"
+maintainer="Leonid Bobrov <curiousbeaver@disroot.org>"
+license="TCL"
+homepage="https://core.tcl-lang.org/tklib/home"
+distfiles="https://github.com/tcltk/${pkgname}/archive/${pkgname}-${version}.tar.gz"
+checksum=93890db81a5b0cdb62c386265ec4fcdaab60824e8e6e882c7fecc69ff49afc66
+
+post_install() {
+	vlicense ./license.terms LICENSE
+}

From bda78a5fa7f47f4d634ec4109c23e945dc64e305 Mon Sep 17 00:00:00 2001
From: TC <git@titouan.co>
Date: Wed, 24 Feb 2021 18:59:49 +0100
Subject: [PATCH 2267/3458] tailscale: update to 1.4.5.

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

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 7d7cbc1783c9..bd44d56b4cb1 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.4.4
+version=1.4.5
 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=5312c6d075a32049912e0932a89269869def9ac8ea9d0fdccc6b41db60fc2d4c
+checksum=f285d5028f71f0ec7d701b14a8526de61dd3ee75cecaeb50db724b904c1daa76
 
 post_install() {
 	vlicense LICENSE

From 03cd195e62c5b07b97bf7c34169d5290e2b27486 Mon Sep 17 00:00:00 2001
From: TC <git@titouan.co>
Date: Wed, 24 Feb 2021 19:21:12 +0100
Subject: [PATCH 2268/3458] lazygit: update to 0.25.1.

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

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index fe368000d025..4bda24e4a08c 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,9 +1,10 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.24.2
+version=0.25.1
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
+go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
 hostmakedepends="git"
 depends="git"
 short_desc="Simple terminal UI for git commands"
@@ -11,7 +12,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=95f629d57b459a3414af0582c20835edc970ec83a2c791cff97e5b8aac3b7025
+checksum=4de157c0997a12d9161bc0c10cb65053349325f2da9005bd271361a2bee8074b
 
 post_install() {
 	vlicense LICENSE

From 7a1669d59b9dcbc7ff64181a56cf61c83bfef1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 25 Feb 2021 11:21:58 +0100
Subject: [PATCH 2269/3458] qtcreator: update to 4.14.1

Make qtcreator-full depend on base-devel.
---
 srcpkgs/qtcreator/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 0a52f6fcb12a..cb7bdd6cf539 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,7 +1,7 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=4.14.0
-revision=2
+version=4.14.1
+revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
 make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
@@ -14,7 +14,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=d240109351e96446ff149cbd56341ec02ba37bfa50462a85e4d02dfe6b21201e
+checksum=ef6fdcbaebb0d3d37cfdbc68f8b9e94ffeb6f63194564da5ce77760bb7790367
 replaces="qtcreator-data>=0"
 python_version=3
 
@@ -45,7 +45,7 @@ post_install() {
 
 qtcreator-full_package() {
 	short_desc+=" - full Qt5 dependencies"
-	depends="${sourcepkg}>=${version}_${revision}
+	depends="${sourcepkg}>=${version}_${revision} base-devel
  qt5-3d-devel qt5-charts-devel qt5-connectivity-devel qt5-datavis3d-devel
  qt5-declarative-devel qt5-datavis3d-devel qt5-gamepad-devel qt5-location-devel
  qt5-multimedia-devel qt5-networkauth-devel qt5-purchasing-devel qt5-quickcontrols

From 41eedd30322436f770a5448c322a2d2c1c7400f6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 24 Feb 2021 21:42:00 +0100
Subject: [PATCH 2270/3458] prosody: update to 0.11.8.

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

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f62..22e88889d347 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,6 +1,6 @@
 # Template file for 'prosody'
 pkgname=prosody
-version=0.11.7
+version=0.11.8
 revision=1
 build_style=configure
 configure_args="
@@ -27,7 +27,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://prosody.im/"
 distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz"
-checksum=28ffc07653485cb63e22b387d3ea4825ee2baaee0c5827de4d6053a35b1c8747
+checksum=830f183b98d5742d81e908d2d8e3258f1b538dad7411f06fda5b2cc5c75068f8
 
 system_accounts="prosody"
 prosody_homedir="/var/lib/prosody"

From 77e40d047e80469e901e723ace8faa2cdcf3c4db Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 24 Feb 2021 21:57:25 +0100
Subject: [PATCH 2271/3458] openradtool: update to 0.11.12.

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

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index d51aa09b5a07..fc46c5bfc6fe 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.11.10
+version=0.11.12
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=b51f4de9ced9de04a9b6936297ac92c5064b177de9c370d80184e6c7fc2bff6d
+checksum=6ce797dd238374de7444f7aabbfc8b31259477c8bfe0616c48baf6e96f5ca663
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From a27be6f19e3e18e3eeb05d079faac61d82a83b1c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 25 Feb 2021 14:07:40 +0100
Subject: [PATCH 2272/3458] xdg-desktop-portal: update to 1.8.1.

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

diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template
index b2b9d77727bc..2f1c240cebb0 100644
--- a/srcpkgs/xdg-desktop-portal/template
+++ b/srcpkgs/xdg-desktop-portal/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal'
 pkgname=xdg-desktop-portal
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pipewire --enable-geoclue --enable-libportal"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/flatpak/xdg-desktop-portal"
 distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a2fc5681b3a35078239072a98d6435a4c8404016730cab17c9febfd4ecec3610
+checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf
 
 do_check() {
 	# some tests require a dbus session

From b4f1b076e6d7e67fc5ebf61f924771a3cb399dd3 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 25 Feb 2021 16:48:48 +1100
Subject: [PATCH 2273/3458] upmpdcli: update to 1.5.9

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

diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index 2107b090313a..85697c999688 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,6 +1,6 @@
 # Template file for 'upmpdcli'
 pkgname=upmpdcli
-version=1.5.8
+version=1.5.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config tar"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=802a2ab795841fbb9bfff5fd7951881022f5414ed893a1db704801b999e658a8
+checksum=9fda0b59db8a8b4f283333a89dcca19d70fb8820286d3d071b7c80de38eb7116
 python_version=3
 
 system_accounts="_upmpdcli"

From 7f99e7807e11d2ba0208bdda5625bbf14d2c0824 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 25 Feb 2021 16:05:02 +0100
Subject: [PATCH 2274/3458] go-for-it: update to 1.9.1.

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

diff --git a/srcpkgs/go-for-it/template b/srcpkgs/go-for-it/template
index 2e8bf16c8589..82ad9bc1c338 100644
--- a/srcpkgs/go-for-it/template
+++ b/srcpkgs/go-for-it/template
@@ -1,6 +1,6 @@
 # Template file for 'go-for-it'
 pkgname=go-for-it
-version=1.9.0
+version=1.9.1
 revision=1
 wrksrc="Go-For-It-${version}"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-only"
 homepage="https://github.com/JMoerman/Go-For-It"
 distfiles="https://github.com/JMoerman/Go-For-It/archive/${version}.tar.gz"
-checksum=a0b60f4c6d8435343ffc25f1c6b16aa19ebb9b3862a814ee7d3ef0bd88bba29f
+checksum=9d48d0e45c4ac74972a015671b6dd70ff57435a7f66a1188d95e19ac6b5b2009

From 4fd995eabbbb208334f6be9f26b223a8aa58085a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 25 Feb 2021 13:31:05 -0300
Subject: [PATCH 2275/3458] thunderbird: update to 78.8.0.

---
 .../patches/ff85-ppc64-xptcall.patch          | 63 -------------------
 srcpkgs/thunderbird/template                  |  4 +-
 2 files changed, 2 insertions(+), 65 deletions(-)
 delete 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
deleted file mode 100644
index b270d836f2f4..000000000000
--- a/srcpkgs/thunderbird/patches/ff85-ppc64-xptcall.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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/thunderbird/template b/srcpkgs/thunderbird/template
index 7c2a6c3b4f32..dc018ee585d9 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.1
+version=78.8.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=0ccc5a54fb2548489c9579f677cb4ff3c191b1d1fcf33bef6b1cf6eb704e385a
+checksum=3f36fa5ffc85888eaf77afb5cdd51bdadce841b7ae0744f5f5cd147ef4975a9d
 
 lib32disabled=yes
 

From b58687cd0108ad6dce8536305bfb4b8368928247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 25 Feb 2021 13:32:01 -0300
Subject: [PATCH 2276/3458] thunderbird-i18n: update to 78.8.0.

Also rename translation files so we don't accidentally use the cached
ones.
---
 srcpkgs/thunderbird-i18n/template | 116 +++++++++++++++---------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 882f3eda8951..49f4ff54fe37 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.1
+version=78.8.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -79,7 +79,7 @@ for _lang in "${_languages[@]}"; do
 	_pkgname=thunderbird-i18n-${_locale}
 
 	depends+=" ${_pkgname}>=${version}"
-	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-x86_64/xpi/${_locale}.xpi"
+	distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-x86_64/xpi/${_locale}.xpi>${_locale}-${version}.xpi"
 
 	eval "${_pkgname}_package() {
 		_pkgtmpl $_lang
@@ -91,63 +91,63 @@ _pkgtmpl() {
 	depends="thunderbird>=${version}"
 	short_desc="Thunderbird $2 language pack"
 	pkg_install() {
-		vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/${_lang}.xpi 644 \
+		vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/${_lang}-${version}.xpi 644 \
 			usr/lib/thunderbird/extensions langpack-${_lang}@thunderbird.mozilla.org.xpi
 	}
 }
 
-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"
+checksum="36ff00ccca1acc3103f977a199d78a755f7f7b1a581dd67ac066e2bcdca7d1cf
+ a7bf06e1bc69b211f781c07ab0844341ef344b90b3d2bfb75cc04983c4514f77
+ 4b5e2d278f6465654483eadf74f7e41787e79916685720b6305d4e1e2eb56181
+ 7f538e38444a50763df413e10c486bf7bf991f58f0ee09117640d944d1aa309d
+ 2700108616878f95aaca5f520c3063d5092618a7143f2c7b2c9b67d4bf8f9d4b
+ 1cd73769267d18c938136013d2cd7231f27ee073bf945d9ad607bbd5abfba8de
+ 9b8cd8005f2c23d04ab620b4516a3dd31152c5313c095fbd0a88d512cd0bed99
+ 4ebdcbe2a4fb03271b07fdc5f605c80c422d7bb775f845da376454b34f82f65b
+ e8646161d6c857e481fdc22870e8d0bc2686c79bd4c284c56ed3e9dfd2968718
+ 0e9940d2be9dc74f6383df458cd45eb48b15f1e3338ad2e193e43b8d6b45fb56
+ 134112b75ef140ab3502c5bbef45c1d91c2d5ce71b3bdb64699b72fe1afcf0fe
+ 6c4b4c87b8241892c1349fe0b22580dda1bbf8ff59e0902c7d8082859a62d925
+ 1952215daa911505511b6c5d428571471eb0c0817c1af58ee8e648afffbdc39f
+ 7065352973ea351587bbcc668c5d46978432de9a5edc8e6cfaaad4edaf1d6cd9
+ 513d97a0960bbc43f1e1469e6e437bbfe664dcb15a8d4666dd4af51414a41d94
+ e4e9359658fab2619f97ad3ca94500159ccc029ea37cd065c5c2d2c62f31c641
+ cad6e903883917fdde124ebd897470167c26d3bb58f29a809575224f6837671e
+ b9c1c876f1c552bfa7404a2ddca2fda7a1765c24d036c415e8230f37888c8cc7
+ 22fd6a07eb5975e205aba1e3051f69d92b8069df114d9629d06de4650ae2e67b
+ d7b0c8799a696529b882f401bd5695e8d72acbfa746fea197af57e1f5cc1b390
+ 76c5d070c907ffaa3dbdae2a2ae975b4688df06827d46075ac9847d16f5a030b
+ 10d47e3db429ef1dd46344f8b5e1ab1251429878b5f6e5639aa4d1517f7eee6e
+ 52c2a22fed05cb068c8b84c2812cf1a09c2921e9c945a25e768ceb45fd6be1ff
+ 8d523631571c50747eae5f24d4da6e3e4e917235bba6568c0d530dd761e94931
+ 37e3660753b5ce2671476cdf2d2293d9f0cf3994763031de308b67ec8b1eca0a
+ 7417d3806ab290f82b1cedb62f41aeb25d47f9cb396f86efbe9eae1c05834b54
+ ef0e1adbcf735876c90935a3276bd4b808897e4f3add755d0fcb6d4781444378
+ 766cb60ebdda38dd2dcc8db3084218cbdb9bb92b06baae228556ebd7e37396fa
+ 5bc54287c4df4ebc01d7fe38b7f4accc8d9565ed9c73c45f73fbd3475c2bc84d
+ d46f2e6c3b6fbc55a12713dc40033bb89f9c7ad7d601d967b33ff5fc080ec5d9
+ a2adcd1371fbb05ad6c09e1d6d93bcf16a4dccad845c85b671b4fc4c5069ab34
+ 31b9b6c62faaeec0c8681ec1cd94c63f900d69e9b32c0660d05a0d0750e5305c
+ a188ce41afa62219b6205d935dd08c8a6b54b6bb758a30eaf6e5a08c9ba6de46
+ 9b2692f12348cb23658f4af92993dd1aeb579854dae61e28272d92b43f7b2c46
+ ccd3666625c3989542b9137dde4a4e24963c30a0db9aefcde20fdc26f9c57155
+ 5ae63fbe71a2b345c81ffe39b5705fc66ff726170d48a3401de43a528c8cb225
+ 5bd735307a06bbee488f393e2d5656d708a4ed76bc706dfce2f83c78b29666a8
+ 082d108a844d4bca9f650044879da812118d5c26b7d110a5a4ed3497abb7d5bd
+ c4732c8a663a30e9a5d51610acb015651bfe8940a22b140dd176ccdf5423dd31
+ 59f5c1ece837e94b5667c006f16e8624d4ca4bf8e1a827a1e56726b73ede1a89
+ fd3037ec680f4f9219c3de3aa862bfce7ce811fc221513dba6f9aeb4f028c9fb
+ ca1e0ec0c3d21ffc0fd957dc028f91fde9be2f8f00d2de4921dc3654b9928732
+ 5d0c02475d457480b52e0e46199d253db94b13b20a9efbb90624e5fa9492a752
+ b4c671d572578ce802ab25a0daaeddf81dac5f7e74b119a66e389a0a1e040df8
+ 6eea4e0a484eef91a1d9bf5ac6589db3e8e03c91b7fdcd3c4c29b633893d055c
+ df30cc52cdf7c0755e768531df7817dec72e03bada83fc85baf4fc33ea5829eb
+ 4444448f0d5ada26527b3c290cabed8d2ef63613a57623f0275a7497518d73fe
+ fffb80d4ff700852d09995874bd561dc9c607e6a9b3de09ae958b457dbea9da4
+ 6a3bc8b51ccf4b10e8e7a4405fe670efe68da1d79ab8c9924d10d9d5aff602d8
+ 309b9a79e57ac7d365fa549530fc33e576bae7180bf20cb0f74ebe4c94f5d450
+ 764ba8366347b082a7cf1e0c5243a60364773eb5c39ed43e1aade779a9102969
+ 3f93807a66d4fcc3ad8fb61cb1557afac9745330ed7b76cbd7a9e388c78997cf
+ b5624458cd469e784423bb24719557277d3b48479aba2b6f4b610ee8c5fa72f2
+ 6a2cee4ab86d55d82264dcb26bbeeca1cc8120cf11220b4e431239f74c623092
+ 668075cdb8f2f592ed713f0b2dd483c579593be030df5ceba1c5acaecaf12f39"

From bf609545160fd576c7fb6d34e8c3447610af860e Mon Sep 17 00:00:00 2001
From: endigma <endigmamc@gmail.com>
Date: Wed, 24 Feb 2021 17:16:05 -0400
Subject: [PATCH 2277/3458] glow: update to 1.3.0

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

diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index 97a5b2851c58..fd91d3162370 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,6 +1,6 @@
 # Template file for 'glow'
 pkgname=glow
-version=1.0.2
+version=1.3.0
 revision=1
 build_style=go
 go_import_path=github.com/charmbracelet/glow
@@ -9,7 +9,7 @@ maintainer="klardotsh <josh@klar.sh>"
 license="MIT"
 homepage="https://github.com/charmbracelet/glow"
 distfiles="https://github.com/charmbracelet/glow/archive/v${version}${_status}.tar.gz"
-checksum=2d98c1e780d750b83d8da094de4c2a999c324021906e6d813b7c75d0320243c8
+checksum=828d8453f026a24cd7a6dcf8d97213fe713cadcfab7ca969d5f4c8338d88bb86
 
 post_install() {
 	vlicense LICENSE

From 0726a715367b749065e274c3ae63f4a0005cf6c7 Mon Sep 17 00:00:00 2001
From: Savoy <root@savoyroad.io>
Date: Thu, 25 Feb 2021 08:39:33 -0600
Subject: [PATCH 2278/3458] wee-slack: update to 2.7.0

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

diff --git a/srcpkgs/wee-slack/template b/srcpkgs/wee-slack/template
index 0f5734734ea1..08f56d3c7ddf 100644
--- a/srcpkgs/wee-slack/template
+++ b/srcpkgs/wee-slack/template
@@ -1,14 +1,14 @@
 # Template file for 'wee-slack'
 pkgname=wee-slack
-version=2.6.0
-revision=2
+version=2.7.0
+revision=1
 depends="weechat weechat-python python3-websocket-client"
 short_desc="WeeChat plugin for Slack.com"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/wee-slack/wee-slack"
 distfiles="https://github.com/wee-slack/wee-slack/archive/v${version}.tar.gz"
-checksum=1a4cfd1096f980d557f301b523e0bdfe8adfcf27c41ea41094474343424d2001
+checksum=da75962f97192ef5d10f5c7a0c72933aa1e4124ae0bfd84a1394f70f7d790b5b
 
 do_install() {
 	vinstall wee_slack.py 644 usr/lib/weechat/python/

From 751d9934ee89cfb8580b78bfb61e210a8b875f68 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 19:52:12 +0100
Subject: [PATCH 2279/3458] mpd: update to 0.22.6.

fix musl tests
---
 .../patches/dont-use-glibc-extension.patch    | 36 +++++++++++++++++++
 srcpkgs/mpd/patches/fix-musl-tests.patch      | 24 +++++++++++++
 srcpkgs/mpd/template                          |  4 +--
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/mpd/patches/dont-use-glibc-extension.patch
 create mode 100644 srcpkgs/mpd/patches/fix-musl-tests.patch

diff --git a/srcpkgs/mpd/patches/dont-use-glibc-extension.patch b/srcpkgs/mpd/patches/dont-use-glibc-extension.patch
new file mode 100644
index 000000000000..edb22981b3bc
--- /dev/null
+++ b/srcpkgs/mpd/patches/dont-use-glibc-extension.patch
@@ -0,0 +1,36 @@
+From 18f6e76a07245b9cc8d87cd9b582d4e7252494d3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
+Date: Thu, 25 Feb 2021 14:21:36 -0300
+Subject: [PATCH] storage/plugins/CurlStorage: don't use glibc extension in
+ ParseTimePoint.
+
+%Z is a glibc extension to strptime, and is a no-op there, due to the
+mapping between timezone names and their definition (especially when the
+name comes from a different machine) being ambiguous / impossible.  Time
+in HTTP headers is guaranteed to be UTC.
+
+Passing an unknown format to strptime() implementations that don't
+support it will generally cause them to return NULL, which will lead to
+ParseTimePoint throwing an exception and ParseTimeStamp using an
+unnecessary fallback.
+
+Since the timezone name goes at the end of the string, we don't need to
+use %Z to skip it (could be an issue in a different time stamp format),
+so simply removing %Z works best.
+---
+ src/storage/plugins/CurlStorage.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/storage/plugins/CurlStorage.cxx b/src/storage/plugins/CurlStorage.cxx
+index d05b90a31..9d862eb32 100644
+--- a/src/storage/plugins/CurlStorage.cxx
++++ b/src/storage/plugins/CurlStorage.cxx
+@@ -193,7 +193,7 @@ ParseTimeStamp(const char *s)
+ {
+ 	try {
+ 		// TODO: make this more robust
+-		return ParseTimePoint(s, "%a, %d %b %Y %T %Z");
++		return ParseTimePoint(s, "%a, %d %b %Y %T");
+ 	} catch (...) {
+ 		return std::chrono::system_clock::time_point::min();
+ 	}
diff --git a/srcpkgs/mpd/patches/fix-musl-tests.patch b/srcpkgs/mpd/patches/fix-musl-tests.patch
new file mode 100644
index 000000000000..a1b450988ed0
--- /dev/null
+++ b/srcpkgs/mpd/patches/fix-musl-tests.patch
@@ -0,0 +1,24 @@
+From 634bd4798c4dab00f0a0869fed9a4f31bfbd53fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
+Date: Thu, 25 Feb 2021 13:53:31 -0300
+Subject: [PATCH] time/ISO8601: don't use glibc extension in strptime.
+
+Per the manual for strptime, %F is equivalent %Y-%m-%d, so use that
+directly.
+---
+ src/time/ISO8601.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/time/ISO8601.cxx b/src/time/ISO8601.cxx
+index e2197e3ad..be20ee803 100644
+--- a/src/time/ISO8601.cxx
++++ b/src/time/ISO8601.cxx
+@@ -202,7 +202,7 @@ ParseISO8601(const char *s)
+ 	}
+ 
+ 	/* parse the date */
+-	const char *end = strptime(s, "%F", &tm);
++	const char *end = strptime(s, "%Y-%m-%d", &tm);
+ 	if (end == nullptr) {
+ 		/* try without field separators */
+ 		end = strptime(s, "%Y%m%d", &tm);
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 18701cd912a8..9fb76d5e0a4a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.4
+version=0.22.6
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,7 +37,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=891ea993a539246fa8f670346e5aa6c8cc85ce4be739ff12261712b0b3149dd0
+checksum=2be149a4895c3cb613477f8cf1193593e3d8a1d38a75ffa7d32da8c8316a4d5e
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 patch_args="-Np1"
 

From 63c880136fd6c27325768215463db8088d878c8a Mon Sep 17 00:00:00 2001
From: Eder Sosa <edersohe@github.com>
Date: Mon, 8 Feb 2021 06:27:47 -0600
Subject: [PATCH 2280/3458] crda: update to 4.14 #28580

* crda-4.14
* wireless-regdb-2020.12.20

fix error messages like

```
[    6.954196] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2
[    6.954207] cfg80211: failed to load regulatory.db
```

registered also in the issue #2999 and

```
[    6.917367] cfg80211: Loading compiled-in X.509 certificates for regulatory database
[    6.920611] cfg80211: loaded regulatory.db is malformed or signature is missing/invalid
```
---
 srcpkgs/crda/template | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24cb..45d4bac06028 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -1,9 +1,9 @@
 # Template file for 'crda'
 pkgname=crda
-version=3.18
-revision=5
+version=4.14
+revision=1
 _dbname=wireless-regdb
-_dbversion=2016.06.10
+_dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
 hostmakedepends="libressl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
@@ -11,10 +11,11 @@ depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="ISC"
-homepage="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
-distfiles="https://kernel.org/pub/software/network/crda/${pkgname}-${version}.tar.xz https://www.kernel.org/pub/software/network/wireless-regdb/${_dbname}-${_dbversion}.tar.xz"
-checksum="43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf
-cfedf1c3521b3c8f32602f25ed796e96e687c3441a00e7c050fedf7fd4f1b8b7"
+homepage="https://wireless.wiki.kernel.org/en/developers/regulatory/crda"
+distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/${pkgname}-${version}.tar.gz
+https://www.kernel.org/pub/software/network/wireless-regdb/${_dbname}-${_dbversion}.tar.xz"
+checksum="5a8f35bb8b27474f466b0e75d451ba917433d8aab1889678a64d9c4e72a8b8c2
+ b4164490d82ff7b0086e812ac42ab27baf57be24324d4c0ee1c5dd6ba27f2a52"
 conf_files="/etc/wireless-regdom.conf"
 
 build_options="wardrive"
@@ -29,22 +30,22 @@ post_extract() {
 do_build() {
 	CFLAGS+=" -Wno-unused-const-variable"
 	cd ${_dbsrc}
-	make
-	cp *.pem ${wrksrc}/pubkeys
+	cp *.pub.pem ${wrksrc}/pubkeys
 
 	cd ${wrksrc}
-
 	make CC="$CC" all_noverify
 }
 
 do_install() {
 	make DESTDIR="${DESTDIR}" SBINDIR="/usr/bin/" UDEV_RULE_DIR="/usr/lib/udev/rules.d/" install
-	vlicense LICENSE
+	vlicense LICENSE crda.LICENSE
 
 	cd ${_dbsrc}
-	vmkdir usr/lib/crda/
-	vinstall regulatory.bin 644 usr/lib/crda/
+	make DESTDIR="${DESTDIR}" FIRMWARE_PATH="/usr/lib/firmware" install
+	vlicense LICENSE wireless-regdb.LICENSE
+
 	vmkdir etc/conf.d/
+
 	for dom in $(grep ^country db.txt | cut -d' ' -f2 | sed 's|:||g'); do
 		echo "#WIRELESS_REGDOM=\"${dom}\"" >> ${DESTDIR}/etc/wireless-regdom.tmp
 	done
@@ -52,7 +53,7 @@ do_install() {
 	rm ${DESTDIR}/etc/wireless-regdom.tmp
 
 	vbin ${FILESDIR}/set-wireless-regdom
-	echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> ${DESTDIR}/usr/lib/udev/rules.d/85-regulatory.rules
+	echo 'ACTION=="add", SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> ${DESTDIR}/usr/lib/udev/rules.d/85-regulatory.rules
 
 	find ${DESTDIR} -type f -name \*.h -delete # No need for devel files, no package i know uses libreg.so
 }

From f698f9dc2eaeafc534f0d6b40f0efe0026700c35 Mon Sep 17 00:00:00 2001
From: John Sullivan <jsullivan@csumb.edu>
Date: Fri, 25 Sep 2020 00:44:17 -0700
Subject: [PATCH 2281/3458] New package: atinout-0.9.1

[Piraty: fix the Makefile with vsed instead of overwriting CFLAGS]
---
 srcpkgs/atinout/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/atinout/template

diff --git a/srcpkgs/atinout/template b/srcpkgs/atinout/template
new file mode 100644
index 000000000000..7d9663fc394c
--- /dev/null
+++ b/srcpkgs/atinout/template
@@ -0,0 +1,19 @@
+# Template file for 'atinout'
+pkgname=atinout
+version=0.9.1
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+short_desc="Send AT commands to modem and print responses"
+maintainer="John Sullivan <jsullivan@csumb.edu>"
+license="GPL-3.0-or-later"
+homepage="http://atinout.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/v${version}/${pkgname}-${version}.tar.gz"
+checksum=4d15c8288aca414e11cd304686b172696104c5e42bf776300311c005634854a2
+
+post_patch() {
+	vsed -i Makefile \
+		-e '/^CC.*=.*gcc/d' \
+		-e 's/^CFLAGS.*=/CFLAGS +=/' \
+		-e 's/-Werror//'
+}

From 0c992017f7ab2177b04c05e25857764d6fed7281 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Thu, 25 Feb 2021 17:43:17 -0600
Subject: [PATCH 2282/3458] python3-rich: update to 9.12.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 9e93a0563195..4de139faeee3 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.11.1
+version=9.12.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,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=86a157008d17c73ee03da80de91e09fc2f7713109ccd4e90496eeb3702bef638
+checksum=27e3deb24555d7dad554afa871c7e77f16a0336a625ed78dd10de21193b4ec11
 
 post_install() {
 	vlicense LICENSE

From 1ca3d71dd865046be3020884bc5330dd1ee10b1c Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Thu, 25 Feb 2021 00:03:12 +0700
Subject: [PATCH 2283/3458] inkscape: update to 1.0.2.

By ericonr:
- remove outdated patches
 - poppler was fixed in a compatibility header
 - invalid nullptr was fixed https://gitlab.com/inkscape/inkscape/-/merge_requests/2682
   can be seen fixed in
   https://gitlab.com/inkscape/inkscape/-/blob/INKSCAPE_1_0_2/src/extension/effect.h#L70
- fix some tests
- re-organize template to do things in more appropriate phases
- use 'share/extensions' commit slightly ahead of what upstream
  specified, but still in their 1.0.x branch - picks up bug fixes

Closes: #29033 [via git-merge-pr]
---
 .../patches/fix-invalid-nullptr.patch         | 13 ----
 srcpkgs/inkscape/patches/poppler-072.patch    | 71 -------------------
 srcpkgs/inkscape/template                     | 30 ++++----
 3 files changed, 15 insertions(+), 99 deletions(-)
 delete mode 100644 srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
 delete mode 100644 srcpkgs/inkscape/patches/poppler-072.patch

diff --git a/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch b/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
deleted file mode 100644
index 01599711a880..000000000000
--- a/srcpkgs/inkscape/patches/fix-invalid-nullptr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/extension/effect.cpp.orig	2019-12-03 18:54:18.521689345 +0100
-+++ src/extension/effect.cpp	2019-12-03 18:53:57.485477512 +0100
-@@ -38,8 +38,8 @@ Effect::Effect (Inkscape::XML::Node *in_
-     : Extension(in_repr, in_imp, base_directory)
-     , _id_noprefs(Glib::ustring(get_id()) + ".noprefs")
-     , _name_noprefs(Glib::ustring(_(get_name())) + _(" (No preferences)"))
--    , _verb(get_id(), get_name(), nullptr, nullptr, this, true)
--    , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), nullptr, nullptr, this, false)
-+    , _verb(get_id(), get_name(), "", nullptr, this, true)
-+    , _verb_nopref(_id_noprefs.c_str(), _name_noprefs.c_str(), "", nullptr, this, false)
-     , _menu_node(nullptr), _workingDialog(true)
-     , _prefDialog(nullptr)
- {
diff --git a/srcpkgs/inkscape/patches/poppler-072.patch b/srcpkgs/inkscape/patches/poppler-072.patch
deleted file mode 100644
index 439c84ca0bc5..000000000000
--- a/srcpkgs/inkscape/patches/poppler-072.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Poppler-0.72 renamed getCString() to c_str()
-
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index 9621e30..57f8ae7 100644
---- src/extension/internal/pdfinput/pdf-input.cpp
-+++ src/extension/internal/pdfinput/pdf-input.cpp
-@@ -319,7 +319,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/)
-     _render_thumb = true;
- 
-     // Create PopplerDocument
--    Glib::ustring filename = _pdf_doc->getFileName()->getCString();
-+    Glib::ustring filename = _pdf_doc->getFileName()->c_str();
-     if (!Glib::path_is_absolute(filename)) {
-         filename = Glib::build_filename(Glib::get_current_dir(),filename);
-     }
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index d318447..6d64db0 100644
---- src/extension/internal/pdfinput/pdf-parser.cpp
-+++ src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2381,8 +2381,8 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
-   }
-   if (printCommands) {
-     printf("  font: tag=%s name='%s' %g\n",
--	   font->getTag()->getCString(),
--	   font->getName() ? font->getName()->getCString() : "???",
-+	   font->getTag()->c_str(),
-+	   font->getName() ? font->getName()->c_str() : "???",
- 	   args[1].getNum());
-     fflush(stdout);
-   }
-@@ -2639,7 +2639,7 @@ void PdfParser::doShowText(GooString *s) {
-     double lineX = state->getLineX();
-     double lineY = state->getLineY();
-     oldParser = parser;
--    p = s->getCString();
-+    p = s->c_str();
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
-@@ -2694,7 +2694,7 @@ void PdfParser::doShowText(GooString *s) {
- 
-   } else {
-     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
--    p = s->getCString();
-+    p = s->c_str();
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index d449d1a..836ca10 100644
---- src/extension/internal/pdfinput/svg-builder.cpp
-+++ src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) {
-     GfxFont *font = state->getFont();
-     // Store original name
-     if (font->getName()) {
--        _font_specification = font->getName()->getCString();
-+        _font_specification = font->getName()->c_str();
-     } else {
-         _font_specification = "Arial";
-     }
-@@ -1047,7 +1047,7 @@ void SvgBuilder::updateFont(GfxState *state) {
- 
-     // Font family
-     if (font->getFamily()) { // if font family is explicitly given use it.
--        sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->getCString());
-+        sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->c_str());
-     } else { 
-         int attr_value = 1;
-         sp_repr_get_int(_preferences, "localFonts", &attr_value);
-
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index e27aceb7d2a8..4d61cf28495c 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,9 +1,12 @@
 # Template file for 'inkscape'
 pkgname=inkscape
-version=1.0.1
+version=1.0.2
 revision=1
-wrksrc="${pkgname}-INKSCAPE_${version//./_}"
+wrksrc="inkscape-${version}_2021-01-15_e86c870879"
 build_style=cmake
+# builds executables then runs checks
+# FIXME: some tests still fail on musl
+make_check_target=check
 hostmakedepends="automake pkg-config libtool intltool gettext-devel
  glib-devel perl-XML-Parser tar which xz"
 makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
@@ -11,27 +14,24 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
 depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
+checkdepends="gtest-devel $depends ImageMagick"
 short_desc="Vector-based drawing program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="http://inkscape.org/"
-_extension_rev=7099a364be65e17a76c0d9b7961232788d427d73
-distfiles="https://gitlab.com/inkscape/inkscape/-/archive/INKSCAPE_${version//./_}/inkscape-INKSCAPE_${version//./_}.tar.bz2
- https://gitlab.com/inkscape/extensions/-/archive/${_extension_rev}/extensions-${_extension_rev}.tar.bz2"
-checksum="0ccb623b2c7872b9edec405874eab3ff279dd209f496b496dd99969fdc3834d3
- 11d573e30d4b0c821e9c59a524c9f98b935dcfdad979066cc65fdf111cf116fe"
+# link from https://inkscape.org/release/all/source/archive/
+distfiles="https://inkscape.org/gallery/item/23820/inkscape-${version}.tar.xz"
+checksum=da3e230511a08cbf21e86710d161458594fea87867e9157b67ed01a04ea2798a
 python_version=3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-pre_configure() {
-	rm -r share/extensions || true
-	cp -r ../extensions-${_extension_rev} share/extensions
-
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) vsed -e "/-Werror=format/d" \
-			-i CMakeScripts/DefineDependsandFlags.cmake ;;
-	esac
+post_patch() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		# disable errors for missing sentinels in glib variadic functions,
+		# since inkscape uses NULL instead of nullptr
+		vsed -e "/-Werror=format/d" -i CMakeScripts/DefineDependsandFlags.cmake
+	fi
 }

From 21a7b8350f7a789c4724e4c0cd567e573180c1c9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Thu, 25 Feb 2021 18:03:09 -0600
Subject: [PATCH 2284/3458] screen: fix CVE-2021-26937

---
 srcpkgs/screen/patches/cve-2021-26937.patch | 64 +++++++++++++++++++++
 srcpkgs/screen/patches/utf8_nfd.patch       | 39 +++++++++++++
 srcpkgs/screen/template                     |  2 +-
 3 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/screen/patches/cve-2021-26937.patch
 create mode 100644 srcpkgs/screen/patches/utf8_nfd.patch

diff --git a/srcpkgs/screen/patches/cve-2021-26937.patch b/srcpkgs/screen/patches/cve-2021-26937.patch
new file mode 100644
index 000000000000..707e513e747c
--- /dev/null
+++ b/srcpkgs/screen/patches/cve-2021-26937.patch
@@ -0,0 +1,64 @@
+Description: [CVE-2021-26937] Fix out of bounds array access
+Author: Michael Schröder <mls@suse.de>
+Bug-Debian: https://bugs.debian.org/982435
+Bug: https://savannah.gnu.org/bugs/?60030
+Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html
+Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3
+Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html
+
+--- encoding.c.orig
++++ encoding.c
+@@ -43,7 +43,7 @@
+ # ifdef UTF8
+ static int   recode_char __P((int, int, int));
+ static int   recode_char_to_encoding __P((int, int));
+-static void  comb_tofront __P((int, int));
++static void  comb_tofront __P((int));
+ #  ifdef DW_CHARS
+ static int   recode_char_dw __P((int, int *, int, int));
+ static int   recode_char_dw_to_encoding __P((int, int *, int));
+@@ -1263,6 +1263,8 @@
+     {0x30000, 0x3FFFD},
+   };
+ 
++  if (c >= 0xdf00 && c <= 0xdfff)
++    return 1;          /* dw combining sequence */
+   return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
+           (cjkwidth &&
+            bisearch(c, ambiguous,
+@@ -1330,11 +1332,12 @@
+ }
+ 
+ static void
+-comb_tofront(root, i)
+-int root, i;
++comb_tofront(i)
++int i;
+ {
+   for (;;)
+     {
++      int root = i >= 0x700 ? 0x801 : 0x800;
+       debug1("bring to front: %x\n", i);
+       combchars[combchars[i]->prev]->next = combchars[i]->next;
+       combchars[combchars[i]->next]->prev = combchars[i]->prev;
+@@ -1396,9 +1399,9 @@
+     {
+       /* full, recycle old entry */
+       if (c1 >= 0xd800 && c1 < 0xe000)
+-        comb_tofront(root, c1 - 0xd800);
++        comb_tofront(c1 - 0xd800);
+       i = combchars[root]->prev;
+-      if (c1 == i + 0xd800)
++      if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
+ 	{
+ 	  /* completely full, can't recycle */
+ 	  debug("utf8_handle_comp: completely full!\n");
+@@ -1422,7 +1425,7 @@
+   mc->font  = (i >> 8) + 0xd8;
+   mc->fontx = 0;
+   debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
+-  comb_tofront(root, i);
++  comb_tofront(i);
+ }
+ 
+ #else /* !UTF8 */
diff --git a/srcpkgs/screen/patches/utf8_nfd.patch b/srcpkgs/screen/patches/utf8_nfd.patch
new file mode 100644
index 000000000000..6760abb94141
--- /dev/null
+++ b/srcpkgs/screen/patches/utf8_nfd.patch
@@ -0,0 +1,39 @@
+Author: Michael Schröder <mls@suse.de>
+Reviewed-By: Axel Beckert <abe@debian.org>
+Description: screen outputs screen "ÿ" after a connected character.
+ This is a character without the need. 
+ This happens in UTF-8 environment. 
+ Before : screen$ ruby1.9.1 -e 'puts "\u304b\u3099.."'
+          がÿ...
+ patch applied :  screen $ ruby1.9.1 -e 'puts "\u304b\u3099.."'
+          が..
+Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00012.html
+Bugs-Debian: https://bugs.debian.org/600246
+Bugs-Debian: https://bugs.debian.org/677512
+
+diff --git a/ansi.c b/ansi.c
+index 2a52edd..83b266d 100644
+--- ansi.c.orig
++++ ansi.c
+@@ -692,10 +692,6 @@ register int len;
+ 		    }
+ 		  curr->w_rend.font = 0;
+ 		}
+-#  ifdef DW_CHARS
+-	      if (curr->w_encoding == UTF8 && utf8_isdouble(c))
+-		curr->w_mbcs = 0xff;
+-#  endif
+ 	      if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c))
+ 		{
+ 		  int ox, oy;
+@@ -730,6 +726,10 @@ register int len;
+ 		    }
+ 		  break;
+ 		}
++#  ifdef DW_CHARS
++	      if (curr->w_encoding == UTF8 && utf8_isdouble(c))
++		curr->w_mbcs = 0xff;
++#  endif
+ 	      font = curr->w_rend.font;
+ # endif
+ # ifdef DW_CHARS
diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index cac2f924ead4..613696d9f373 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -1,7 +1,7 @@
 # Template file for 'screen'
 pkgname=screen
 version=4.8.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-sys-screenrc=/etc/screenrc --enable-pam
  --enable-colors256 --enable-rxvt_osc --enable-telnet

From 0e35c1e43cf95b7f116b16bde18b33ae5eaf7a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 25 Feb 2021 11:59:38 -0300
Subject: [PATCH 2285/3458] New package: linux5.11-5.11.1.

Switch to using 5.11 tarball + minor version patch. Allows the tarball
to be shared across updates.

Remove the DocBook makefile stuff. It's been carried over since kernel
4.13 (was introduced in ef67cec73b2f347559f1d359ddd8c4bba2ed5a35),
probably to allow building DKMS modules which depended on it. DKMS
modules which build cleanly on 5.11 will definitely have been updated to
not depend on that Makefile, so remove it.

We are not enabling SGX for Intel due to it being mostly useless for now
and looking generally sketchy. There's also no literature we could find
supporting it not affecting overall system security, but literature
pointing out the opposite definitely does:

- https://arxiv.org/pdf/1702.08719.pdf "Using SGX to Conceal Cache Attacks"

memory poisoning patch necessary for ppc hasn't been rebased yet, so
remove those targets from archs.
---
 srcpkgs/linux5.11-dbg                         |     1 +
 srcpkgs/linux5.11-headers                     |     1 +
 srcpkgs/linux5.11/files/arm64-dotconfig       | 11606 ++++++++++++++++
 srcpkgs/linux5.11/files/i386-dotconfig        | 10027 +++++++++++++
 srcpkgs/linux5.11/files/mv-debug              |     7 +
 srcpkgs/linux5.11/files/ppc-dotconfig         |  8137 +++++++++++
 srcpkgs/linux5.11/files/ppc64-dotconfig       | 10104 ++++++++++++++
 srcpkgs/linux5.11/files/ppc64le-dotconfig     |  9835 +++++++++++++
 srcpkgs/linux5.11/files/x86_64-dotconfig      | 10226 ++++++++++++++
 srcpkgs/linux5.11/patches/musl.patch          |    10 +
 srcpkgs/linux5.11/patches/ppc-vas-on-4k.patch |    26 +
 .../linux5.11/patches/ppc32-cpu-hotplug.patch |    34 +
 .../linux5.11/patches/ppc64-be-elfv2.patch    |    86 +
 .../linux5.11/patches/ppcle-broken-vdso.patch |    23 +
 .../patches/ppcle-ll-compat-sys.patch         |   107 +
 srcpkgs/linux5.11/template                    |   340 +
 16 files changed, 60570 insertions(+)
 create mode 120000 srcpkgs/linux5.11-dbg
 create mode 120000 srcpkgs/linux5.11-headers
 create mode 100644 srcpkgs/linux5.11/files/arm64-dotconfig
 create mode 100644 srcpkgs/linux5.11/files/i386-dotconfig
 create mode 100755 srcpkgs/linux5.11/files/mv-debug
 create mode 100644 srcpkgs/linux5.11/files/ppc-dotconfig
 create mode 100644 srcpkgs/linux5.11/files/ppc64-dotconfig
 create mode 100644 srcpkgs/linux5.11/files/ppc64le-dotconfig
 create mode 100644 srcpkgs/linux5.11/files/x86_64-dotconfig
 create mode 100644 srcpkgs/linux5.11/patches/musl.patch
 create mode 100644 srcpkgs/linux5.11/patches/ppc-vas-on-4k.patch
 create mode 100644 srcpkgs/linux5.11/patches/ppc32-cpu-hotplug.patch
 create mode 100644 srcpkgs/linux5.11/patches/ppc64-be-elfv2.patch
 create mode 100644 srcpkgs/linux5.11/patches/ppcle-broken-vdso.patch
 create mode 100644 srcpkgs/linux5.11/patches/ppcle-ll-compat-sys.patch
 create mode 100644 srcpkgs/linux5.11/template

diff --git a/srcpkgs/linux5.11-dbg b/srcpkgs/linux5.11-dbg
new file mode 120000
index 000000000000..8eab4f217059
--- /dev/null
+++ b/srcpkgs/linux5.11-dbg
@@ -0,0 +1 @@
+linux5.11
\ No newline at end of file
diff --git a/srcpkgs/linux5.11-headers b/srcpkgs/linux5.11-headers
new file mode 120000
index 000000000000..8eab4f217059
--- /dev/null
+++ b/srcpkgs/linux5.11-headers
@@ -0,0 +1 @@
+linux5.11
\ No newline at end of file
diff --git a/srcpkgs/linux5.11/files/arm64-dotconfig b/srcpkgs/linux5.11/files/arm64-dotconfig
new file mode 100644
index 000000000000..cdc4c921deba
--- /dev/null
+++ b/srcpkgs/linux5.11/files/arm64-dotconfig
@@ -0,0 +1,11606 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm64 5.11.1 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+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
+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_IRQ_IPI=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_LD_ORPHAN_WARN=y
+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_USERMODE_DRIVER=y
+# CONFIG_BPF_PRELOAD is not set
+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_PTE_SHIFT=4
+CONFIG_ARM64_CONT_PMD_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_BCM4908=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_VISCONTI=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_ARM64_ERRATUM_1508412=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_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=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_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_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_AS_HAS_LDAPR=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_PMEM=y
+CONFIG_ARM64_RAS_EXTN=y
+CONFIG_ARM64_CNP=y
+# end of ARMv8.2 architectural features
+
+#
+# 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
+
+#
+# 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_AS_HAS_ARMV8_5=y
+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
+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
+CONFIG_ARCH_ENABLE_THP_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_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_ACPI_CONFIGFS=m
+CONFIG_ACPI_IORT=y
+CONFIG_ACPI_GTDT=y
+CONFIG_ACPI_PPTT=y
+CONFIG_PMIC_OPREGION=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_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=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+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_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=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
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=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_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_ARCH_USES_HIGH_VMA_FLAGS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST 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_NFT_REJECT_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_BRIDGE_CFM is not set
+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_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=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_DEBUG=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
+CONFIG_CAN_ISOTP=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_PCI=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
+# CONFIG_CAN_MCP251XFD 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_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_S3FWRN82_UART=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_MSI_ARCH_FALLBACKS=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_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+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
+CONFIG_PCIE_HISI_ERR=y
+
+#
+# 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_EXYNOS=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_AUXILIARY_BUS=y
+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_REGMAP_SPI_AVMM=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
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=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_RAW_NAND=m
+
+#
+# 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
+CONFIG_MTD_NAND_INTEL_LGM=m
+CONFIG_MTD_NAND_ROCKCHIP=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
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# 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_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+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_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_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+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_HISI_HIKEY_USB=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
+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_MULTIPATH_IOA=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_MHI_NET=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_HIRSCHMANN_HELLCREEK=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_MSCC_SEVILLE=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_CHELSIO_INLINE_CRYPTO=y
+CONFIG_CHELSIO_IPSEC_INLINE=m
+CONFIG_CHELSIO_TLS_DEVICE=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_PRESTERA=m
+CONFIG_PRESTERA_PCI=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_DWMAC_INTEL_PLAT=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_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+CONFIG_MESON_GXL_PHY=m
+CONFIG_ADIN_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=y
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_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=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_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_OF_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_SUN4I=m
+CONFIG_MDIO_XGENE=y
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_BCM_IPROC is not set
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=m
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_IPQ4019=m
+CONFIG_MDIO_IPQ8064=m
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_MESON_G12A=m
+CONFIG_MDIO_BUS_MUX_BCM_IPROC=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+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_USB_RTL8153_ECM=m
+CONFIG_WLAN=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=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_AHB=m
+CONFIG_ATH11K_PCI=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
+# 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_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_ADC=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_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_TOUCHSCREEN_ZINITIX=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_DA7280_HAPTICS=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_F3A=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_BCM63XX=y
+CONFIG_SERIAL_BCM63XX_CONSOLE=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_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_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_HW_RANDOM_XIPHERA=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_SYNQUACER=m
+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_MLXBF=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_SLAVE_TESTUNIT=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_MIPI_I3C_HCI=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
+CONFIG_PTP_1588_CLOCK_OCP=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_MICROCHIP_SGPIO=y
+CONFIG_PINCTRL_OWL=y
+CONFIG_PINCTRL_S500=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_MSM8226=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_MSM8953=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_SC7280=m
+# CONFIG_PINCTRL_SDM660 is not set
+CONFIG_PINCTRL_SDM845=m
+CONFIG_PINCTRL_SDX55=m
+CONFIG_PINCTRL_SM8150=m
+CONFIG_PINCTRL_SM8250=m
+CONFIG_PINCTRL_LPASS_LPI=m
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+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_A100=y
+CONFIG_PINCTRL_SUN50I_A100_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_MT8167=y
+CONFIG_PINCTRL_MT8173=y
+CONFIG_PINCTRL_MT8183=y
+CONFIG_PINCTRL_MT8192=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_PINCTRL_VISCONTI=y
+CONFIG_PINCTRL_TMPV7700=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_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_REGMAP=m
+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_HISI=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_SL28CPLD=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
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+# end of Virtual GPIO drivers
+
+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_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_OCELOT_RESET=y
+CONFIG_POWER_RESET_LTC2952=y
+CONFIG_POWER_RESET_REGULATOR=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_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_BQ25980=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_CORSAIR_PSU=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_LTC2992=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_MAX127=m
+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_MR75203=m
+# 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_ADM1266=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_MP2975=m
+CONFIG_SENSORS_PM6764TR=m
+CONFIG_SENSORS_PXE1610=m
+CONFIG_SENSORS_Q54SJ108A2=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_SL28CPLD=m
+CONFIG_SENSORS_SBTSI=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
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=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_SL28CPLD_WATCHDOG=m
+# CONFIG_ARM_SP805_WATCHDOG is not set
+CONFIG_ARM_SBSA_WATCHDOG=m
+CONFIG_ARMADA_37XX_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+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_VISCONTI_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_INTEL_PMT=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_SIMPLE_MFD_I2C=m
+CONFIG_MFD_SL28CPLD=m
+# 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
+CONFIG_MFD_INTEL_M10_BMC=m
+# 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_ARM_SCMI=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_DA9121=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_PF8X00=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_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_ROHM=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RTMV20=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_ROCKCHIP_ISP1=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_MEDIATEK_VCODEC_VPU=y
+CONFIG_VIDEO_MEDIATEK_VCODEC_SCP=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_MESON_GE2D=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
+# CONFIG_DVB_TEST_DRIVERS 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_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_CCS_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_OV02A10=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_OV9734=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_CCS=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_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_HDCP is not set
+CONFIG_DRM_AMD_DC_SI=y
+# 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_KMB_DISPLAY=m
+# 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_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_DP=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_MSM_DSI_7NM_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_ABT_Y030XX067A=m
+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_NT36672A=m
+CONFIG_DRM_PANEL_NOVATEK_NT39016=m
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=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_S6E63M0_SPI=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_DSI=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
+CONFIG_DRM_PANEL_SAMSUNG_SOFEF00=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_TDO_TL070WSH30=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_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=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_TC358762=m
+CONFIG_DRM_TOSHIBA_TC358764=m
+CONFIG_DRM_TOSHIBA_TC358767=m
+CONFIG_DRM_TOSHIBA_TC358768=m
+CONFIG_DRM_TOSHIBA_TC358775=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_ANALOGIX_ANX7625=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_I2C_ADV7511_CEC=y
+CONFIG_DRM_CDNS_MHDP8546=m
+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_IMX_DCSS=m
+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_KTD253=m
+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_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=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_FSL_XCVR=m
+CONFIG_SND_SOC_FSL_AUD2HTX=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
+CONFIG_SND_SOC_IMX_HDMI=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
+CONFIG_SND_SOC_MT8192=m
+CONFIG_SND_SOC_MT8192_MT6359_RT1015_RT5682=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_HDMI=m
+CONFIG_SND_SOC_LPASS_PLATFORM=m
+CONFIG_SND_SOC_LPASS_IPQ806X=m
+CONFIG_SND_SOC_LPASS_APQ8016=m
+CONFIG_SND_SOC_LPASS_SC7180=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_AFE_CLOCKS=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_SM8250=m
+CONFIG_SND_SOC_SC7180=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_IMX_COMMON=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_SOF_XTENSA=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_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=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_CS4234=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_PCM5102A=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_RT1015=m
+CONFIG_SND_SOC_RT1015P=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_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_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIMPLE_MUX=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_TAS2764=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_MT6359=m
+CONFIG_SND_SOC_MT6660=m
+CONFIG_SND_SOC_NAU8315=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
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=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_VIVALDI=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_FEW_INIT_RETRIES is not set
+# 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_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_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_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_BRCM_USB_PINMAP=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 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_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_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_TCPCI_MAXIM=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
+CONFIG_TYPEC_STUSB160X=m
+CONFIG_TYPEC_QCOM_PMIC=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_OF_SPARX5=m
+CONFIG_MMC_SDHCI_CADENCE=m
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_MMC_SDHCI_S3C=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MMC_SDHCI_S3C_DMA=y
+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_LP50XX=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
+
+#
+# Flash and Torch LED drivers
+#
+CONFIG_LEDS_RT8515=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_VIRT_DMA=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_AL_MC=m
+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_RV3032=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_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
+# CONFIG_RTC_DRV_RX6110 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_RTC_DRV_GOLDFISH=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=m
+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_GPI_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_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+CONFIG_HD44780=m
+# CONFIG_IMG_ASCII_LCD is not set
+CONFIG_HT16K33=m
+CONFIG_LCD2S=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_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_VFIO_FSL_MC=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_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VDPA=m
+CONFIG_VDPA_SIM=m
+CONFIG_VDPA_SIM_NET=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_ZORAN is not set
+CONFIG_VIDEO_TEGRA=m
+CONFIG_VIDEO_TEGRA_TPG=y
+
+#
+# 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_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+CONFIG_WFX=m
+CONFIG_PHY_HI3670_USB=m
+CONFIG_SPMI_HISI3670=m
+CONFIG_MFD_HI6421_SPMI=m
+CONFIG_REGULATOR_HI6421V600=m
+# CONFIG_GOLDFISH is not set
+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_MLXBF_PMC=m
+CONFIG_SURFACE_PLATFORMS=y
+CONFIG_SURFACE_3_BUTTON=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_PRO3_BUTTON=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_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_FLEXSPI=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_MT8167=y
+CONFIG_COMMON_CLK_MT8167_AUDSYS=y
+CONFIG_COMMON_CLK_MT8167_IMGSYS=y
+CONFIG_COMMON_CLK_MT8167_MFGCFG=y
+CONFIG_COMMON_CLK_MT8167_MMSYS=y
+CONFIG_COMMON_CLK_MT8167_VDECSYS=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
+
+#
+# Clock support for Amlogic platforms
+#
+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
+# end of Clock support for Amlogic platforms
+
+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_CAMCC_7180=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_SDX_GCC_55=m
+CONFIG_SM_DISPCC_8250=m
+CONFIG_SM_GCC_8150=m
+CONFIG_SM_GCC_8250=m
+CONFIG_SM_GPUCC_8150=m
+CONFIG_SM_GPUCC_8250=m
+CONFIG_SM_VIDEOCC_8150=m
+CONFIG_SM_VIDEOCC_8250=m
+CONFIG_SPMI_PMIC_CLKDIV=m
+CONFIG_QCOM_HFPLL=m
+# CONFIG_KPSS_XCC is not set
+CONFIG_CLK_GFM_LPASS_SM8250=m
+CONFIG_COMMON_CLK_ROCKCHIP=y
+CONFIG_CLK_PX30=y
+CONFIG_CLK_RK3308=y
+CONFIG_CLK_RK3328=y
+CONFIG_CLK_RK3368=y
+CONFIG_CLK_RK3399=y
+CONFIG_COMMON_CLK_SAMSUNG=y
+CONFIG_EXYNOS_ARM64_COMMON_CLK=y
+CONFIG_EXYNOS_AUDSS_CLK_CON=m
+CONFIG_EXYNOS_CLKOUT=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_A100_CCU=y
+CONFIG_SUN50I_A100_R_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_ARM_MHU_V2=m
+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_IOASID=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_IOMMU_SVA_LIB=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_ARM_SMMU_V3_SVA=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_NS=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
+CONFIG_SOUNDWIRE_QCOM=m
+
+#
+# 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
+# end of Amlogic 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
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# MediaTek SoC drivers
+#
+CONFIG_MTK_CMDQ=m
+CONFIG_MTK_DEVAPC=m
+CONFIG_MTK_INFRACFG=y
+CONFIG_MTK_PMIC_WRAP=m
+CONFIG_MTK_SCPSYS=y
+CONFIG_MTK_SCPSYS_PM_DOMAINS=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_CPR=m
+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_IODOMAIN=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_SOC_SAMSUNG=y
+CONFIG_EXYNOS_CHIPID=y
+CONFIG_EXYNOS_PMU=y
+CONFIG_EXYNOS_PM_DOMAINS=y
+CONFIG_SUNXI_MBUS=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_ARCH_TEGRA_234_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_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+CONFIG_ARM_PL172_MPMC=m
+CONFIG_BRCMSTB_DPFE=y
+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_ADXRS290=m
+# 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_HDC2010=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_AS73211=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_ATMEL_TCB=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_DWC=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_KEEMBAY=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_SL28CPLD=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
+CONFIG_MST_IRQ=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_RASPBERRYPI=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_USB_LGM_PHY=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_MESON_AXG_MIPI_DPHY=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_MTK_HDMI=m
+CONFIG_PHY_MTK_MIPI_DSI=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_DPHY_RX0=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_INTEL_KEEMBAY_EMMC=m
+CONFIG_PHY_INTEL_KEEMBAY_USB=m
+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_CMN=m
+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_ARM_DMC620_PMU=m
+CONFIG_HISI_PMU=y
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# 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_HMEM_DEVICES=y
+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_INTERCONNECT_SAMSUNG=y
+CONFIG_INTERCONNECT_EXYNOS=m
+# 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_SUPPORT_V4=y
+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_FUSE_DAX=y
+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_DEFAULT_KMSG_BYTES=10240
+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_NFS_V4_2_READ_PLUS is not set
+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_SWN_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_IMA_SECURE_AND_OR_TRUSTED_BOOT 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_SM2=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_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
+
+#
+# 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_CE_HASH=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_SS=m
+# CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG is not set
+CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_SS_HASH=y
+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_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_HISI_TRNG=m
+CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
+CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4=m
+CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4_ECB=y
+CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4_CTS=y
+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=y
+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_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
+CONFIG_DMA_PERNUMA_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_DMA_MAP_BENCHMARK 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_FONT_6x8 is not set
+CONFIG_SG_SPLIT=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_STACKDEPOT=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+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_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_DEBUG_INFO_BTF_MODULES=y
+# CONFIG_GDB_SCRIPTS is not set
+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_HONOUR_BLOCKLIST=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_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_HAVE_ARCH_KASAN_HW_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
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG 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_SCALE_TEST is not set
+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_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 is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS 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_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_ETM4X_IMPDEF_FEATURE is not set
+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_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.11/files/i386-dotconfig b/srcpkgs/linux5.11/files/i386-dotconfig
new file mode 100644
index 000000000000..a87f89e7f5c8
--- /dev/null
+++ b/srcpkgs/linux5.11/files/i386-dotconfig
@@ -0,0 +1,10027 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 5.11.1 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="i686-pc-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+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
+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_IRQ_MSI_IOMMU=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_LD_ORPHAN_WARN=y
+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_BPF_PRELOAD is not set
+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_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_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_ACPI_DPTF=y
+CONFIG_DPTF_POWER=m
+CONFIG_DPTF_PCH_FIVR=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_CONFIGFS=m
+# CONFIG_PMIC_OPREGION is not set
+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_STATIC_CALL_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=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+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_PUD=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
+CONFIG_HAVE_STATIC_CALL=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SPLIT_ARG64=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_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_HMM_MIRROR=y
+CONFIG_VMAP_PFN=y
+CONFIG_FRAME_VECTOR=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST 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
+CONFIG_KMAP_LOCAL=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_NFT_REJECT_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_BRIDGE_CFM is not set
+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_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=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_DEBUG is not set
+# 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
+CONFIG_CAN_ISOTP=m
+
+#
+# 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_PCI=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
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY 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 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_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_S3FWRN82_UART=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=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 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_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+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_AUXILIARY_BUS=y
+# 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_SOUNDWIRE=m
+CONFIG_REGMAP_I3C=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=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_RAW_NAND=m
+
+#
+# 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
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# 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_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+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
+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=3
+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_MULTIPATH_IOA=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_MHI_NET=m
+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_HIRSCHMANN_HELLCREEK 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_MSCC_SEVILLE 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=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_AQTION is not set
+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_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_CHELSIO_TLS_DEVICE=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_PRESTERA=m
+CONFIG_PRESTERA_PCI=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 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_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=m
+# CONFIG_SFP is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=y
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+# CONFIG_CORTINA_PHY is not set
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_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_DP83822_PHY=m
+# CONFIG_DP83TC811_PHY is not set
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_MVUSB is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
+
+#
+# MDIO Multiplexers
+#
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+# end of PCS device drivers
+
+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_USB_RTL8153_ECM=m
+CONFIG_WLAN=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_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING 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
+# 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_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_ADC=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_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_TOUCHSCREEN_ZINITIX=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_DA7280_HAPTICS 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_F3A=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_BCM63XX=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_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_HW_RANDOM_XIPHERA=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_SLAVE_TESTUNIT=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_MIPI_I3C_HCI=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
+CONFIG_PTP_1588_CLOCK_OCP=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=y
+CONFIG_PINCTRL_ALDERLAKE=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+CONFIG_PINCTRL_ELKHARTLAKE=m
+CONFIG_PINCTRL_EMMITSBURG=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_JASPERLAKE=m
+CONFIG_PINCTRL_LAKEFIELD=m
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+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_CDEV=y
+CONFIG_GPIO_CDEV_V1=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
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+# end of Virtual GPIO drivers
+
+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_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_BQ25980=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_CORSAIR_PSU=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_LTC2992=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_MAX127=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_MR75203=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_ADM1266=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_MP2975=m
+CONFIG_SENSORS_PM6764TR=m
+# CONFIG_SENSORS_PXE1610 is not set
+CONFIG_SENSORS_Q54SJ108A2=m
+# 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_SBTSI=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
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+
+#
+# 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_INTEL_PMT=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
+CONFIG_MFD_INTEL_M10_BMC=m
+# 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_MT6360=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=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_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RTMV20=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
+# CONFIG_DVB_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_OV02A10 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_OV9734 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_CCS 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_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_HDCP is not set
+CONFIG_DRM_AMD_DC_SI=y
+# 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_KTD253=m
+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_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=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_FSL_XCVR=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_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_CATPT=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_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=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_ALDERLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ALDERLAKE=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_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
+
+#
+# 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_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=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_CS4234=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_MAX98373_SDW=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_PCM5102A=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_RT1011=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
+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_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
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIMPLE_MUX 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_TAS2764 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_WSA881X=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_NAU8315=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
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=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_VIVALDI=m
+# 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_FEW_INIT_RETRIES is not set
+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_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_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_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
+CONFIG_TYPEC_STUSB160X=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_LP50XX=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
+
+#
+# Flash and Torch LED drivers
+#
+# CONFIG_LEDS_RT8515 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_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_RV3032=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_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
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# 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_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+# 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_LCD2S=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_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_NITRO_ENCLAVES=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_VIRTIO_DMA_SHARED_BUFFER=m
+# CONFIG_VDPA is not set
+CONFIG_VHOST_IOTLB=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_ZORAN is not set
+CONFIG_VIDEO_IPU3_IMGU=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_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+CONFIG_WFX=m
+CONFIG_SPMI_HISI3670=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_AMD_PMC=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_SYSMAN=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_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_PMT_CLASS=m
+CONFIG_INTEL_PMT_TELEMETRY=m
+CONFIG_INTEL_PMT_CRASHLOG=m
+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_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_SURFACE_PLATFORMS=y
+CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_POWER_OPREGION is not set
+CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+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_IOMMU_DMA=y
+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_NS=m
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+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
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic 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
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# 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_EXTCON_USBC_TUSB320=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_MEDIATEK_MT6360_ADC=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_ADXRS290=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_HDC2010=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_AS73211=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_DWC=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_USB_LGM_PHY=m
+# 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_LGM_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
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# 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
+CONFIG_MOST_CDEV=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_SUPPORT_V4=y
+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_DEFAULT_KMSG_BYTES=10240
+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_NFS_V4_2_READ_PLUS is not set
+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_SWN_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_SM2=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=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_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_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
+
+#
+# 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_4XXX=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_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_DMA_MAP_BENCHMARK 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_FONT_6x8 is not set
+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_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_DEBUG_INFO_BTF_MODULES=y
+# CONFIG_GDB_SCRIPTS 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_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_KMAP_LOCAL is not set
+CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
+# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP 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
+# CONFIG_SCF_TORTURE_TEST 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=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_SCALE_TEST is not set
+# 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_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS 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_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.11/files/mv-debug b/srcpkgs/linux5.11/files/mv-debug
new file mode 100755
index 000000000000..8898c928d119
--- /dev/null
+++ b/srcpkgs/linux5.11/files/mv-debug
@@ -0,0 +1,7 @@
+#!/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.11/files/ppc-dotconfig b/srcpkgs/linux5.11/files/ppc-dotconfig
new file mode 100644
index 000000000000..c794bedc6209
--- /dev/null
+++ b/srcpkgs/linux5.11/files/ppc-dotconfig
@@ -0,0 +1,8137 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/powerpc 5.11.1 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="powerpc-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+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
+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_LD_ORPHAN_WARN=y
+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_PRELOAD is not set
+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
+
+#
+# Processor support
+#
+CONFIG_PPC_BOOK3S_32=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+CONFIG_PPC_BOOK3S_603=y
+CONFIG_PPC_BOOK3S_604=y
+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_REGS=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_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=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_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=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+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_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
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=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=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_TEST is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_KMAP_LOCAL=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_NFT_REJECT_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_BRIDGE_CFM is not set
+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_DEBUG is not set
+# 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
+# CONFIG_CAN_ISOTP 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
+# CONFIG_CAN_MCP251XFD 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_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_MSI_ARCH_FALLBACKS=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_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER 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_AUXILIARY_BUS=y
+# 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
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=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_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_HISI_HIKEY_USB=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
+# 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_MULTIPATH_IOA=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_MHI_NET=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_AQTION is not set
+# 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_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+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_PHYLINK=m
+CONFIG_PHYLIB=m
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=m
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+# CONFIG_BCM7XXX_PHY is not set
+CONFIG_BCM84881_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+# CONFIG_INTEL_XWAY_PHY is not set
+CONFIG_LSI_ET1011C_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_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+# CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_BUS=m
+CONFIG_OF_MDIO=m
+CONFIG_MDIO_DEVRES=m
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_IPQ4019=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+# 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_USB_RTL8153_ECM=m
+CONFIG_WLAN=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 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_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING 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
+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_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_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_ADC=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_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_TOUCHSCREEN_ZINITIX=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_REGULATOR_HAPTIC=m
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_DA7280_HAPTICS 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_F3A=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_BCM63XX=m
+# 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_HW_RANDOM_XIPHERA=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_MIPI_I3C_HCI is not set
+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
+CONFIG_PTP_1588_CLOCK_OCP=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_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+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
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+# CONFIG_GPIO_MOCKUP is not set
+# end of Virtual GPIO drivers
+
+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_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_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_ISP1704=m
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+CONFIG_CHARGER_MANAGER=m
+# 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_BQ24190 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_BQ25980 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_CHARGER_RT9455 is not set
+# CONFIG_CHARGER_UCS1002 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_CORSAIR_PSU=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_LTC2992=m
+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_MAX127=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_MR75203 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_SBTSI=m
+# 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_INTEL_PMT is not set
+# 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
+# CONFIG_MFD_INTEL_M10_BMC 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 is not set
+# CONFIG_REGULATOR_ACT8865 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_DA9121 is not set
+# 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 is not set
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77650 is not set
+# 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 is not set
+# CONFIG_REGULATOR_MP5416 is not set
+# CONFIG_REGULATOR_MP8859 is not set
+# 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_PF8X00 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_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_STPMIC1 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
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VCTRL 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
+# CONFIG_DVB_TEST_DRIVERS 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_OV02A10 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_CCS 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_ABT_Y030XX067A=m
+# 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_SHARP_LS037V7DW01 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_TD043MTEA1=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_LONTIUM_LT9611 is not set
+CONFIG_DRM_LONTIUM_LT9611UXC=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_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_ANALOGIX_ANX7625 is not set
+# CONFIG_DRM_I2C_ADV7511 is not set
+# CONFIG_DRM_CDNS_MHDP8546 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_KTD253=m
+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_VIVALDI=m
+# 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_FEW_INIT_RETRIES is not set
+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_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_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_USB_PHY=y
+# 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_LP50XX 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_REGULATOR=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
+
+#
+# Flash and Torch LED drivers
+#
+
+#
+# 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_RV3032=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_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
+# CONFIG_RTC_DRV_RX6110 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_RTC_DRV_GOLDFISH=m
+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_VIRTIO_DMA_SHARED_BUFFER=m
+# CONFIG_VDPA is not set
+CONFIG_VHOST_IOTLB=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_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+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_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
+
+#
+# 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
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# 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=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_TUSB320=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 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
+# CONFIG_IIO_TRIGGERED_EVENT 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_CC10001_ADC=m
+# 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_ADXRS290 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_HDC2010 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_AS73211 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_USB_LGM_PHY=m
+# 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
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# 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_SUPPORT_V4=y
+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_DEFAULT_KMSG_BYTES=10240
+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_NFS_V4_2_READ_PLUS is not set
+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_SWN_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_SM2=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=m
+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_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
+
+#
+# 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_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_LINEAR_RANGES=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_NEED_SG_DMA_LENGTH=y
+CONFIG_DMA_DECLARE_COHERENT=y
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK 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_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=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_PAHOLE_HAS_SPLIT_BTF=y
+# CONFIG_GDB_SCRIPTS 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_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_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_KMAP_LOCAL 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
+# CONFIG_SCF_TORTURE_TEST 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_SCALE_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_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 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_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS 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_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.11/files/ppc64-dotconfig b/srcpkgs/linux5.11/files/ppc64-dotconfig
new file mode 100644
index 000000000000..617632c17022
--- /dev/null
+++ b/srcpkgs/linux5.11/files/ppc64-dotconfig
@@ -0,0 +1,10104 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/powerpc 5.11.1 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="powerpc64-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+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
+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_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_LD_ORPHAN_WARN=y
+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_BPF_PRELOAD is not set
+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_REGS=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_PPC_PKEY=y
+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_NEED_PER_CPU_PAGE_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_GENERIC_BUG_RELATIVE_POINTERS=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_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_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=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+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
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=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_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_TEST 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_NFT_REJECT_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_BRIDGE_CFM is not set
+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_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=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_DEBUG is not set
+# 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
+# CONFIG_CAN_ISOTP 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_PCI=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
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY 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 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_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_S3FWRN82_UART=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_MSI_ARCH_FALLBACKS=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_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER 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_AUXILIARY_BUS=y
+# 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_REGMAP_SPI_AVMM=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
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=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_RAW_NAND=m
+
+#
+# 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
+CONFIG_MTD_NAND_INTEL_LGM=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
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# 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_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+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_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_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+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_HISI_HIKEY_USB is not set
+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
+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=3
+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_MULTIPATH_IOA=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_MHI_NET=m
+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_HIRSCHMANN_HELLCREEK=m
+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_MSCC_SEVILLE 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_AQTION=m
+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_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+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_PRESTERA=m
+CONFIG_PRESTERA_PCI=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 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_DWMAC_INTEL_PLAT=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_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+# CONFIG_BCM84881_PHY is not set
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_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_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_OF_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_IPQ4019=m
+# CONFIG_MDIO_IPQ8064 is not set
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+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_USB_RTL8153_ECM=m
+CONFIG_WLAN=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_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_DEBUGFS is not set
+# CONFIG_ATH11K_TRACING 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
+# 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_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_ADC=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_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_TOUCHSCREEN_ZINITIX=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_DA7280_HAPTICS=m
+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_F3A=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_BCM63XX=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_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_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_HW_RANDOM_XIPHERA=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_SLAVE_TESTUNIT 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_MIPI_I3C_HCI is not set
+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
+CONFIG_PTP_1588_CLOCK_OCP=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_MICROCHIP_SGPIO is not set
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+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_CDEV=y
+CONFIG_GPIO_CDEV_V1=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
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+# end of Virtual GPIO drivers
+
+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_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_REGULATOR 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_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_BQ25980=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_RN5T618_POWER=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_CORSAIR_PSU=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_LTC2992=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_MAX127=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_MR75203=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_ADM1266=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_MP2975=m
+CONFIG_SENSORS_PM6764TR=m
+# CONFIG_SENSORS_PXE1610 is not set
+CONFIG_SENSORS_Q54SJ108A2=m
+# 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_SBTSI=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_SENSORS_INTEL_M10_BMC_HWMON=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=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_INTEL_PMT=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
+CONFIG_MFD_INTEL_M10_BMC=m
+# 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_DA9121=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_MT6360=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PF8X00=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_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RN5T618=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RTMV20=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
+# CONFIG_DVB_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_OV02A10 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_CCS 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_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_DRM_AMD_DC_SI=y
+# 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_ABT_Y030XX067A=m
+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_NT36672A=m
+CONFIG_DRM_PANEL_NOVATEK_NT39016=m
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=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_SAMSUNG_SOFEF00=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_TDO_TL070WSH30=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_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=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_TC358762=m
+CONFIG_DRM_TOSHIBA_TC358764=m
+CONFIG_DRM_TOSHIBA_TC358767=m
+CONFIG_DRM_TOSHIBA_TC358768=m
+CONFIG_DRM_TOSHIBA_TC358775=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_ANALOGIX_ANX7625=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_I2C_ADV7511_CEC=y
+CONFIG_DRM_CDNS_MHDP8546=m
+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_KTD253=m
+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_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=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=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_FSL_XCVR=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_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=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_CS4234=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_PCM5102A=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_SIMPLE_MUX 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_TAS2764=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_NAU8315=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
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=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_VIVALDI=m
+# 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_FEW_INIT_RETRIES is not set
+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_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_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_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
+CONFIG_TYPEC_STUSB160X=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_LP50XX=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
+
+#
+# Flash and Torch LED drivers
+#
+# CONFIG_LEDS_RT8515 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_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_RV3032=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_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
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# 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_RTC_DRV_GOLDFISH=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_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+CONFIG_HD44780=m
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_HT16K33=m
+CONFIG_LCD2S=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_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_VIRTIO_DMA_SHARED_BUFFER=m
+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=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_ZORAN is not set
+
+#
+# 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_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+CONFIG_WFX=m
+CONFIG_SPMI_HISI3670=m
+CONFIG_MFD_HI6421_SPMI=m
+CONFIG_REGULATOR_HI6421V600=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_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_NS=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
+
+#
+# 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
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# 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_EXTCON_USBC_TUSB320=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_MEDIATEK_MT6360_ADC=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_ADXRS290=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_HDC2010=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_AS73211=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_ATMEL_TCB=m
+CONFIG_PWM_DWC=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_USB_LGM_PHY=m
+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
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# 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
+CONFIG_MOST_CDEV=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_SUPPORT_V4=y
+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_FUSE_DAX=y
+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_DEFAULT_KMSG_BYTES=10240
+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_NFS_V4_2_READ_PLUS is not set
+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_SWN_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_SM2=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
+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 is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+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_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
+
+#
+# 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_NX=y
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=y
+CONFIG_CRYPTO_DEV_NX_COMPRESS=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+CONFIG_CRYPTO_DEV_VMX=y
+CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_CCREE=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_CORDIC=m
+CONFIG_PRIME_NUMBERS=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=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_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_DMA_OPS_BYPASS=y
+CONFIG_ARCH_HAS_DMA_MAP_DIRECT=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_FORCE_DMA_UNENCRYPTED=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=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_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=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_FONT_6x8 is not set
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_COPY_MC=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_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_PAHOLE_HAS_SPLIT_BTF=y
+# CONFIG_GDB_SCRIPTS is not set
+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 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=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_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+# 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_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_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
+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 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
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG 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=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_SCALE_TEST is not set
+# 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_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_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 is not set
+# 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 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 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_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+CONFIG_PREEMPTIRQ_DELAY_TEST=m
+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 is not set
+CONFIG_PPC_WERROR=y
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_HCALL_STATS is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_JUMP_LABEL_FEATURE_CHECKS 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_BOOTX_TEXT=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+# CONFIG_PPC_PTDUMP is not set
+# CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
+# end of powerpc 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=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 is not set
+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_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_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.11/files/ppc64le-dotconfig b/srcpkgs/linux5.11/files/ppc64le-dotconfig
new file mode 100644
index 000000000000..8deca7091036
--- /dev/null
+++ b/srcpkgs/linux5.11/files/ppc64le-dotconfig
@@ -0,0 +1,9835 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/powerpc 5.11.1 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="powerpc64le-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+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
+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_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 is not set
+# 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_LD_ORPHAN_WARN=y
+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_BPF_PRELOAD is not set
+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_POWER7_CPU is not set
+# CONFIG_POWER8_CPU is not set
+# CONFIG_POWER9_CPU is not set
+CONFIG_PPC_BOOK3S=y
+CONFIG_PPC_FPU_REGS=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_PPC_PKEY=y
+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 is not set
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_PPC64_BOOT_WRAPPER=y
+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_NEED_PER_CPU_PAGE_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_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_EPAPR_BOOT=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_NONZERO_CPU=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_PAPR_SCM=m
+CONFIG_PPC_SVM=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 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_RTAS_FLASH=m
+CONFIG_EEH=y
+CONFIG_PPC_P7_NAP=y
+CONFIG_PPC_BOOK3S_IDLE=y
+CONFIG_PPC_INDIRECT_PIO=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_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_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_MPROFILE_KERNEL=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_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_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_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
+# 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
+CONFIG_HAVE_LIVEPATCH=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_KPROBES_ON_FTRACE=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=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+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_RELIABLE_STACKTRACE=y
+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
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=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_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_TEST 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_NFT_REJECT_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_BRIDGE_CFM is not set
+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_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=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_DEBUG is not set
+# 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
+# CONFIG_CAN_ISOTP 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_PCI=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
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+CONFIG_CAN_MCP251X=m
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY 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 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_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_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_S3FWRN82_UART=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_MSI_ARCH_FALLBACKS=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_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER 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 is not set
+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_AUXILIARY_BUS=y
+# 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=m
+CONFIG_SIMPLE_PM_BUS=y
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=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 is not set
+# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
+CONFIG_MTD_PCI=m
+# 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_RAW_NAND=m
+
+#
+# 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_MXIC=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+# CONFIG_MTD_NAND_CADENCE is not set
+CONFIG_MTD_NAND_ARASAN=m
+CONFIG_MTD_NAND_INTEL_LGM=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
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# 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_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
+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_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_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_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+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_HISI_HIKEY_USB is not set
+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
+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_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_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_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=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_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_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 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_MULTIPATH_IOA=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_MAC_EMUMOUSEBTN=m
+CONFIG_WINDFARM=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_MHI_NET=m
+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_HIRSCHMANN_HELLCREEK=m
+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_MSCC_SEVILLE 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_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_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+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_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+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_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_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_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 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=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 is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=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 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_NE2K_PCI=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=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_DWC_QOS_ETH is not set
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_INTEL_PLAT=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_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=y
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_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_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_OF_MDIO=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
+# CONFIG_MDIO_MVUSB is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_IPQ4019=m
+# CONFIG_MDIO_IPQ8064 is not set
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+# end of PCS device drivers
+
+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_USB_RTL8153_ECM=m
+CONFIG_WLAN=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_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_DEBUGFS is not set
+# CONFIG_ATH11K_TRACING 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
+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_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 is not set
+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_MAC80211_HWSIM is not set
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+# 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_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=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_ADC=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_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_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_TOUCHSCREEN_ZINITIX=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_DA7280_HAPTICS 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_F3A=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_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+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_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_FSL=y
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# 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_ICOM=m
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SIFIVE=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+# CONFIG_SERIAL_SC16IS7XX is not set
+CONFIG_SERIAL_BCM63XX=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_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=m
+CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
+# CONFIG_SERIAL_MEN_Z135 is not set
+CONFIG_SERIAL_SPRD=m
+# 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_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_BA431=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_PSERIES=m
+CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_HW_RANDOM_CCTRNG=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+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 is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+CONFIG_I2C_NVIDIA_GPU=m
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# 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_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_SLAVE_TESTUNIT 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_MIPI_I3C_HCI=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 is not set
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_XCOMM=m
+# CONFIG_SPI_XILINX is not set
+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
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_OCP=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_MICROCHIP_SGPIO is not set
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+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_CDEV=y
+CONFIG_GPIO_CDEV_V1=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
+CONFIG_GPIO_MOXTET=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+# end of Virtual GPIO drivers
+
+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_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_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_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_BQ25980=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_RN5T618_POWER=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_CORSAIR_PSU=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 is not set
+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_LTC2992=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_MAX127=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_MR75203=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_ADM1266=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_MP2975=m
+CONFIG_SENSORS_PM6764TR=m
+# CONFIG_SENSORS_PXE1610 is not set
+CONFIG_SENSORS_Q54SJ108A2=m
+# 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_SBTSI=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHTC1=m
+# CONFIG_SENSORS_SIS5595 is not set
+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_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_INTEL_PMT is not set
+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
+# CONFIG_MFD_INTEL_M10_BMC 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_DA9121=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_MT6360=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PF8X00=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_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RN5T618=m
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RTMV20=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
+# CONFIG_DVB_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_OV02A10 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_CCS 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_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_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_DRM_AMD_DC_SI=y
+# 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_ABT_Y030XX067A=m
+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_NT36672A=m
+CONFIG_DRM_PANEL_NOVATEK_NT39016=m
+CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=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_SAMSUNG_SOFEF00=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_TDO_TL070WSH30=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_LONTIUM_LT9611=m
+CONFIG_DRM_LONTIUM_LT9611UXC=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_TC358762=m
+CONFIG_DRM_TOSHIBA_TC358764=m
+CONFIG_DRM_TOSHIBA_TC358767=m
+CONFIG_DRM_TOSHIBA_TC358768=m
+CONFIG_DRM_TOSHIBA_TC358775=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_ANALOGIX_ANX7625=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_I2C_ADV7511_CEC=y
+CONFIG_DRM_CDNS_MHDP8546=m
+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_MXSFB 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_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_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_MACMODES=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_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 is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# 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_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_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_KTD253=m
+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_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 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=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_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=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=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_FSL_XCVR=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_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=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_CS4234=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_PCM5102A=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_SIMPLE_MUX 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_TAS2764=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_NAU8315 is not set
+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
+CONFIG_SND_SOC_LPASS_WSA_MACRO=m
+CONFIG_SND_SOC_LPASS_VA_MACRO=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 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=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 is not set
+CONFIG_HID_VIVALDI=m
+# 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_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_FEW_INIT_RETRIES is not set
+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 is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+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_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_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_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_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_UCSI is not set
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_STUSB160X=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_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 is not set
+
+#
+# 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_LP50XX=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
+
+#
+# Flash and Torch LED drivers
+#
+# CONFIG_LEDS_RT8515 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_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_EFA=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_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_RV3032=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_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
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# 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_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_RTC_DRV_GOLDFISH=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 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_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+CONFIG_HD44780=m
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_HT16K33=m
+CONFIG_LCD2S=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_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_VIRTIO_DMA_SHARED_BUFFER=m
+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=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_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_ZORAN is not set
+
+#
+# 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_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+CONFIG_WFX=m
+CONFIG_SPMI_HISI3670=m
+CONFIG_MFD_HI6421_SPMI=m
+CONFIG_REGULATOR_HI6421V600=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_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_NS=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
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# CONFIG_QUICC_ENGINE is not set
+CONFIG_FSL_GUTS=y
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# 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_EXTCON_USBC_TUSB320=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_MEDIATEK_MT6360_ADC=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_ADXRS290=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_HDC2010=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=m
+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_AS73211=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_ATMEL_TCB=m
+CONFIG_PWM_DWC=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_USB_LGM_PHY=m
+# CONFIG_BCM_KONA_USB2_PHY is not set
+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
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# 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
+CONFIG_MOST_CDEV=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_SUPPORT_V4=y
+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_FUSE_DAX=y
+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_DEFAULT_KMSG_BYTES=10240
+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_NFS_V4_2_READ_PLUS is not set
+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_SWN_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=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=m
+CONFIG_CRYPTO_NULL=m
+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_SM2=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=m
+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=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
+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_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
+
+#
+# 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_NX=y
+CONFIG_CRYPTO_DEV_NX_COMPRESS=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
+CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
+# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
+# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+CONFIG_CRYPTO_DEV_VMX=y
+CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_CCREE=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_CORDIC=m
+CONFIG_PRIME_NUMBERS=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=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_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_DMA_OPS_BYPASS=y
+CONFIG_ARCH_HAS_DMA_MAP_DIRECT=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_FORCE_DMA_UNENCRYPTED=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=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_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=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_FONT_6x8 is not set
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_COPY_MC=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_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_PAHOLE_HAS_SPLIT_BTF=y
+# CONFIG_GDB_SCRIPTS is not set
+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 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=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_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+# 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_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_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
+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 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
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG 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=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_SCALE_TEST is not set
+# 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_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_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_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=y
+# CONFIG_TRACER_SNAPSHOT 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 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_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+CONFIG_PREEMPTIRQ_DELAY_TEST=m
+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 is not set
+CONFIG_PPC_WERROR=y
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_HCALL_STATS is not set
+# CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_JUMP_LABEL_FEATURE_CHECKS 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_BOOTX_TEXT=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+# CONFIG_PPC_PTDUMP is not set
+# CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
+# end of powerpc 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=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 is not set
+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_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_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.11/files/x86_64-dotconfig b/srcpkgs/linux5.11/files/x86_64-dotconfig
new file mode 100644
index 000000000000..729170cafe01
--- /dev/null
+++ b/srcpkgs/linux5.11/files/x86_64-dotconfig
@@ -0,0 +1,10226 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86_64 5.11.1 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_IS_GCC=y
+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
+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_IRQ_MSI_IOMMU=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_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_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_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_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=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 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_LD_ORPHAN_WARN=y
+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_HAVE_ARCH_USERFAULTFD_WP=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=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_USERMODE_DRIVER=y
+CONFIG_BPF_PRELOAD=y
+CONFIG_BPF_PRELOAD_UMD=m
+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_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+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_GENERIC_BUG_RELATIVE_POINTERS=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_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
+CONFIG_X86_CPU_RESCTRL=y
+# 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_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_XXL=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+CONFIG_XEN=y
+CONFIG_XEN_PV=y
+CONFIG_XEN_512GB=y
+CONFIG_XEN_PV_SMP=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
+CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_KVM_GUEST=y
+CONFIG_ARCH_CPUIDLE_HALTPOLL=y
+CONFIG_PVH=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_JAILHOUSE_GUEST is not set
+# CONFIG_ACRN_GUEST is not set
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+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_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=512
+CONFIG_NR_CPUS_DEFAULT=64
+CONFIG_NR_CPUS=256
+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_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_16BIT is not set
+CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_X86_IOPL_IOPERM=y
+CONFIG_I8K=m
+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_X86_5LEVEL is not set
+CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_X86_CPA_STATISTICS is not set
+# CONFIG_AMD_MEM_ENCRYPT is not set
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+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_MEMORY_PROTECTION_KEYS=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_X86_SGX is not set
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_MIXED=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_KEXEC_FILE is not set
+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_DYNAMIC_MEMORY_LAYOUT=y
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+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_LEGACY_VSYSCALL_EMULATE is not set
+# CONFIG_LEGACY_VSYSCALL_XONLY is not set
+CONFIG_LEGACY_VSYSCALL_NONE=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+CONFIG_HAVE_LIVEPATCH=y
+# end of Processor type and features
+
+CONFIG_ARCH_HAS_ADD_PAGES=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=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_LPIT=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=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=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_MEMORY=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_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_HMAT=y
+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_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_DPTF=y
+CONFIG_DPTF_POWER=m
+CONFIG_DPTF_PCH_FIVR=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_ADXL=y
+CONFIG_ACPI_CONFIGFS=m
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_X86_PM_TIMER=y
+CONFIG_SFI=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_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_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# 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_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_MMCONF_FAM10H=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_ISA_BUS is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+# CONFIG_X86_SYSFB is not set
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_IA32_EMULATION=y
+# CONFIG_X86_X32 is not set
+CONFIG_COMPAT_32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+# end of Binary Emulations
+
+#
+# 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 is not set
+# 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_SOFT_RESERVE=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=m
+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_KVM_COMPAT=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_AMD_SEV=y
+# 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_STATIC_CALL_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_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_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+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_CONTEXT_TRACKING=y
+CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=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_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_HAVE_STACK_VALIDATION=y
+CONFIG_HAVE_RELIABLE_STACKTRACE=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_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_HAVE_STATIC_CALL=y
+CONFIG_HAVE_STATIC_CALL_INLINE=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=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_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_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_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_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_CONTIG_ALLOC=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_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+# CONFIG_HWPOISON_INJECT is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_THP_SWAP=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+# 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_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 is not set
+CONFIG_VMAP_PFN=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_TEST is not set
+# 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_WANT_COMPAT_NETLINK_MESSAGES=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=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_USER_COMPAT=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_NFT_REJECT_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=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_BRIDGE_CFM is not set
+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_HELLCREEK is not set
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=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_DEBUG is not set
+# 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=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 is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+# CONFIG_CAN_J1939 is not set
+CONFIG_CAN_ISOTP=m
+
+#
+# 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_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_PCI is not set
+# 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
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY 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 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_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_XEN is not set
+# 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_S3FWRN82_UART is not set
+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=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 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_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_HOTPLUG_PCI=y
+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
+#
+CONFIG_VMD=m
+CONFIG_PCI_HYPERV_INTERFACE=m
+
+#
+# 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_AUXILIARY_BUS=y
+# 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_HMEM_REPORTING=y
+CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+CONFIG_SYS_HYPERVISOR=y
+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_SOUNDWIRE=m
+CONFIG_REGMAP_I3C=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+# CONFIG_MHI_BUS_PCI_GENERIC is not set
+# 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_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=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
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# 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_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+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_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=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_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_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
+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
+
+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=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_BUSLOGIC=m
+# CONFIG_SCSI_FLASHPOINT is not set
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=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_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=3
+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_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_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 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_MULTIPATH_IOA is not set
+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 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_MHI_NET 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_HIRSCHMANN_HELLCREEK 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_MSCC_SEVILLE=m
+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=y
+CONFIG_AMD_XGBE_HAVE_ECC=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+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=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 is not set
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_CHELSIO_TLS_DEVICE=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_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=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=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 is not set
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=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 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=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH_LIB=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+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_NE2K_PCI=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 is not set
+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_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_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=m
+# CONFIG_SFP is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_ADIN_PHY is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=y
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+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_DP83822_PHY=m
+# CONFIG_DP83TC811_PHY is not set
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+# CONFIG_MDIO_MVUSB is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+CONFIG_PCS_LYNX=m
+# end of PCS device drivers
+
+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_USB_RTL8153_ECM is not set
+CONFIG_WLAN=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_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING 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 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_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
+# 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_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=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_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_ADC=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_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_TOUCHSCREEN_ZINITIX=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_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_DA7280_HAPTICS 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_XEN_KBDDEV_FRONTEND=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_F3A=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_BCM63XX 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_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_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_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=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_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+CONFIG_MWAVE=m
+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_XEN=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_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 is not set
+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_MLXCPLD=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+CONFIG_I2C_SLAVE_TESTUNIT=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_MIPI_I3C_HCI is not set
+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_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_KVM=y
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_VMW=m
+# CONFIG_PTP_1588_CLOCK_OCP is not set
+# 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_I2C=m
+CONFIG_PINCTRL_MCP23S08_SPI=m
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_LYNXPOINT=m
+CONFIG_PINCTRL_INTEL=y
+# CONFIG_PINCTRL_ALDERLAKE is not set
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+# CONFIG_PINCTRL_ELKHARTLAKE is not set
+CONFIG_PINCTRL_EMMITSBURG=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_JASPERLAKE=m
+# CONFIG_PINCTRL_LAKEFIELD is not set
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+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_CDEV=y
+CONFIG_GPIO_CDEV_V1=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_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_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_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
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+CONFIG_GPIO_MOCKUP=m
+# end of Virtual GPIO drivers
+
+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_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_BQ25980=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_CORSAIR_PSU is not set
+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_LTC2992 is not set
+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_MAX127 is not set
+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 is not set
+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_MR75203=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_ADM1266=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_MP2975=m
+# CONFIG_SENSORS_PM6764TR is not set
+# CONFIG_SENSORS_PXE1610 is not set
+# CONFIG_SENSORS_Q54SJ108A2 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_SBTSI is not set
+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
+CONFIG_SENSORS_XGENE=m
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=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_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
+CONFIG_PROC_THERMAL_MMIO_RAPL=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_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_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
+CONFIG_XEN_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_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_INTEL_PMT is not set
+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_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
+CONFIG_MFD_INTEL_M10_BMC=m
+# 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=m
+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_MT6360=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PCA9450=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=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_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_RTMV20=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=m
+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=m
+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_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
+# CONFIG_DVB_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 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_OV02A10 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_OV9734 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_CCS 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=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 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_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+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_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_HDCP is not set
+# CONFIG_DRM_AMD_DC_SI 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_I915=m
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+CONFIG_DRM_I915_GVT=y
+CONFIG_DRM_I915_GVT_KVMGT=m
+
+#
+# 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_XEN 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_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_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_XEN_FBDEV_FRONTEND=m
+# 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_KTD253=m
+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_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_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_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=0
+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_ADI is not set
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+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 is not set
+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_FSL_XCVR is not set
+# 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_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_CATPT=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+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_SSP_CLK=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=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+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=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+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_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
+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_BAYTRAIL_SUPPORT is not set
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=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=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
+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_ALDERLAKE_SUPPORT is not set
+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_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
+
+#
+# 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_ADAU1372_I2C is not set
+# CONFIG_SND_SOC_ADAU1372_SPI is not set
+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=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 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_CS4234=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=m
+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=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_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=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
+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_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_PCM5102A 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_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
+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_RT5663=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_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
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIMPLE_MUX 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_TAS2764 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_WSA881X=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_NAU8315 is not set
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_TPA6130A2=m
+# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# 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_SND_XEN_FRONTEND is not set
+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=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 is not set
+CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_VIVALDI=m
+# 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
+
+#
+# Intel ISH HID support
+#
+CONFIG_INTEL_ISH_HID=m
+CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
+# end of Intel ISH HID support
+
+#
+# AMD SFH HID Support
+#
+# CONFIG_AMD_SFH_HID is not set
+# end of AMD SFH 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_FEW_INIT_RETRIES is not set
+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_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_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_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 is not set
+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
+CONFIG_TYPEC_STUSB160X=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=m
+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_LP50XX=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_MENF21BMC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+# CONFIG_LEDS_TI_LMU_COMMON is not set
+CONFIG_LEDS_TPS6105X=m
+CONFIG_LEDS_SGM3140=m
+
+#
+# Flash and Torch LED drivers
+#
+# CONFIG_LEDS_RT8515 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_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_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=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=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_HFI1=m
+# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
+# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_INFINIBAND_RDMAVT=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_INFINIBAND_OPA_VNIC is not set
+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=y
+CONFIG_EDAC_E752X=m
+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_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_I10NM=m
+CONFIG_EDAC_PND2=m
+# CONFIG_EDAC_IGEN6 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=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_RV3032=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_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
+CONFIG_RTC_DRV_RX6110=m
+
+#
+# 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_INTEL_IDXD=m
+# CONFIG_INTEL_IDXD_SVM is not set
+CONFIG_INTEL_IOATDMA=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_HSU_DMA=m
+# CONFIG_SF_PDMA is not set
+
+#
+# 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 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_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+# 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_LCD2S is not set
+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_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_NITRO_ENCLAVES=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+# CONFIG_VIRTIO_PMEM is not set
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MEM=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+# CONFIG_VDPA is not set
+CONFIG_VHOST_IOTLB=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
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GNTDEV_DMABUF=y
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_XEN_GRANT_DMA_ALLOC=y
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_UNPOPULATED_ALLOC=y
+# end of Xen driver 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_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_ZORAN is not set
+CONFIG_VIDEO_IPU3_IMGU=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
+#
+CONFIG_STAGING_GASKET_FRAMEWORK=m
+CONFIG_STAGING_APEX_DRIVER=m
+# end of Gasket devices
+
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
+CONFIG_QLGE=m
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+CONFIG_WFX=m
+CONFIG_SPMI_HISI3670=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_AMD_PMC is not set
+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_SYSMAN is not set
+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_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_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=m
+CONFIG_TOUCHSCREEN_DMI=y
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+
+#
+# Intel Speed Select Technology interface support
+#
+# CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
+# end of Intel Speed Select Technology interface support
+
+# CONFIG_INTEL_TURBO_MAX_3 is not set
+CONFIG_INTEL_UNCORE_FREQ_CONTROL=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_PMT_CLASS is not set
+# CONFIG_INTEL_PMT_TELEMETRY is not set
+# CONFIG_INTEL_PMT_CRASHLOG is not set
+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_INTEL_TELEMETRY=m
+CONFIG_PMC_ATOM=y
+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_ISHTP is not set
+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_SURFACE_PLATFORMS=y
+CONFIG_SURFACE3_WMI=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+# CONFIG_SURFACE_GPE is not set
+CONFIG_SURFACE_PRO3_BUTTON=m
+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=m
+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_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PCC=y
+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_IOMMU_DMA=y
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+CONFIG_INTEL_IOMMU_DEFAULT_ON=y
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+CONFIG_IRQ_REMAP=y
+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_NS=m
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+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
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic 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
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# 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_EXTCON_USBC_TUSB320 is not set
+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 is not set
+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_MEDIATEK_MT6360_ADC is not set
+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 is not set
+# 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 is not set
+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_ADXRS290=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_HDC2010=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 is not set
+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 is not set
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_AS73211=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=m
+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=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_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 is not set
+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_AMD=m
+# CONFIG_NTB_IDT is not set
+CONFIG_NTB_INTEL=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_CROS_EC=m
+# CONFIG_PWM_DWC is not set
+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_USB_LGM_PHY=m
+# 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_LGM_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_RAS_CEC is not set
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# 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_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_HMEM=m
+CONFIG_DEV_DAX_HMEM_DEVICES=y
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=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=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=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 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
+#
+CONFIG_AMDTEE=m
+# 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_UNISYS_VISORBUS is not set
+# 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
+CONFIG_MOST_CDEV=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_SUPPORT_V4=y
+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_FUSE_DAX=y
+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_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_TMPFS_INODE64=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=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_DEFAULT_KMSG_BYTES=10240
+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_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_NFS_V4_2_READ_PLUS is not set
+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_SWN_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_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 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_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
+# CONFIG_EVM 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=m
+CONFIG_CRYPTO_NULL=m
+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_GLUE_HELPER_X86=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_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_CURVE25519_X86=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_AEGIS128_AESNI_SSE2 is not set
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+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=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=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_BLAKE2S_X86=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_POLY1305_X86_64=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_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=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
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=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_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+# CONFIG_CRYPTO_SM4 is not set
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+
+#
+# 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_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
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=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_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+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_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=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_SP_PSP=y
+# 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_4XXX is not set
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
+CONFIG_CRYPTO_DEV_CHELSIO=m
+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_USE_CMPXCHG_LOCKREF=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_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_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=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_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_FONT_6x8 is not set
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_COPY_MC=y
+CONFIG_ARCH_STACKWALK=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_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_DEBUG_INFO_BTF_MODULES=y
+# CONFIG_GDB_SCRIPTS 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_STACK_VALIDATION=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
+CONFIG_HAVE_ARCH_KCSAN=y
+# 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_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_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
+# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP 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_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_CHECK_TIMESTAMP=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
+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 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
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG 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=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_SCALE_TEST is not set
+# 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_DYNAMIC_FTRACE_WITH_ARGS=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 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_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS 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_IOMMU_DEBUG 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 is not set
+CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
+# 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_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+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 is not set
+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_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.11/patches/musl.patch b/srcpkgs/linux5.11/patches/musl.patch
new file mode 100644
index 000000000000..c624fb0ebf66
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/musl.patch
@@ -0,0 +1,10 @@
+--- linux-5.10.1/kernel/bpf/preload/iterators/iterators.c.orig
++++ linux-5.10.1/kernel/bpf/preload/iterators/iterators.c
+@@ -1,6 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0
+ /* Copyright (c) 2020 Facebook */
+-#include <argp.h>
++#include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/srcpkgs/linux5.11/patches/ppc-vas-on-4k.patch b/srcpkgs/linux5.11/patches/ppc-vas-on-4k.patch
new file mode 100644
index 000000000000..1483f2c3917d
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/ppc-vas-on-4k.patch
@@ -0,0 +1,26 @@
+diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig
+index 938803eab0ad..40c81b358004 100644
+--- a/arch/powerpc/platforms/powernv/Kconfig
++++ b/arch/powerpc/platforms/powernv/Kconfig
+@@ -35,7 +35,7 @@ config PPC_MEMTRACE
+ 
+ config PPC_VAS
+ 	bool "IBM Virtual Accelerator Switchboard (VAS)"
+-	depends on PPC_POWERNV && PPC_64K_PAGES
++	depends on PPC_POWERNV
+ 	default y
+ 	help
+ 	  This enables support for IBM Virtual Accelerator Switchboard (VAS).
+diff --git a/arch/powerpc/platforms/powernv/vas.c b/arch/powerpc/platforms/powernv/vas.c
+index 598e4cd563fb..d81e55de6db4 100644
+--- a/arch/powerpc/platforms/powernv/vas.c
++++ b/arch/powerpc/platforms/powernv/vas.c
+@@ -70,7 +70,7 @@ static int init_vas_instance(struct platform_device *pdev)
+ 		return -ENODEV;
+ 	}
+ 
+-	if (pdev->num_resources != 4) {
++	if (pdev->num_resources < 4) {
+ 		pr_err("Unexpected DT configuration for [%s, %d]\n",
+ 				pdev->name, vasid);
+ 		return -ENODEV;
diff --git a/srcpkgs/linux5.11/patches/ppc32-cpu-hotplug.patch b/srcpkgs/linux5.11/patches/ppc32-cpu-hotplug.patch
new file mode 100644
index 000000000000..f61d9e497bed
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/ppc32-cpu-hotplug.patch
@@ -0,0 +1,34 @@
+Drop after the respective upstream fix.
+
+From e3f22abab59aad3af3b555c4aa9af4441d7b4085 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Thu, 17 Dec 2020 22:28:12 +0100
+Subject: [PATCH] powerpc: only call cleanup_cpu_mmu_context on PPC64 powermacs
+
+Originally introduced in 01b0f0eae0812e80efeee4ee17687e5386335e08.
+
+This was only implemented on book3s64, so on ppc32 build fails
+with implicit function declaration.
+
+Signed-off-by: Daniel Kolesa <daniel@octaforge.org>
+---
+ arch/powerpc/platforms/powermac/smp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
+index adae2a67..7ad90fd0 100644
+--- a/arch/powerpc/platforms/powermac/smp.c
++++ b/arch/powerpc/platforms/powermac/smp.c
+@@ -911,7 +911,9 @@ static int smp_core99_cpu_disable(void)
+ 
+ 	mpic_cpu_set_priority(0xf);
+ 
++#ifdef CONFIG_PPC64
+ 	cleanup_cpu_mmu_context();
++#endif
+ 
+ 	return 0;
+ }
+-- 
+2.29.2
+
diff --git a/srcpkgs/linux5.11/patches/ppc64-be-elfv2.patch b/srcpkgs/linux5.11/patches/ppc64-be-elfv2.patch
new file mode 100644
index 000000000000..dde27580dc9b
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/ppc64-be-elfv2.patch
@@ -0,0 +1,86 @@
+This makes the Linux kernel build as ELFv2 on big endian ppc64. The upstream
+doesn't seem to be interested in this but it's a small patch that is unlikely
+to break/easy to remake and in worst case can always be ditched.
+
+Using ELFv2 has some potential performance benefits and is already always used
+on little endian. It requires a relatively modern toolchain, which we already
+have.
+
+Ping q66 if it does not apply.
+
+--- a/arch/powerpc/Makefile	2020-01-05 14:40:50.395763093 +0100
++++ b/arch/powerpc/Makefile	2020-01-05 14:48:39.025251092 +0100
+@@ -92,10 +92,8 @@
+ 
+ ifdef CONFIG_PPC64
+ ifndef CONFIG_CC_IS_CLANG
+-cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mabi=elfv1)
+-cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mcall-aixdesc)
+-aflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mabi=elfv1)
+-aflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -mabi=elfv2
++cflags-y    += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc))
++aflags-y    += $(call cc-option,-mabi=elfv2,$(call cc-option,-mabi=elfv1))
+ endif
+ endif
+ 
+@@ -144,14 +142,8 @@
+ 
+ CFLAGS-$(CONFIG_PPC64)	:= $(call cc-option,-mtraceback=no)
+ ifndef CONFIG_CC_IS_CLANG
+-ifdef CONFIG_CPU_LITTLE_ENDIAN
+ CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc))
+-AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2)
+-else
+-CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv1)
+-CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcall-aixdesc)
+-AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv1)
+-endif
++AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2,$(call cc-option,-mabi=elfv1))
+ endif
+ CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,$(call cc-option,-mminimal-toc))
+ CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mno-pointers-to-nested-functions)
+
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -48,8 +48,8 @@ ifdef CONFIG_CPU_BIG_ENDIAN
+ BOOTCFLAGS	+= -mbig-endian
+ else
+ BOOTCFLAGS	+= -mlittle-endian
+-BOOTCFLAGS	+= $(call cc-option,-mabi=elfv2)
+ endif
++BOOTCFLAGS	+= $(call cc-option,-mabi=elfv2)
+ 
+ BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
+ 
+--- a/drivers/crypto/vmx/Makefile	2020-01-01 10:56:10.560965046 +0100
++++ b/drivers/crypto/vmx/Makefile	2020-01-01 10:57:05.189968856 +0100
+@@ -5,7 +5,7 @@
+ ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
+ override flavour := linux-ppc64le
+ else
+-override flavour := linux-ppc64
++override flavour := linux-ppc64v2
+ endif
+ 
+ quiet_cmd_perl = PERL $@
+
+--- a/drivers/crypto/vmx/ppc-xlate.pl
++++ b/drivers/crypto/vmx/ppc-xlate.pl
+@@ -40,7 +40,7 @@ my $globl = sub {
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -142,7 +142,7 @@ my $vmr = sub {
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /linux-ppc64le/);
++my $no_vrsave = ($flavour =~ /linux-ppc64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
diff --git a/srcpkgs/linux5.11/patches/ppcle-broken-vdso.patch b/srcpkgs/linux5.11/patches/ppcle-broken-vdso.patch
new file mode 100644
index 000000000000..c559a94b196f
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/ppcle-broken-vdso.patch
@@ -0,0 +1,23 @@
+Disable vDSOs which are broken on 32 bit LE.
+
+Source: @eerykitty
+
+diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso32/vdso32.lds.S
+index a4b806b..0614638 100644
+--- a/arch/powerpc/kernel/vdso32/vdso32.lds.S
++++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S
+@@ -116,12 +116,14 @@ VERSION
+ 	VDSO_VERSION_STRING {
+ 	global:
+ 		__kernel_get_syscall_map;
++#ifndef __LITTLE_ENDIAN__
+ 		__kernel_gettimeofday;
+ 		__kernel_clock_gettime;
+ 		__kernel_clock_gettime64;
+ 		__kernel_clock_getres;
+ 		__kernel_time;
+ 		__kernel_get_tbfreq;
++#endif
+ 		__kernel_sync_dicache;
+ 		__kernel_sigtramp32;
+ 		__kernel_sigtramp_rt32;
diff --git a/srcpkgs/linux5.11/patches/ppcle-ll-compat-sys.patch b/srcpkgs/linux5.11/patches/ppcle-ll-compat-sys.patch
new file mode 100644
index 000000000000..19b9530a51d7
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/ppcle-ll-compat-sys.patch
@@ -0,0 +1,107 @@
+From 98014e4b27063ed74313878233e91b7b52b2a031 Mon Sep 17 00:00:00 2001
+From: Will Springer <skirmisher@protonmail.com>
+Date: Tue, 9 Jun 2020 02:11:36 -0700
+Subject: [PATCH] powerpc/compat32: swap hi/lo parts of 64-bit syscall args on
+ 32LE
+
+This allows compat_sys calls with 64-bit args to function correctly
+when called by ppcle userlands on ppc64le.
+
+Tested with `file /bin/bash` (pread64) and `truncate -s 5G test` (ftruncate64).
+---
+ arch/powerpc/kernel/sys_ppc32.c | 49 +++++++++++++++++++--------------
+ 1 file changed, 28 insertions(+), 21 deletions(-)
+
+diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
+index d36c6391eaf5..16ff0399a257 100644
+--- a/arch/powerpc/kernel/sys_ppc32.c
++++ b/arch/powerpc/kernel/sys_ppc32.c
+@@ -59,57 +59,64 @@ unsigned long compat_sys_mmap2(unsigned long addr, size_t len,
+ /* 
+  * long long munging:
+  * The 32 bit ABI passes long longs in an odd even register pair.
++ * High and low parts are swapped depending on endian mode,
++ * so define a macro (similar to mips linux32) to handle that.
+  */
++#ifdef __LITTLE_ENDIAN__
++#define merge_64(low, high) ((u64)high << 32) | low
++#else
++#define merge_64(high, low) ((u64)high << 32) | low
++#endif
+ 
+ compat_ssize_t compat_sys_pread64(unsigned int fd, char __user *ubuf, compat_size_t count,
+-			     u32 reg6, u32 poshi, u32 poslo)
++			     u32 reg6, u32 pos1, u32 pos2)
+ {
+-	return ksys_pread64(fd, ubuf, count, ((loff_t)poshi << 32) | poslo);
++	return ksys_pread64(fd, ubuf, count, merge_64(pos1, pos2));
+ }
+ 
+ compat_ssize_t compat_sys_pwrite64(unsigned int fd, const char __user *ubuf, compat_size_t count,
+-			      u32 reg6, u32 poshi, u32 poslo)
++			      u32 reg6, u32 pos1, u32 pos2)
+ {
+-	return ksys_pwrite64(fd, ubuf, count, ((loff_t)poshi << 32) | poslo);
++	return ksys_pwrite64(fd, ubuf, count, merge_64(pos1, pos2));
+ }
+ 
+-compat_ssize_t compat_sys_readahead(int fd, u32 r4, u32 offhi, u32 offlo, u32 count)
++compat_ssize_t compat_sys_readahead(int fd, u32 r4, u32 offset1, u32 offset2, u32 count)
+ {
+-	return ksys_readahead(fd, ((loff_t)offhi << 32) | offlo, count);
++	return ksys_readahead(fd, merge_64(offset1, offset2), count);
+ }
+ 
+ asmlinkage int compat_sys_truncate64(const char __user * path, u32 reg4,
+-				unsigned long high, unsigned long low)
++				unsigned long len1, unsigned long len2)
+ {
+-	return ksys_truncate(path, (high << 32) | low);
++	return ksys_truncate(path, merge_64(len1, len2));
+ }
+ 
+-asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo,
+-				     u32 lenhi, u32 lenlo)
++asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offset1, u32 offset2,
++				     u32 len1, u32 len2)
+ {
+-	return ksys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo,
+-			     ((loff_t)lenhi << 32) | lenlo);
++	return ksys_fallocate(fd, mode, ((loff_t)offset1 << 32) | offset2,
++			     merge_64(len1, len2));
+ }
+ 
+-asmlinkage int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long high,
+-				 unsigned long low)
++asmlinkage int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long len1,
++				 unsigned long len2)
+ {
+-	return ksys_ftruncate(fd, (high << 32) | low);
++	return ksys_ftruncate(fd, merge_64(len1, len2));
+ }
+ 
+-long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low,
++long ppc32_fadvise64(int fd, u32 unused, u32 offset1, u32 offset2,
+ 		     size_t len, int advice)
+ {
+-	return ksys_fadvise64_64(fd, (u64)offset_high << 32 | offset_low, len,
++	return ksys_fadvise64_64(fd, merge_64(offset1, offset2), len,
+ 				 advice);
+ }
+ 
+ asmlinkage long compat_sys_sync_file_range2(int fd, unsigned int flags,
+-				   unsigned offset_hi, unsigned offset_lo,
+-				   unsigned nbytes_hi, unsigned nbytes_lo)
++				   unsigned offset1, unsigned offset2,
++				   unsigned nbytes1, unsigned nbytes2)
+ {
+-	loff_t offset = ((loff_t)offset_hi << 32) | offset_lo;
+-	loff_t nbytes = ((loff_t)nbytes_hi << 32) | nbytes_lo;
++	loff_t offset = merge_64(offset1, offset2);
++	loff_t nbytes = merge_64(nbytes1, nbytes2);
+ 
+ 	return ksys_sync_file_range(fd, offset, nbytes, flags);
+ }
+-- 
+2.26.2
+
diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
new file mode 100644
index 000000000000..08a8348811f0
--- /dev/null
+++ b/srcpkgs/linux5.11/template
@@ -0,0 +1,340 @@
+# Template file for 'linux5.11'
+pkgname=linux5.11
+version=5.11.1
+revision=1
+wrksrc="linux-${version%.*}"
+short_desc="Linux kernel and modules (${version%.*} series)"
+maintainer="Érico Nogueira <ericonr@disroot.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
+ https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
+checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
+ 8808ee2c7e904f2fb3c830b41c8bbc2b2ad37638ee95fdfde68167f0be35dd3f"
+skip_extraction="patch-${version}.xz"
+python_version=3
+patch_args="-Np1"
+
+# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
+# XXX Add ppc back only if page poisoning is fixed
+archs="x86_64* i686* aarch64*"
+
+nodebug=yes  # -dbg package is generated below manually
+nostrip=yes
+noverifyrdeps=yes
+noshlibprovides=yes
+preserve=yes
+
+hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
+ libressl-devel perl uboot-mkimage cpio pahole python3"
+
+_kernver="${version}_${revision}"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
+ /usr/lib/modules/${_kernver}/modules.softdep
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /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
+
+pre_patch() {
+	xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1
+}
+
+do_configure() {
+	# If there's a file called <arch>-dotconfig, use it to
+	# configure the kernel; otherwise use arch defaults and all stuff
+	# as modules (allmodconfig).
+	local arch subarch
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=i386;;
+		x86_64*) arch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc64le*) arch=powerpc; subarch=ppc64le;;
+		ppc64*) arch=powerpc; subarch=ppc64;;
+		ppc*) arch=powerpc;;
+		mips*) arch=mips;;
+	esac
+
+	if [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig-custom .config
+		make ${makejobs} ARCH=$arch ${_cross} oldconfig
+	elif [ -f ${FILESDIR}/${subarch:-$arch}-dotconfig ]; then
+		msg_normal "Detected a .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_cross} oldconfig
+	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
+		msg_normal "Detected a .config file for your cpu family, using it.\n"
+		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
+		make ${makejobs} ARCH=$arch ${_cross} oldconfig
+	else
+		msg_normal "Defaulting to 'allmodconfig'.\n"
+		make ${makejobs} ARCH=$arch ${_cross} allmodconfig
+	fi
+	# 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 _args
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _args="bzImage modules"; arch=i386;;
+		x86_64*) _args="bzImage modules"; arch=x86_64;;
+		arm*) _args="zImage modules dtbs"; arch=arm;;
+		aarch64*) _args="Image modules dtbs"; arch=arm64;;
+		ppc*) _args="zImage modules"; arch=powerpc;;
+		mips*) _args="uImage modules dtbs"; arch=mips;;
+	esac
+	export LDFLAGS=
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+}
+
+do_install() {
+	local arch subarch _args hdrdest
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) arch=x86; subarch=i386;;
+		x86_64*) arch=x86; subarch=x86_64;;
+		arm*) arch=arm;;
+		aarch64*) arch=arm64;;
+		ppc*) arch=powerpc;;
+		mips*) arch=mips;;
+	esac
+
+	# Run depmod after compressing modules.
+	sed -i '2iexit 0' scripts/depmod.sh
+
+	# Install kernel, firmware and modules
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} ${_cross} modules_install
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
+
+	vinstall .config 644 boot config-${_kernver}
+	vinstall System.map 644 boot System.map-${_kernver}
+
+	case "$arch" in
+		x86)
+			vinstall arch/x86/boot/bzImage 644 boot vmlinuz-${_kernver}
+			;;
+		arm)
+			vinstall arch/arm/boot/zImage 644 boot
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
+			;;
+		arm64)
+			vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
+			;;
+		powerpc)
+			# zImage on powerpc is useless as it won't load initramfs
+			# raw vmlinux is huge, and this is nostrip, so do it manually
+			vinstall vmlinux 644 boot vmlinux-${_kernver}
+			/usr/bin/$STRIP ${DESTDIR}/boot/vmlinux-${_kernver}
+			;;
+		mips)
+			vinstall arch/mips/boot/uImage.bin 644 boot uImage-${_kernver}
+			make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
+			;;
+	esac
+
+	# Switch to /usr.
+	vmkdir usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-${_kernver} build
+
+	cd ${wrksrc}
+	# Install required headers to build external modules
+	install -Dm644 Makefile ${hdrdest}/Makefile
+	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -Dm644 .config ${hdrdest}/.config
+	for file in $(find . -name Kconfig\*); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+		mkdir -p ${hdrdest}/$(dirname $file)
+		install -Dm644 $file ${hdrdest}/${file}
+	done
+	mkdir -p ${hdrdest}/include
+	# Remove firmware stuff provided by the "linux-firmware" pkg.
+	rm -rf ${DESTDIR}/usr/lib/firmware
+
+	for i in acpi asm-generic clocksource config crypto drm generated linux vdso \
+		math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings; do
+		if [ -d include/$i ]; then
+			cp -a include/$i ${hdrdest}/include
+		fi
+	done
+
+	cd ${wrksrc}
+	mkdir -p ${hdrdest}/arch/${arch}
+	cp -a arch/${arch}/include ${hdrdest}/arch/${arch}
+
+	# Remove helper binaries built for host,
+	# if generated files from the scripts/ directory need to be included,
+	# they need to be copied to ${hdrdest} before this step
+	if [ "$CROSS_BUILD" ]; then
+		make ${makejobs} ARCH=${subarch:-$arch} ${_cross} _mrproper_scripts
+		# remove host specific objects as well
+		find scripts -name '*.o' -delete
+	fi
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
+	mkdir -p ${hdrdest}/security/selinux
+	cp -a security/selinux/include ${hdrdest}/security/selinux
+	mkdir -p ${hdrdest}/tools/include
+	cp -a tools/include/tools ${hdrdest}/tools/include
+
+	mkdir -p ${hdrdest}/arch/${arch}/kernel
+	cp arch/${arch}/Makefile ${hdrdest}/arch/${arch}
+	if [ "$subarch" = "i386" ]; then
+		mkdir -p ${hdrdest}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
+	fi
+	if [ "$arch" = "x86" ]; then
+		mkdir -p ${hdrdest}/arch/x86/kernel
+		cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
+	elif [ "$arch" = "arm64" ]; then
+		mkdir -p ${hdrdest}/arch/arm64/kernel
+		cp -a arch/arm64/kernel/vdso ${hdrdest}/arch/arm64/kernel/
+	fi
+
+	# add headers for lirc package
+	# pci
+	for i in bt8xx cx88 saa7134; do
+		mkdir -p ${hdrdest}/drivers/media/pci/${i}
+		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
+	done
+	# usb
+	for i in cpia2 em28xx pwc; do
+		mkdir -p ${hdrdest}/drivers/media/usb/${i}
+		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
+	done
+	# i2c
+	mkdir -p ${hdrdest}/drivers/media/i2c
+	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
+	for i in cx25840; do
+		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
+		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
+	done
+
+	# Add md headers
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+	# add dvb headers for external modules
+	mkdir -p ${hdrdest}/include/config/dvb/
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/lgdt330x.h \
+		${hdrdest}/drivers/media/dvb-frontends/
+	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
+
+	# add dvb headers
+	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
+	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
+	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
+	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
+	mkdir -p ${hdrdest}/drivers/media/tuners
+	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${hdrdest}/fs/xfs/libxfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/libxfs/xfs_sb.h ${hdrdest}/fs/xfs/libxfs/xfs_sb.h
+
+	# Add objtool binary, needed to build external modules with dkms
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*)
+			mkdir -p ${hdrdest}/tools/objtool
+			cp tools/objtool/objtool ${hdrdest}/tools/objtool
+			;;
+	esac
+
+	# Remove unneeded architectures
+	case "$arch" in
+		i386|x86_64) _args="arm* m* p*";;
+		arm|arm64) _args="x86* m* p*";;
+		powerpc) _args="arm* m* x86* parisc";;
+		mips) _args="arm* x86* p*";;
+	esac
+	for arch in alpha avr32 blackfin cris frv h8300 \
+		ia64 s* um v850 xtensa ${_args}; do
+		rm -rf ${hdrdest}/arch/${arch}
+	done
+	# Keep arch/x86/ras/Kconfig as it is needed by drivers/ras/Kconfig
+	mkdir -p ${hdrdest}/arch/x86/ras
+	cp -a arch/x86/ras/Kconfig ${hdrdest}/arch/x86/ras/Kconfig
+
+	# Extract debugging symbols and compress modules
+	msg_normal "$pkgver: extracting debug info and compressing modules, please wait...\n"
+	install -Dm644 vmlinux ${DESTDIR}/usr/lib/debug/boot/vmlinux-${_kernver}
+	(
+	cd ${DESTDIR}
+	export DESTDIR
+	find ./ -name '*.ko' -print0 | \
+		xargs -0r -n1 -P ${XBPS_MAKEJOBS} ${FILESDIR}/mv-debug
+	)
+	# ... and run depmod again.
+	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+linux5.11-headers_package() {
+	preserve=yes
+	nostrip=yes
+	noshlibprovides=yes
+	short_desc+=" - source headers for 3rd party modules"
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules/${_kernver}/build
+	}
+}
+linux5.11-dbg_package() {
+	preserve=yes
+	nostrip=yes
+	noverifyrdeps=yes
+	noshlibprovides=yes
+	repository=debug
+	short_desc+=" - debugging symbols"
+	pkg_install() {
+		vmove usr/lib/debug
+	}
+}

From 3c5d67ef0ba1642b1dc62bcbc83818639f45ac21 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Thu, 25 Feb 2021 22:50:32 +0100
Subject: [PATCH 2286/3458] passwordsafe: update to 1.13.0, enable testing

---
 .../patches/use-gtest-from-package.patch      | 37 +++++++++++++++++++
 srcpkgs/passwordsafe/template                 | 13 +++++--
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/passwordsafe/patches/use-gtest-from-package.patch

diff --git a/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch b/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch
new file mode 100644
index 000000000000..240d3fd0e329
--- /dev/null
+++ b/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch
@@ -0,0 +1,37 @@
+--- CMakeLists.txt.ORIG	2021-02-25 23:45:37.917034534 +0100
++++ CMakeLists.txt	2021-02-26 00:05:34.138397928 +0100
+@@ -255,34 +255,6 @@
+ endif (USE_ASAN)
+ endif (MSVC)
+ 
+-if (NOT NO_GTEST)
+-   # Download and unpack googletest at configure time
+-   # See https://crascit.com/2015/07/25/cmake-gtest/
+-   configure_file(Misc/CMakeLists.gtest.txt.in googletest-download/CMakeLists.txt)
+-   execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+-       WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
+-   execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+-       WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
+-
+-   # Prevent GoogleTest from overriding our compiler/linker options
+-   # when building with Visual Studio
+-   set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-   # Set some other gtest configurations:
+-   set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
+-   set(BUILD_GTEST ON CACHE BOOL "" FORCE)
+-   set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
+-
+-   # Add googletest directly to our build. This adds
+-   # the following targets: gtest, gtest_main, gmock
+-   # and gmock_main
+-   add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
+-                    "${CMAKE_BINARY_DIR}/googletest-build")
+-
+-   include_directories("${gtest_SOURCE_DIR}/include"
+-#                       "${gmock_SOURCE_DIR}/include"
+-                       )
+-endif(NOT NO_GTEST)
+-
+ if (WIN32 AND NOT WX_WINDOWS)
+   set(VERSION_IN "${PROJECT_SOURCE_DIR}/src/ui/Windows/version.in")
+ else (WIN32 AND NOT WX_WINDOWS)
diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae74..2cd6ee12a11a 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,22 +1,27 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
-version=1.12.0
+version=1.13.0
 revision=1
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
-# testing disabled: want to build gtest from source (package gtest-devel useless)
-configure_args="-DNO_GTEST=ON"
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
  libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="Artistic-2.0"
 homepage="https://pwsafe.org"
 distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz"
-checksum=8d331019170f2920a28ccda08ae420c78e016f41d3ccedb7b4dba1f5f7f25bcb
+checksum=8962edf57b7f901d9ed23496c8ec387a4f186855976e8ac98f2dd55560c82ebe
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DNO_GTEST=OFF"
+else
+	configure_args+=" -DNO_GTEST=ON"
+fi
 
 pre_configure() {
 	# ykpers-1 includes are hardcoded, add cross base

From 6ac32bcdb173c8aeca707e42bbc3f9e7c81c1be8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 25 Feb 2021 22:30:09 +0200
Subject: [PATCH 2287/3458] rssguard: update to 3.9.0.

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

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index 2b4b7ed36f83..bc5f4ad4ed6e 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=3.8.4
+version=3.9.0
 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=4acfcb482c5f1f065b4e299ab4500c69146ddd398536ccb0799912290805b262
+checksum=79ca9cccc6173e3a1f58ff49a5d9896d87e009ecd831619ce4ebe2e4e476d7a4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel kdeclarative-devel"

From 02ac49008a52036a1e2573bce825be89938e2cf5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Feb 2021 11:15:31 +0100
Subject: [PATCH 2288/3458] skopeo: update to 1.2.2.

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

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index b60113bfb6e7..cac6e3832eb3 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.1.0
+version=1.2.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=3bd3acc614514fc2261b89dc0ea85ac7a4dba64fb7dcef8676ae61849e8faeb4
+checksum=b9adf2c209f49f79568cd69ee063bac1d61db20d277c20f189784fe39945a0ad
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 1ccb44b7d7b779a3ec72f05178ad581234922030 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 18 Feb 2021 20:53:50 +0100
Subject: [PATCH 2289/3458] inih: update to 53.

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

diff --git a/srcpkgs/inih/template b/srcpkgs/inih/template
index d5ffb78ee4a4..ba6e8707a8cb 100644
--- a/srcpkgs/inih/template
+++ b/srcpkgs/inih/template
@@ -1,6 +1,6 @@
 # Template file for 'inih'
 pkgname=inih
-version=52
+version=53
 revision=1
 wrksrc=inih-r${version}
 build_style=meson
@@ -10,7 +10,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/benhoyt/inih"
 distfiles="${homepage}/archive/r${version}.tar.gz"
-checksum=439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880
+checksum=01b0366fdfdf6363efc070c2f856f1afa33e7a6546548bada5456ad94a516241
 
 post_install() {
 	vlicense LICENSE.txt

From 55ed95dbf5e540f056090a627e24adb31135dfc1 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Mon, 15 Feb 2021 00:51:51 +0100
Subject: [PATCH 2290/3458] librime: update to 1.7.3

---
 srcpkgs/librime/patches/opencc-1.1.0.patch | 86 ----------------------
 srcpkgs/librime/template                   | 12 +--
 2 files changed, 7 insertions(+), 91 deletions(-)
 delete mode 100644 srcpkgs/librime/patches/opencc-1.1.0.patch

diff --git a/srcpkgs/librime/patches/opencc-1.1.0.patch b/srcpkgs/librime/patches/opencc-1.1.0.patch
deleted file mode 100644
index 219ddabec07f..000000000000
--- a/srcpkgs/librime/patches/opencc-1.1.0.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From beae5b1d4e990aeb05eb86db5eefec50fa03750b Mon Sep 17 00:00:00 2001
-From: Chen Gong <chen.sst@gmail.com>
-Date: Fri, 15 May 2020 01:42:52 +0800
-Subject: [PATCH] fix(simplifier): opencc::DictEntry::Values() type change in
- opencc 1.1.0
-
-Closes #367
----
- src/rime/gear/simplifier.cc | 14 ++++++--------
- src/rime/gear/simplifier.h  |  5 +++--
- 2 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git src/rime/gear/simplifier.cc src/rime/gear/simplifier.cc
-index 98a1c5a9..feb7f50b 100644
---- src/rime/gear/simplifier.cc
-+++ src/rime/gear/simplifier.cc
-@@ -8,6 +8,7 @@
- #include <boost/filesystem.hpp>
- #include <stdint.h>
- #include <utf8.h>
-+#include <utility>
- #include <rime/candidate.h>
- #include <rime/common.h>
- #include <rime/config.h>
-@@ -45,8 +46,7 @@ class Opencc {
-     }
-   }
- 
--  bool ConvertWord(const string& text,
--                              vector<string>* forms) {
-+  bool ConvertWord(const string& text, vector<string>* forms) {
-     if (dict_ == nullptr) return false;
-     opencc::Optional<const opencc::DictEntry*> item = dict_->Match(text);
-     if (item.IsNull()) {
-@@ -54,15 +54,14 @@ class Opencc {
-       return false;
-     } else {
-       const opencc::DictEntry* entry = item.Get();
--      for (const char* value : entry->Values()) {
--        forms->push_back(value);
-+      for (auto&& value : entry->Values()) {
-+        forms->push_back(std::move(value));
-       }
-       return forms->size() > 0;
-     }
-   }
- 
--  bool RandomConvertText(const string& text,
--                   string* simplified) {
-+  bool RandomConvertText(const string& text, string* simplified) {
-     if (dict_ == nullptr) return false;
-     const char *phrase = text.c_str();
-     std::ostringstream buffer;
-@@ -83,8 +82,7 @@ class Opencc {
-     return *simplified != text;
-   }
- 
--  bool ConvertText(const string& text,
--                   string* simplified) {
-+  bool ConvertText(const string& text, string* simplified) {
-     if (converter_ == nullptr) return false;
-     *simplified = converter_->Convert(text);
-     return *simplified != text;
-diff --git src/rime/gear/simplifier.h src/rime/gear/simplifier.h
-index c68e4c7d..f70344e7 100644
---- src/rime/gear/simplifier.h
-+++ src/rime/gear/simplifier.h
-@@ -20,7 +20,7 @@ class Simplifier : public Filter, TagMatching {
-   explicit Simplifier(const Ticket& ticket);
- 
-   virtual an<Translation> Apply(an<Translation> translation,
--                                        CandidateList* candidates);
-+                                CandidateList* candidates);
- 
- 
-   virtual bool AppliesToSegment(Segment* segment) {
-@@ -35,7 +35,8 @@ class Simplifier : public Filter, TagMatching {
- 
-   void Initialize();
-   void PushBack(const an<Candidate>& original,
--                         CandidateQueue* result, const string& simplified);
-+                CandidateQueue* result,
-+                const string& simplified);
- 
-   bool initialized_ = false;
-   the<Opencc> opencc_;
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index e16c6861bd93..37cce1595ffb 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,17 +1,19 @@
 # Template file for 'librime'
 pkgname=librime
-version=1.5.3
-revision=4
+version=1.7.3
+revision=1
 build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON"
+configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
+ -DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
+hostmakedepends="pkg-config capnproto"
 makedepends="boost-devel leveldb-devel marisa-devel opencc-devel
- yaml-cpp-devel gtest-devel"
+ yaml-cpp-devel gtest-devel capnproto-devel xorgproto"
 short_desc="Rime Input Method Engine"
 maintainer="Yuxuan Shui <yshuiv7@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/rime/librime"
 distfiles="https://github.com/rime/librime/archive/${version}.tar.gz"
-checksum=df4279df6bc0419c18d9325e7d76dfdab8f91f0ee00a954f19a27f66dd99f503
+checksum=c76b937a27d7b9352c3eea9eb3adaebf70c93457104c7d47d40c006009092c20
 
 post_install() {
 	vlicense LICENSE

From 0b37913f1b4653817d24a5c8bc8447b64646ffd9 Mon Sep 17 00:00:00 2001
From: svenper <svenper@tuta.io>
Date: Mon, 15 Feb 2021 00:53:33 +0100
Subject: [PATCH 2291/3458] ibus-rime: update to 1.5.0

---
 srcpkgs/ibus-rime/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ibus-rime/template b/srcpkgs/ibus-rime/template
index f46c6a529a1d..3563559304bf 100644
--- a/srcpkgs/ibus-rime/template
+++ b/srcpkgs/ibus-rime/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-rime'
 pkgname=ibus-rime
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config brise"
@@ -11,9 +11,5 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://rime.im/"
 distfiles="https://github.com/rime/ibus-rime/archive/${version}.tar.gz"
-checksum=4f20b64cf01ced25eacba185cd1cc6855b373e0728cba4d406356b13a5ec3828
+checksum=e633bde71055b9298837c7fdd73c5694594633e08bf58b6e5cf17bac4959dacb
 CFLAGS="-fcommon"
-
-do_install() {
-	make ${makejobs} PREFIX=${DESTDIR}/usr install
-}

From 51485cf7599e4b7109f5d4728af24602a4c5efb9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:47:52 +0100
Subject: [PATCH 2292/3458] clthreads: remove build flags fix

also update maintainer
---
 srcpkgs/clthreads/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/clthreads/template b/srcpkgs/clthreads/template
index 5bd8b35621d1..ccc157d80e98 100644
--- a/srcpkgs/clthreads/template
+++ b/srcpkgs/clthreads/template
@@ -6,7 +6,7 @@ build_wrksrc=source
 build_style=gnu-makefile
 make_install_args="LIBDIR=/usr/lib"
 short_desc="C++ wrapper library around the POSIX threads API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="LGPL-2.1-or-later"
 homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -14,10 +14,6 @@ checksum=c659b14c0c4055c44432cb83060b95d30ae0c1ecc6f50d73968e239c100f7a31
 
 CXXFLAGS="-fPIC"
 
-pre_build() {
-	vsed -i Makefile -e '/march=native/d'
-}
-
 pre_install() {
 	# fix wrong path
 	vsed -i 's/$(DESTDIR)$(PREFIX)\//$(DESTDIR)/g' Makefile

From c34679eda29c9c5b2aaa0ee41884d8c335ed37af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:28 +0100
Subject: [PATCH 2293/3458] clxclient: remove build flags fix

also update maintainer
---
 srcpkgs/clxclient/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/clxclient/template b/srcpkgs/clxclient/template
index 6391174621ad..31efa292c1d5 100644
--- a/srcpkgs/clxclient/template
+++ b/srcpkgs/clxclient/template
@@ -8,7 +8,7 @@ make_install_args="LIBDIR=/usr/lib"
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXft-devel clthreads-devel freetype-devel"
 short_desc="C++ wrapper library around the X Window System API"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="LGPL-2.1-or-later"
 homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
@@ -17,7 +17,6 @@ checksum=8501e964f0e0746abc5083a0b75fe3b937281cc4a9f7d1450ff98e86bc337881
 CXXFLAGS="-fPIC"
 
 pre_build() {
-	sed -i '/march=native/d' Makefile
 	# fix wrong header import
 	vsed -i 's/<clxclient.h>/"clxclient.h"/' enumip.cc
 	# change pkgconf to pkg-config

From f9339505e347cad4cb8cb9328e3a1d3ebd94dc5b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:48:50 +0100
Subject: [PATCH 2294/3458] jaaa: remove build flags fix

also update maintainer
---
 srcpkgs/jaaa/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/jaaa/template b/srcpkgs/jaaa/template
index 27cf147efb23..d27eed8e7013 100644
--- a/srcpkgs/jaaa/template
+++ b/srcpkgs/jaaa/template
@@ -8,14 +8,13 @@ hostmakedepends="pkg-config"
 makedepends="zita-alsa-pcmi-devel clthreads-devel clxclient-devel freetype-devel
  alsa-lib-devel fftw-devel jack-devel libX11-devel libXft-devel"
 short_desc="JACK and ALSA Audio Analyser"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=6cf55a3924694179d83e9d49f557896fcebdc1a7f89477e601caa2277ad7f3b3
 
 pre_build() {
-	sed -i '/march=native/d' Makefile
 	# change pkgconf to pkg-config
 	sed -i 's/pkgconf/pkg-config/' Makefile
 }

From ab696bdbb8818fbcabf8c50b943f4b4065e66091 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:49:54 +0100
Subject: [PATCH 2295/3458] zita-alsa-pcmi: remove build flags fix

---
 srcpkgs/zita-alsa-pcmi/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 2090b4dec825..908642f6e3fc 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -13,11 +13,7 @@ homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
 
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
-	sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC"
 
 post_install() {
 	# add missing symlink

From 9288e55b910ffdcd6f3b30f56fde72f6ef564dac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:50:51 +0100
Subject: [PATCH 2296/3458] zita-at1: enable recommended build flags

also update maintainer
---
 srcpkgs/zita-at1/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zita-at1/template b/srcpkgs/zita-at1/template
index c92d4c699e3e..9325c5930ac5 100644
--- a/srcpkgs/zita-at1/template
+++ b/srcpkgs/zita-at1/template
@@ -1,7 +1,7 @@
 # Template file for 'zita-at1'
 pkgname=zita-at1
 version=0.6.2
-revision=2
+revision=3
 build_wrksrc=source
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
@@ -9,12 +9,14 @@ hostmakedepends="pkg-config"
 makedepends="clxclient-devel clthreads-devel zita-resampler-devel cairo-devel
  freetype-devel fftw-devel jack-devel libpng-devel libXft-devel libX11-devel"
 short_desc="Audio autotuner for JACK"
-maintainer="bluntphenomena <gregwyd@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-3.0-or-later"
 homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=19bb3ddc02b32d6ad15fdd928ee66c2e5bb5e4c7fe465c431e98c2fd83b1ae57
 
+CXXFLAGS="-ffast-math"
+
 pre_build() {
 	# change pkgconf to pkg-config
 	vsed -e 's/pkgconf/pkg-config/' -i Makefile

From ac86d1d1e500197ebbf80869ff3d8415541830e7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:51:23 +0100
Subject: [PATCH 2297/3458] zita-convolver: remove build flags fix

and enable recommended build flags
---
 srcpkgs/zita-convolver/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/zita-convolver/template b/srcpkgs/zita-convolver/template
index 14cd977773a9..fb0371162b03 100644
--- a/srcpkgs/zita-convolver/template
+++ b/srcpkgs/zita-convolver/template
@@ -1,24 +1,20 @@
 # Template file for 'zita-convolver'
 pkgname=zita-convolver
 version=4.0.3
-revision=1
+revision=2
+build_wrksrc="source"
 build_style=gnu-makefile
 make_install_args="LIBDIR=/usr/lib"
 hostmakedepends="pkg-config"
 makedepends="fftw-devel"
-build_wrksrc="source"
-short_desc="A fast partitioned convolution engine library"
+short_desc="Fast partitioned convolution engine library"
 maintainer="silvernode <mollusk@homebutter.com>"
 license="GPL-3.0-or-later"
 homepage="http://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
 checksum=9aa11484fb30b4e6ef00c8a3281eebcfad9221e3937b1beb5fe21b748d89325f
 
-CXXFLAGS="-fPIC -DPIC"
-
-pre_build() {
-	sed -i '/march=native/d' Makefile
-}
+CXXFLAGS="-fPIC -ffast-math -funroll-loops"
 
 post_install() {
 	# add missing symlink

From e318dad02835a301e95056ce92d790a0d3fe22ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 17 Feb 2021 03:57:45 +0100
Subject: [PATCH 2298/3458] zita-resampler: update to 1.8.0.

also remove build flags fix
and enable recommended build flags
---
 srcpkgs/zita-resampler/template | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/zita-resampler/template b/srcpkgs/zita-resampler/template
index 56bd795af990..b84ba8158774 100644
--- a/srcpkgs/zita-resampler/template
+++ b/srcpkgs/zita-resampler/template
@@ -1,22 +1,25 @@
 # Template file for 'zita-resampler'
 pkgname=zita-resampler
-version=1.6.2
+version=1.8.0
 revision=1
+build_wrksrc="source"
 build_style=gnu-makefile
 make_install_args="LIBDIR=/usr/lib"
 hostmakedepends="pkg-config"
-build_wrksrc="source"
-short_desc="A library for resampling audio signals"
+short_desc="Library for resampling audio signals"
 maintainer="silvernode <mollusk@homebutter.com>"
 license="GPL-3.0-or-later"
 homepage="http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html"
 distfiles="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
-checksum=233baefee297094514bfc9063e47f848e8138dc7c959d9cd957b36019b98c5d7
+checksum=e5744f23c54dd15b3f783a687bd879eee2a690a4545a15b49c4cf037aa464aa2
 
-CXXFLAGS="-fPIC -DPIC"
+CXXFLAGS="-fPIC -ffast-math"
 
 pre_build() {
-	sed -i '/march=native/d' Makefile
+	case "${XBPS_TARGET_MACHINE}" in
+		x86_64*|i686*) CXXFLAGS+=" -msse2" ;;
+		*) vsed -i '/DENABLE_SSE2/d' Makefile ;;
+	esac
 }
 
 post_install() {

From 45a6f55760a9e6f21e55b17220748a08cb8e42c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 26 Feb 2021 10:14:07 +0100
Subject: [PATCH 2299/3458] firefox-esr: fix firefox-wayland wrapper

It needs MOZ_ENABLE_WAYLAND=1 to actually enable Wayland.
---
 srcpkgs/firefox-esr/files/firefox-wayland | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox-esr/files/firefox-wayland b/srcpkgs/firefox-esr/files/firefox-wayland
index 495f901320c4..e07fd87b235a 100644
--- a/srcpkgs/firefox-esr/files/firefox-wayland
+++ b/srcpkgs/firefox-esr/files/firefox-wayland
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec env MOZ_ENABLE_WAYLAND= /usr/lib/firefox/firefox "$@"
+exec env MOZ_ENABLE_WAYLAND=1 /usr/lib/firefox/firefox "$@"

From 55093fe6926acda1a666fae670ee182ce3d12e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 26 Feb 2021 10:22:01 +0100
Subject: [PATCH 2300/3458] kea: update to 1.9.5

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

diff --git a/common/shlibs b/common/shlibs
index a3c5b5181f91..b016d28f7886 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2829,25 +2829,25 @@ 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.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-asiolink.so.23 libkea-1.9.5_1
+libkea-cc.so.22 libkea-1.9.5_1
 libkea-cfgclient.so.22 libkea-1.9.4_1
 libkea-cryptolink.so.16 libkea-1.9.2_1
-libkea-database.so.20 libkea-1.9.4_1
-libkea-dhcp++.so.32 libkea-1.9.4_1
+libkea-database.so.21 libkea-1.9.5_1
+libkea-dhcp++.so.33 libkea-1.9.5_1
 libkea-dhcp_ddns.so.15 libkea-1.9.4_1
-libkea-dhcpsrv.so.42 libkea-1.9.4_1
+libkea-dhcpsrv.so.43 libkea-1.9.5_1
 libkea-dns++.so.16 libkea-1.9.4_1
-libkea-eval.so.24 libkea-1.9.4_1
+libkea-eval.so.25 libkea-1.9.5_1
 libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.30 libkea-1.9.4_1
+libkea-hooks.so.31 libkea-1.9.5_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-process.so.26 libkea-1.9.5_1
 libkea-stats.so.18 libkea-1.9.4_1
 libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.31 libkea-1.9.4_1
+libkea-util.so.32 libkea-1.9.5_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 0a9c0b03ea23..5da5b0a3c817 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,6 +1,6 @@
 # Template file for 'kea'
 pkgname=kea
-version=1.9.4
+version=1.9.5
 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=0f3a28df4db0f3658fd58baa555bc36e82e3a36d9fb5cc71b557132fc695aa3b
+checksum=324a06f488645bee587e49a45d491b525f53417c56b219f1cb37461fdefd9d91
 
 build_options="botan mysql pgsql"
 desc_option_botan="With Botan SSL support"

From ac90c47f20fe6683f85b973084e3886a2c1a4aa6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 25 Feb 2021 11:41:35 +0100
Subject: [PATCH 2301/3458] nncp: update to 6.1.0.

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

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 15609f3801f7..34845c14176b 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=6.0.0
+version=6.1.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=42fe8aa54520b3a1abb50d661bbba6a141ce4e749b4816b0d4c6845d67465916
+checksum=083a533f7d0212069ae07f9fd6cd22e3c5be09e830f2c9c497d97cf614e5413f
 
 do_build() {
 	make

From f07017dc03dccf1f3f2e53dba145a65f14fb4bbe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Feb 2021 12:15:25 +0100
Subject: [PATCH 2302/3458] stress-ng: update to 0.12.04.

---
 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 03de2662bf92..efee65e76d9c 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.03
+version=0.12.04
 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=f27ff439b76a17641291d4234c73655cddcb0a5a588441d6ade290b06ca4b805
+checksum=b4e34bda8db4ed37e33b7a861bc06ad77cbbd234d63236da2cb58f02e3f3218e

From c51ec21faeddf482a9a17e2a7c93cc626e28cdff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Feb 2021 12:16:35 +0100
Subject: [PATCH 2303/3458] python3-pipx: update to 0.16.1.0.

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

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 6ae1acdb9add..77f215ac8c60 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.16.0.0
+version=0.16.1.0
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -10,8 +10,9 @@ short_desc="Install and Run Python Applications in Isolated Environments"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pipxproject.github.io/pipx/"
+changelog="https://pipxproject.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=ec9d63753f34eb2dde5597ecdfe23df61749104485eead42937abec4dc4f4598
+checksum=22b9a0f0536e6b4e7ae030d33cbe34528c3f7ad1615d0c3795f2e5ac4db9d76d
 
 post_install() {
 	vlicense LICENSE

From 2cc9fa72567c7688746fd16c23b8ecca8134aef6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Feb 2021 12:17:32 +0100
Subject: [PATCH 2304/3458] xtruss: update to 20210225.2addd50.

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

diff --git a/srcpkgs/xtruss/template b/srcpkgs/xtruss/template
index 03d32e645778..5a6d43b35875 100644
--- a/srcpkgs/xtruss/template
+++ b/srcpkgs/xtruss/template
@@ -1,14 +1,14 @@
 # Template file for 'xtruss'
 pkgname=xtruss
-version=20200918.a94a153
+version=20210225.2addd50
 revision=1
 build_style=gnu-configure
-short_desc="An easy-to-use X protocol tracing program"
+short_desc="Easy-to-use X protocol tracing program"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/xtruss/"
 distfiles="http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=623a37f77943a4f2283ab9d76b0e6f0cd19b521643025f85727c8ff75bb46ecc
+checksum=ac42936298f45d024287c896dbf5956b6d261c76cfabb4de67066f21b688e393
 
 post_install() {
 	vlicense LICENCE LICENSE

From b1626918ed99532a9e412c252de748ff256ca78c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 26 Feb 2021 12:28:48 +0100
Subject: [PATCH 2305/3458] erlang: update to 23.2.6.

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8d536f6888a..98001d59fcd2 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.2.5
+version=23.2.6
 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=00587a60bc97a26060265b201f69dd7059ddd04506f6502e8e78c5f00e1b1db7
+checksum=5bc6b31b36b949bf06e84d51986311fc1d2ace5e717aae3186dc057d4838445d
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 897bbd305a3ad2cde7521246c4df9b3f06d61b6e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 25 Feb 2021 11:21:47 +0100
Subject: [PATCH 2306/3458] exiftool: update to 12.21.

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

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 99b22bf5cb6b..0e33eea8298e 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,16 +1,13 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.19
+version=12.21
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
-hostmakedepends="perl tar"
-makedepends="perl"
-depends="$makedepends"
 short_desc="Reader and rewriter of EXIF information that supports raw files"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 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=0243027f1086ca810b4510356cc90e969ae3779025f4e2eff844c425ba952176
+checksum=9ae43d60abf4fab0b7b11f7df4a1fae383613554d1abce2e6e5e5a49c3e62f21

From 61a5f4c23f7282f82661aa832b377dd10484696d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 25 Feb 2021 09:22:40 +0100
Subject: [PATCH 2307/3458] pigz: update to 2.6.

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

diff --git a/srcpkgs/pigz/template b/srcpkgs/pigz/template
index ada5263a6e6c..4a0924839047 100644
--- a/srcpkgs/pigz/template
+++ b/srcpkgs/pigz/template
@@ -1,21 +1,17 @@
 # Template file for 'pigz'
 pkgname=pigz
-version=2.5
+version=2.6
 revision=1
+build_style=gnu-makefile
+make_check_target=test
 makedepends="zlib-devel"
 short_desc="Parallel implementation of gzip"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://zlib.net/pigz/"
-distfiles="http://zlib.net/pigz/pigz-${version}.tar.gz"
-checksum=a006645702caaecace633a89eb5c371482b44a48d04f34e0058e2b85d75d4c36
+homepage="https://zlib.net/pigz/"
+distfiles="https://zlib.net/pigz/pigz-${version}.tar.gz"
+checksum=2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d
 
-post_extract() {
-	sed -i '/CC.*-o/{s/$(LDFLAGS)//; s/$/ $(LDFLAGS)/}' Makefile
-}
-do_build() {
-	make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -lz" ${makejobs}
-}
 do_install() {
 	vbin pigz
 	vman pigz.1

From 6dd7e0d59ddbd0502b1b2168535809aefea2c769 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 25 Feb 2021 09:24:17 -0500
Subject: [PATCH 2308/3458] openmpi: backport AVX improvements, make mca_op_avx
 work

Closes: #29049 [via git-merge-pr]
---
 srcpkgs/openmpi/patches/avx.patch | 1682 +++++++++++++++++++++++++++++
 srcpkgs/openmpi/template          |    9 +-
 2 files changed, 1687 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/openmpi/patches/avx.patch

diff --git a/srcpkgs/openmpi/patches/avx.patch b/srcpkgs/openmpi/patches/avx.patch
new file mode 100644
index 000000000000..7088fbd4636e
--- /dev/null
+++ b/srcpkgs/openmpi/patches/avx.patch
@@ -0,0 +1,1682 @@
+From 6de8dfd236b7180b04c911d2306c3b805abf7182 Mon Sep 17 00:00:00 2001
+From: George Bosilca <bosilca@icl.utk.edu>
+Date: Mon, 28 Dec 2020 15:36:05 -0500
+Subject: [PATCH 1/3] Major update to the AVX* detection and support
+
+1. Consistent march flag order between configure and make.
+
+2. op/avx: give the option to skip some tests
+
+it is possible to skip some intrinsic tests by setting some environment variables to "no" before invoking configure:
+ - ompi_cv_op_avx_check_avx512
+ - ompi_cv_op_avx_check_avx2
+ - ompi_cv_op_avx_check_avx
+ - ompi_cv_op_avx_check_sse41
+ - ompi_cv_op_avx_check_sse3
+
+3. op/avx: update AVX512 flags
+
+try
+-mavx512f -mavx512bw -mavx512vl -mavx512dq
+instead of
+-march=skylake-avx512
+
+since the former is less likely to conflict with user provided CFLAGS
+(e.g. -march=...)
+
+Thanks Bart Oldeman for pointing this.
+
+4. op/avx: have the op/avx library depend on libmpi.so
+
+Refs. open-mpi/ompi#8323
+
+Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
+Signed-off-by: George Bosilca <bosilca@icl.utk.edu>
+---
+ ompi/mca/op/avx/Makefile.am  |   4 +-
+ ompi/mca/op/avx/configure.m4 | 325 ++++++++++++++++++-----------------
+ 2 files changed, 174 insertions(+), 155 deletions(-)
+
+diff --git ompi/mca/op/avx/Makefile.am ompi/mca/op/avx/Makefile.am
+index 41dcf2e1834..b1d84d90b33 100644
+--- ompi/mca/op/avx/Makefile.am
++++ ompi/mca/op/avx/Makefile.am
+@@ -2,7 +2,7 @@
+ # Copyright (c) 2019-2020 The University of Tennessee and The University
+ #                         of Tennessee Research Foundation.  All rights
+ #                         reserved.
+-# Copyright (c) 2020      Research Organization for Information Science
++# Copyright (c) 2020-2021 Research Organization for Information Science
+ #                         and Technology (RIST).  All rights reserved.
+ # $COPYRIGHT$
+ #
+@@ -86,7 +86,7 @@ mcacomponentdir = $(ompilibdir)
+ mcacomponent_LTLIBRARIES = $(component_install)
+ mca_op_avx_la_SOURCES = $(sources)
+ mca_op_avx_la_LIBADD = $(specialized_op_libs)
+-mca_op_avx_la_LDFLAGS = -module -avoid-version
++mca_op_avx_la_LDFLAGS = -module -avoid-version $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+ 
+ 
+ # Specific information for static builds.
+diff --git ompi/mca/op/avx/configure.m4 ompi/mca/op/avx/configure.m4
+index 09d8b374c8e..f61b7100ef4 100644
+--- ompi/mca/op/avx/configure.m4
++++ ompi/mca/op/avx/configure.m4
+@@ -29,6 +29,13 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+     op_avx_support=0
+     op_avx2_support=0
+     op_avx512_support=0
++
++    AS_VAR_PUSHDEF([op_avx_check_sse3], [ompi_cv_op_avx_check_sse3])
++    AS_VAR_PUSHDEF([op_avx_check_sse41], [ompi_cv_op_avx_check_sse41])
++    AS_VAR_PUSHDEF([op_avx_check_avx], [ompi_cv_op_avx_check_avx])
++    AS_VAR_PUSHDEF([op_avx_check_avx2], [ompi_cv_op_avx_check_avx2])
++    AS_VAR_PUSHDEF([op_avx_check_avx512], [ompi_cv_op_avx_check_avx512])
++
+     OPAL_VAR_SCOPE_PUSH([op_avx_cflags_save])
+ 
+     AS_IF([test "$opal_cv_asm_arch" = "X86_64"],
+@@ -37,21 +44,9 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+            #
+            # Check for AVX512 support
+            #
+-           AC_MSG_CHECKING([for AVX512 support (no additional flags)])
+-           AC_LINK_IFELSE(
+-               [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                                [[
+-    __m512 vA, vB;
+-    _mm512_add_ps(vA, vB)
+-                                ]])],
+-               [op_avx512_support=1
+-                AC_MSG_RESULT([yes])],
+-               [AC_MSG_RESULT([no])])
+-
+-           AS_IF([test $op_avx512_support -eq 0],
+-                 [AC_MSG_CHECKING([for AVX512 support (with -march=skylake-avx512)])
+-                  op_avx_cflags_save="$CFLAGS"
+-                  CFLAGS="$CFLAGS -march=skylake-avx512"
++           AC_CACHE_CHECK([if we are checking for AVX512 support], op_avx_check_avx512, AS_VAR_SET(op_avx_check_avx512, yes))
++           AS_IF([test "$op_avx_check_avx512" = "yes"],
++                 [AC_MSG_CHECKING([for AVX512 support (no additional flags)])
+                   AC_LINK_IFELSE(
+                       [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+                                        [[
+@@ -59,99 +54,115 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+     _mm512_add_ps(vA, vB)
+                                        ]])],
+                       [op_avx512_support=1
+-                       MCA_BUILD_OP_AVX512_FLAGS="-march=skylake-avx512"
+                        AC_MSG_RESULT([yes])],
+                       [AC_MSG_RESULT([no])])
+-                  CFLAGS="$op_avx_cflags_save"
+-                 ])
+-           #
+-           # Some combination of gcc and older as would not correctly build the code generated by
+-           # _mm256_loadu_si256. Screen them out.
+-           #
+-           AS_IF([test $op_avx512_support -eq 1],
+-                 [AC_MSG_CHECKING([if _mm512_loadu_si512 generates code that can be compiled])
+-                  op_avx_cflags_save="$CFLAGS"
+-                  CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX512_FLAGS"
+-                  AC_LINK_IFELSE(
+-                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                               [[
++
++                  AS_IF([test $op_avx512_support -eq 0],
++                        [AC_MSG_CHECKING([for AVX512 support (with -mavx512f -mavx512bw -mavx512vl -mavx512dq)])
++                         op_avx_cflags_save="$CFLAGS"
++                         CFLAGS="-mavx512f -mavx512bw -mavx512vl -mavx512dq $CFLAGS"
++                         AC_LINK_IFELSE(
++                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                                              [[
++    __m512 vA, vB;
++    _mm512_add_ps(vA, vB)
++                                       ]])],
++                             [op_avx512_support=1
++                              MCA_BUILD_OP_AVX512_FLAGS="-mavx512f -mavx512bw -mavx512vl -mavx512dq"
++                              AC_MSG_RESULT([yes])],
++                             [AC_MSG_RESULT([no])])
++                         CFLAGS="$op_avx_cflags_save"
++                        ])
++                  #
++                  # Some combination of gcc and older as would not correctly build the code generated by
++                  # _mm256_loadu_si256. Screen them out.
++                  #
++                  AS_IF([test $op_avx512_support -eq 1],
++                        [AC_MSG_CHECKING([if _mm512_loadu_si512 generates code that can be compiled])
++                         op_avx_cflags_save="$CFLAGS"
++                         CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX512_FLAGS"
++                         AC_LINK_IFELSE(
++                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                                      [[
+     int A[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+     __m512i vA = _mm512_loadu_si512((__m512i*)&(A[1]))
+-                               ]])],
+-                      [AC_MSG_RESULT([yes])],
+-                      [op_avx512_support=0
+-                       MCA_BUILD_OP_AVX512_FLAGS=""
+-                       AC_MSG_RESULT([no])])
+-                  CFLAGS="$op_avx_cflags_save"
+-                 ])
+-           #
+-           # Some PGI compilers do not define _mm512_mullo_epi64. Screen them out.
+-           #
+-           AS_IF([test $op_avx512_support -eq 1],
+-                 [AC_MSG_CHECKING([if _mm512_mullo_epi64 generates code that can be compiled])
+-                  op_avx_cflags_save="$CFLAGS"
+-                  CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX512_FLAGS"
+-                  AC_LINK_IFELSE(
+-                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                               [[
++                                      ]])],
++                             [AC_MSG_RESULT([yes])],
++                             [op_avx512_support=0
++                              MCA_BUILD_OP_AVX512_FLAGS=""
++                              AC_MSG_RESULT([no])])
++                         CFLAGS="$op_avx_cflags_save"
++                        ])
++                  #
++                  # Some PGI compilers do not define _mm512_mullo_epi64. Screen them out.
++                  #
++                  AS_IF([test $op_avx512_support -eq 1],
++                        [AC_MSG_CHECKING([if _mm512_mullo_epi64 generates code that can be compiled])
++                         op_avx_cflags_save="$CFLAGS"
++                         CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX512_FLAGS"
++                         AC_LINK_IFELSE(
++                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                                      [[
+     __m512i vA, vB;
+     _mm512_mullo_epi64(vA, vB)
+-                               ]])],
+-                      [AC_MSG_RESULT([yes])],
+-                      [op_avx512_support=0
+-                       MCA_BUILD_OP_AVX512_FLAGS=""
+-                       AC_MSG_RESULT([no])])
+-                  CFLAGS="$op_avx_cflags_save"
+-                 ])
++                                      ]])],
++                             [AC_MSG_RESULT([yes])],
++                             [op_avx512_support=0
++                              MCA_BUILD_OP_AVX512_FLAGS=""
++                              AC_MSG_RESULT([no])])
++                         CFLAGS="$op_avx_cflags_save"
++                        ])])
+            #
+            # Check support for AVX2
+            #
+-           AC_MSG_CHECKING([for AVX2 support (no additional flags)])
+-           AC_LINK_IFELSE(
+-               [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                       [[
++           AC_CACHE_CHECK([if we are checking for AVX2 support], op_avx_check_avx2, AS_VAR_SET(op_avx_check_avx2, yes))
++           AS_IF([test "$op_avx_check_avx2" = "yes"],
++                 [AC_MSG_CHECKING([for AVX2 support (no additional flags)])
++                  AC_LINK_IFELSE(
++                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                              [[
+     __m256 vA, vB;
+     _mm256_add_ps(vA, vB)
+-                       ]])],
+-               [op_avx2_support=1
+-                AC_MSG_RESULT([yes])],
+-               [AC_MSG_RESULT([no])])
+-           AS_IF([test $op_avx2_support -eq 0],
+-               [AC_MSG_CHECKING([for AVX2 support (with -mavx2)])
+-                op_avx_cflags_save="$CFLAGS"
+-                CFLAGS="$CFLAGS -mavx2"
+-                AC_LINK_IFELSE(
+-                    [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                            [[
++                              ]])],
++                      [op_avx2_support=1
++                       AC_MSG_RESULT([yes])],
++                      [AC_MSG_RESULT([no])])
++                  AS_IF([test $op_avx2_support -eq 0],
++                      [AC_MSG_CHECKING([for AVX2 support (with -mavx2)])
++                       op_avx_cflags_save="$CFLAGS"
++                       CFLAGS="-mavx2 $CFLAGS"
++                       AC_LINK_IFELSE(
++                           [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                                   [[
+     __m256 vA, vB;
+     _mm256_add_ps(vA, vB)
+-                            ]])],
+-                    [op_avx2_support=1
+-                     MCA_BUILD_OP_AVX2_FLAGS="-mavx2"
+-                     AC_MSG_RESULT([yes])],
+-                    [AC_MSG_RESULT([no])])
+-                CFLAGS="$op_avx_cflags_save"
+-                ])
+-           #
+-           # Some combination of gcc and older as would not correctly build the code generated by
+-           # _mm256_loadu_si256. Screen them out.
+-           #
+-           AS_IF([test $op_avx2_support -eq 1],
+-                 [AC_MSG_CHECKING([if _mm256_loadu_si256 generates code that can be compiled])
+-                  op_avx_cflags_save="$CFLAGS"
+-                  CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX2_FLAGS"
+-                  AC_LINK_IFELSE(
+-                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                               [[
++                                   ]])],
++                           [op_avx2_support=1
++                            MCA_BUILD_OP_AVX2_FLAGS="-mavx2"
++                            AC_MSG_RESULT([yes])],
++                           [AC_MSG_RESULT([no])])
++                       CFLAGS="$op_avx_cflags_save"
++                       ])
++                  #
++                  # Some combination of gcc and older as would not correctly build the code generated by
++                  # _mm256_loadu_si256. Screen them out.
++                  #
++                  AS_IF([test $op_avx2_support -eq 1],
++                        [AC_MSG_CHECKING([if _mm256_loadu_si256 generates code that can be compiled])
++                         op_avx_cflags_save="$CFLAGS"
++                         CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX2_FLAGS"
++                         AC_LINK_IFELSE(
++                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                                      [[
+     int A[8] = {0, 1, 2, 3, 4, 5, 6, 7};
+     __m256i vA = _mm256_loadu_si256((__m256i*)&A)
+-                               ]])],
+-                      [AC_MSG_RESULT([yes])],
+-                      [op_avx2_support=0
+-                       MCA_BUILD_OP_AVX2_FLAGS=""
+-                       AC_MSG_RESULT([no])])
+-                  CFLAGS="$op_avx_cflags_save"
+-                 ])
++                                      ]])],
++                             [AC_MSG_RESULT([yes])],
++                             [op_avx2_support=0
++                              MCA_BUILD_OP_AVX2_FLAGS=""
++                              AC_MSG_RESULT([no])])
++                         CFLAGS="$op_avx_cflags_save"
++                        ])])
+            #
+            # What about early AVX support. The rest of the logic is slightly different as
+            # we need to include some of the SSE4.1 and SSE3 instructions. So, we first check
+@@ -160,90 +171,92 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+            # the AVX flag, and then recheck if we have support for the SSE4.1 and SSE3
+            # instructions.
+            #
+-           AC_MSG_CHECKING([for AVX support (no additional flags)])
+-           AC_LINK_IFELSE(
+-               [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                       [[
++           AC_CACHE_CHECK([if we are checking for AVX support], op_avx_check_avx, AS_VAR_SET(op_avx_check_avx, yes))
++           AS_IF([test "$op_avx_check_avx" = "yes"],
++                 [AC_MSG_CHECKING([for AVX support (no additional flags)])
++                  AC_LINK_IFELSE(
++                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                              [[
+     __m128 vA, vB;
+     _mm_add_ps(vA, vB)
+-                       ]])],
+-               [op_avx_support=1
+-                AC_MSG_RESULT([yes])],
+-               [AC_MSG_RESULT([no])])
++                              ]])],
++                      [op_avx_support=1
++                       AC_MSG_RESULT([yes])],
++                      [AC_MSG_RESULT([no])])])
+            #
+            # Check for SSE4.1 support
+            #
+-           AS_IF([test $op_avx_support -eq 1],
+-               [AC_MSG_CHECKING([for SSE4.1 support])
+-                AC_LINK_IFELSE(
+-                    [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                            [[
++           AC_CACHE_CHECK([if we are checking for SSE4.1 support], op_avx_check_sse41, AS_VAR_SET(op_avx_check_sse41, yes))
++           AS_IF([test $op_avx_support -eq 1 && test "$op_avx_check_sse41" = "yes"],
++                 [AC_MSG_CHECKING([for SSE4.1 support])
++                  AC_LINK_IFELSE(
++                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                              [[
+     __m128i vA, vB;
+     (void)_mm_max_epi8(vA, vB)
+-                            ]])],
+-                    [op_sse41_support=1
+-                     AC_MSG_RESULT([yes])],
+-                    [AC_MSG_RESULT([no])])
+-                ])
++                              ]])],
++                      [op_sse41_support=1
++                       AC_MSG_RESULT([yes])],
++                      [AC_MSG_RESULT([no])])
++                  ])
+            #
+            # Check for SSE3 support
+            #
+-           AS_IF([test $op_avx_support -eq 1],
+-               [AC_MSG_CHECKING([for SSE3 support])
+-                AC_LINK_IFELSE(
+-                    [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                            [[
++           AC_CACHE_CHECK([if we are checking for SSE3 support], op_avx_check_sse3, AS_VAR_SET(op_avx_check_sse3, yes))
++           AS_IF([test $op_avx_support -eq 1 && test "$op_avx_check_sse3" = "yes"],
++                 [AC_MSG_CHECKING([for SSE3 support])
++                  AC_LINK_IFELSE(
++                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                              [[
+     int A[4] = {0, 1, 2, 3};
+     __m128i vA = _mm_lddqu_si128((__m128i*)&A)
+-                            ]])],
+-                    [op_sse3_support=1
+-                     AC_MSG_RESULT([yes])],
+-                    [AC_MSG_RESULT([no])])
+-                ])
++                              ]])],
++                      [op_sse3_support=1
++                       AC_MSG_RESULT([yes])],
++                      [AC_MSG_RESULT([no])])
++                  ])
+            # Second pass, do we need to add the AVX flag ?
+            AS_IF([test $op_avx_support -eq 0 || test $op_sse41_support -eq 0 || test $op_sse3_support -eq 0],
+-               [AC_MSG_CHECKING([for AVX support (with -mavx)])
+-                op_avx_cflags_save="$CFLAGS"
+-                CFLAGS="$CFLAGS -mavx"
+-                AC_LINK_IFELSE(
+-                    [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                            [[
++                 [AS_IF([test "$op_avx_check_avx" = "yes"],
++                        [AC_MSG_CHECKING([for AVX support (with -mavx)])
++                         op_avx_cflags_save="$CFLAGS"
++                         CFLAGS="-mavx $CFLAGS"
++                         AC_LINK_IFELSE(
++                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                                   [[
+     __m128 vA, vB;
+     _mm_add_ps(vA, vB)
+                             ]])],
+-                    [op_avx_support=1
+-                     MCA_BUILD_OP_AVX_FLAGS="-mavx"
+-                     op_sse41_support=0
+-                     op_sse3_support=0
+-                     AC_MSG_RESULT([yes])],
+-                    [AC_MSG_RESULT([no])])
++                             [op_avx_support=1
++                              MCA_BUILD_OP_AVX_FLAGS="-mavx"
++                              op_sse41_support=0
++                              op_sse3_support=0
++                              AC_MSG_RESULT([yes])],
++                             [AC_MSG_RESULT([no])])])
+ 
+-                AS_IF([test $op_sse41_support -eq 0],
+-                    [AC_MSG_CHECKING([for SSE4.1 support])
+-                     AC_LINK_IFELSE(
+-                         [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+-                                 [[
++                  AS_IF([test "$op_avx_check_sse41" = "yes" && test $op_sse41_support -eq 0],
++                        [AC_MSG_CHECKING([for SSE4.1 support])
++                         AC_LINK_IFELSE(
++                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                                     [[
+     __m128i vA, vB;
+     (void)_mm_max_epi8(vA, vB)
+-                                 ]])],
+-                         [op_sse41_support=1
+-                          AC_MSG_RESULT([yes])],
+-                         [AC_MSG_RESULT([no])])
+-                     ])
+-                AS_IF([test $op_sse3_support -eq 0],
+-                    [AC_MSG_CHECKING([for SSE3 support])
+-                     AC_LINK_IFELSE(
+-                         [AC_LANG_PROGRAM([[#include <immintrin.h>]],
++                                     ]])],
++                             [op_sse41_support=1
++                              AC_MSG_RESULT([yes])],
++                             [AC_MSG_RESULT([no])])])
++                  AS_IF([test "$op_avx_check_sse3" = "yes" && test $op_sse3_support -eq 0],
++                        [AC_MSG_CHECKING([for SSE3 support])
++                         AC_LINK_IFELSE(
++                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+                                  [[
+     int A[4] = {0, 1, 2, 3};
+     __m128i vA = _mm_lddqu_si128((__m128i*)&A)
+                                  ]])],
+-                         [op_sse3_support=1
+-                          AC_MSG_RESULT([yes])],
+-                         [AC_MSG_RESULT([no])])
+-                     ])
+-                CFLAGS="$op_avx_cflags_save"
+-               ])
++                             [op_sse3_support=1
++                              AC_MSG_RESULT([yes])],
++                             [AC_MSG_RESULT([no])])])
++                  CFLAGS="$op_avx_cflags_save"])
+ 
+            AC_LANG_POP([C])
+           ])
+@@ -276,6 +289,12 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+     AC_SUBST(MCA_BUILD_OP_AVX2_FLAGS)
+     AC_SUBST(MCA_BUILD_OP_AVX_FLAGS)
+ 
++    AS_VAR_POPDEF([op_avx_check_avx512])
++    AS_VAR_POPDEF([op_avx_check_avx2])
++    AS_VAR_POPDEF([op_avx_check_avx])
++    AS_VAR_POPDEF([op_avx_check_sse41])
++    AS_VAR_POPDEF([op_avx_check_sse3])
++
+     OPAL_VAR_SCOPE_POP
+     # Enable this component iff we have at least the most basic form of support
+     # for vectorial ISA
+
+From 1c386327da5757632392aa6c967acfbebc85c7ff Mon Sep 17 00:00:00 2001
+From: George Bosilca <bosilca@icl.utk.edu>
+Date: Mon, 28 Dec 2020 12:18:07 -0500
+Subject: [PATCH 2/3] AVX code generation improvements
+
+1. Allow fallback to a lesser AVX support during make
+
+Due to the fact that some distro restrict the compiule architecture
+during make (while not setting any restrictions during configure) we
+need to detect the target architecture also during make in order to
+restrict the code we generate.
+
+2. Add comments and better protect the arch specific code.
+
+Identify all the vectorial functions used and clasify them according to
+the neccesary hardware capabilities.
+Use these requirements to protect the code for load and stores (the rest
+of the code being automatically generated it is more difficult to
+protect).
+
+3. Correctly check for AVX* support.
+
+Signed-off-by: George Bosilca <bosilca@icl.utk.edu>
+---
+ ompi/mca/op/avx/configure.m4       |  28 +--
+ ompi/mca/op/avx/op_avx_functions.c | 322 ++++++++++++++++++++++++-----
+ 2 files changed, 288 insertions(+), 62 deletions(-)
+
+diff --git ompi/mca/op/avx/configure.m4 ompi/mca/op/avx/configure.m4
+index f61b7100ef4..f3651f09d43 100644
+--- ompi/mca/op/avx/configure.m4
++++ ompi/mca/op/avx/configure.m4
+@@ -44,7 +44,7 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+            #
+            # Check for AVX512 support
+            #
+-           AC_CACHE_CHECK([if we are checking for AVX512 support], op_avx_check_avx512, AS_VAR_SET(op_avx_check_avx512, yes))
++           AC_CACHE_CHECK([for AVX512 support], op_avx_check_avx512, AS_VAR_SET(op_avx_check_avx512, yes))
+            AS_IF([test "$op_avx_check_avx512" = "yes"],
+                  [AC_MSG_CHECKING([for AVX512 support (no additional flags)])
+                   AC_LINK_IFELSE(
+@@ -115,14 +115,14 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+            #
+            # Check support for AVX2
+            #
+-           AC_CACHE_CHECK([if we are checking for AVX2 support], op_avx_check_avx2, AS_VAR_SET(op_avx_check_avx2, yes))
++           AC_CACHE_CHECK([for AVX2 support], op_avx_check_avx2, AS_VAR_SET(op_avx_check_avx2, yes))
+            AS_IF([test "$op_avx_check_avx2" = "yes"],
+                  [AC_MSG_CHECKING([for AVX2 support (no additional flags)])
+                   AC_LINK_IFELSE(
+                       [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+                               [[
+-    __m256 vA, vB;
+-    _mm256_add_ps(vA, vB)
++    __m256i vA, vB, vC;
++    vC = _mm256_and_si256(vA, vB)
+                               ]])],
+                       [op_avx2_support=1
+                        AC_MSG_RESULT([yes])],
+@@ -134,8 +134,8 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+                        AC_LINK_IFELSE(
+                            [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+                                    [[
+-    __m256 vA, vB;
+-    _mm256_add_ps(vA, vB)
++    __m256i vA, vB, vC;
++    vC = _mm256_and_si256(vA, vB)
+                                    ]])],
+                            [op_avx2_support=1
+                             MCA_BUILD_OP_AVX2_FLAGS="-mavx2"
+@@ -164,21 +164,21 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+                          CFLAGS="$op_avx_cflags_save"
+                         ])])
+            #
+-           # What about early AVX support. The rest of the logic is slightly different as
++           # What about early AVX support? The rest of the logic is slightly different as
+            # we need to include some of the SSE4.1 and SSE3 instructions. So, we first check
+            # if we can compile AVX code without a flag, then we validate that we have support
+            # for the SSE4.1 and SSE3 instructions we need. If not, we check for the usage of
+            # the AVX flag, and then recheck if we have support for the SSE4.1 and SSE3
+            # instructions.
+            #
+-           AC_CACHE_CHECK([if we are checking for AVX support], op_avx_check_avx, AS_VAR_SET(op_avx_check_avx, yes))
++           AC_CACHE_CHECK([for AVX support], op_avx_check_avx, AS_VAR_SET(op_avx_check_avx, yes))
+            AS_IF([test "$op_avx_check_avx" = "yes"],
+                  [AC_MSG_CHECKING([for AVX support (no additional flags)])
+                   AC_LINK_IFELSE(
+                       [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+                               [[
+-    __m128 vA, vB;
+-    _mm_add_ps(vA, vB)
++    __m256 vA, vB, vC;
++    vC = _mm256_add_ps(vA, vB)
+                               ]])],
+                       [op_avx_support=1
+                        AC_MSG_RESULT([yes])],
+@@ -186,7 +186,7 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+            #
+            # Check for SSE4.1 support
+            #
+-           AC_CACHE_CHECK([if we are checking for SSE4.1 support], op_avx_check_sse41, AS_VAR_SET(op_avx_check_sse41, yes))
++           AC_CACHE_CHECK([for SSE4.1 support], op_avx_check_sse41, AS_VAR_SET(op_avx_check_sse41, yes))
+            AS_IF([test $op_avx_support -eq 1 && test "$op_avx_check_sse41" = "yes"],
+                  [AC_MSG_CHECKING([for SSE4.1 support])
+                   AC_LINK_IFELSE(
+@@ -202,7 +202,7 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+            #
+            # Check for SSE3 support
+            #
+-           AC_CACHE_CHECK([if we are checking for SSE3 support], op_avx_check_sse3, AS_VAR_SET(op_avx_check_sse3, yes))
++           AC_CACHE_CHECK([for SSE3 support], op_avx_check_sse3, AS_VAR_SET(op_avx_check_sse3, yes))
+            AS_IF([test $op_avx_support -eq 1 && test "$op_avx_check_sse3" = "yes"],
+                  [AC_MSG_CHECKING([for SSE3 support])
+                   AC_LINK_IFELSE(
+@@ -224,8 +224,8 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
+                          AC_LINK_IFELSE(
+                              [AC_LANG_PROGRAM([[#include <immintrin.h>]],
+                                    [[
+-    __m128 vA, vB;
+-    _mm_add_ps(vA, vB)
++    __m256 vA, vB, vC;
++    vC = _mm256_add_ps(vA, vB)
+                             ]])],
+                              [op_avx_support=1
+                               MCA_BUILD_OP_AVX_FLAGS="-mavx"
+diff --git ompi/mca/op/avx/op_avx_functions.c ompi/mca/op/avx/op_avx_functions.c
+index c79a8b34506..575ebf95d6a 100644
+--- ompi/mca/op/avx/op_avx_functions.c
++++ ompi/mca/op/avx/op_avx_functions.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2019-2020 The University of Tennessee and The University
++ * Copyright (c) 2019-2021 The University of Tennessee and The University
+  *                         of Tennessee Research Foundation.  All rights
+  *                         reserved.
+  * Copyright (c) 2020      Research Organization for Information Science
+@@ -24,16 +24,42 @@
+ #include "ompi/mca/op/avx/op_avx.h"
+ 
+ #include <immintrin.h>
+-
++/**
++ * The following logic is necessary to cope with distro maintainer's desire to change the compilation
++ * flags after the configure step, leading to inconsistencies between what OMPI has detected and what
++ * code can be generated during make. If we detect that the current code generation architecture has
++ * been changed from our own setting and cannot generate the code we need (AVX512, AVX2) we fall back
++ * to a lesser support (AVX512 -> AVX2, AVX2 -> AVX, AVX -> error out).
++ */
+ #if defined(GENERATE_AVX512_CODE)
+-#define PREPEND _avx512
+-#elif defined(GENERATE_AVX2_CODE)
+-#define PREPEND _avx2
+-#elif defined(GENERATE_AVX_CODE)
+-#define PREPEND _avx
+-#else
+-#error This file should not be compiled in this conditions
+-#endif
++#  if defined(__AVX512BW__) && defined(__AVX512F__) && defined(__AVX512VL__)
++#    define PREPEND _avx512
++#  else
++#    undef GENERATE_AVX512_CODE
++#  endif  /* defined(__AVX512BW__) && defined(__AVX512F__) && defined(__AVX512VL__) */
++#endif  /* defined(GENERATE_AVX512_CODE) */
++
++#if !defined(PREPEND) && defined(GENERATE_AVX2_CODE)
++#  if defined(__AVX2__)
++#    define PREPEND _avx2
++#  else
++#    undef GENERATE_AVX2_CODE
++#  endif  /* defined(__AVX2__) */
++#endif  /* !defined(PREPEND) && defined(GENERATE_AVX2_CODE) */
++
++#if !defined(PREPEND) && defined(GENERATE_AVX_CODE)
++#  if defined(__AVX__)
++#    define PREPEND _avx
++#  endif
++#endif  /* !defined(PREPEND) && defined(GENERATE_AVX_CODE) */
++
++#if !defined(PREPEND)
++#  if OMPI_MCA_OP_HAVE_AVX512 || OMPI_MCA_OP_HAVE_AVX2
++#    error The configure step has detected possible support for AVX512 and/or AVX2 but the compiler flags during make are too restrictive. Please disable the AVX component by adding --enable-mca-no-build=op-avx to your configure step.
++#  else
++#    error This file should not be compiled in this conditions. Please provide the config.log file to the OMPI developers.
++#  endif  /* OMPI_MCA_OP_HAVE_AVX512 || OMPI_MCA_OP_HAVE_AVX2 */
++#endif  /* !defined(PREPEND) */
+ 
+ /*
+  * Concatenate preprocessor tokens A and B without expanding macro definitions
+@@ -46,6 +72,102 @@
+  */
+ #define OP_CONCAT(A, B) OP_CONCAT_NX(A, B)
+ 
++/*
++ * grep -e "_mm[125][251][862]_.*(" avx512.c -o | sed 's/(//g' | sort | uniq
++ *
++ * https://software.intel.com/sites/landingpage/IntrinsicsGuide
++ *
++ * _mm_add_epi[8,16,32,64]         SSE2
++ * _mm_add_pd                      SSE2
++ * _mm_add_ps                      SSE
++ * _mm_adds_epi[8,16]              SSE2
++ * _mm_adds_epu[8,16]              SSE2
++ * _mm_and_si128                   SSE2
++ * _mm_lddqu_si128                 SSE3
++ * _mm_loadu_pd                    SSE2
++ * _mm_loadu_ps                    SSE
++ * _mm_max_epi8                    SSE4.1
++ * _mm_max_epi16                   SSE2
++ * _mm_max_epi32                   SSE4.1
++ * _mm_max_epi64                   AVX512VL + AVX512F
++ * _mm_max_epu8                    SSE2
++ * _mm_max_epu[16,32]              SSE4.1
++ * _mm_max_epu64                   AVX512VL + AVX512F
++ * _mm_max_pd                      SSE2
++ * _mm_max_ps                      SSE
++ * _mm_min_epi8                    SSE4.1
++ * _mm_min_epi16                   SSE2
++ * _mm_min_epi32                   SSE4.1
++ * _mm_min_epi64                   AVX512VL + AVX512F
++ * _mm_min_epu8                    SSE2
++ * _mm_min_epu[16,32]              SSE4.1
++ * _mm_min_epu64                   AVX512VL + AVX512F
++ * _mm_min_pd                      SSE2
++ * _mm_min_ps                      SSE
++ * _mm_mul_pd                      SSE2
++ * _mm_mul_ps                      SSE
++ * _mm_mullo_epi16                 SSE2
++ * _mm_mullo_epi32                 SSE4.1
++ * _mm_mullo_epi64                 AVX512VL + AVX512DQ
++ * _mm_or_si128                    SSE2
++ * _mm_storeu_pd                   SSE2
++ * _mm_storeu_ps                   SSE
++ * _mm_storeu_si128                SSE2
++ * _mm_xor_si128                   SSE2
++ * _mm256_add_epi[8,16,32,64]      AVX2
++ * _mm256_add_p[s,d]               AVX
++ * _mm256_adds_epi[8,16]           AVX2
++ * _mm256_adds_epu[8,16]           AVX2
++ * _mm256_and_si256                AVX2
++ * _mm256_loadu_p[s,d]             AVX
++ * _mm256_loadu_si256              AVX
++ * _mm256_max_epi[8,16,32]         AVX2
++ * _mm256_max_epi64                AVX512VL + AVX512F
++ * _mm256_max_epu[8,16,32]         AVX2
++ * _mm256_max_epu64                AVX512VL + AVX512F
++ * _mm256_max_p[s,d]               AVX
++ * _mm256_min_epi[8,16,32]         AVX2
++ * _mm256_min_epi64                AVX512VL + AVX512F
++ * _mm256_min_epu[8,16,32]         AVX2
++ * _mm256_min_epu64                AVX512VL + AVX512F
++ * _mm256_min_p[s,d]               AVX
++ * _mm256_mul_p[s,d]               AVX
++ * _mm256_mullo_epi[16,32]         AVX2
++ * _mm256_mullo_epi64              AVX512VL + AVX512DQ
++ * _mm256_or_si256                 AVX2
++ * _mm256_storeu_p[s,d]            AVX
++ * _mm256_storeu_si256             AVX
++ * _mm256_xor_si256                AVX2
++ * _mm512_add_epi[8,16]            AVX512BW
++ * _mm512_add_epi[32,64]           AVX512F
++ * _mm512_add_p[s,d]               AVX512F
++ * _mm512_adds_epi[8,16]           AVX512BW
++ * _mm512_adds_epu[8,16]           AVX512BW
++ * _mm512_and_si512                AVX512F
++ * _mm512_cvtepi16_epi8            AVX512BW
++ * _mm512_cvtepi8_epi16            AVX512BW
++ * _mm512_loadu_p[s,d]             AVX512F
++ * _mm512_loadu_si512              AVX512F
++ * _mm512_max_epi[8,16]            AVX512BW
++ * _mm512_max_epi[32,64]           AVX512F
++ * _mm512_max_epu[8,16]            AVX512BW
++ * _mm512_max_epu[32,64]           AVX512F
++ * _mm512_max_p[s,d]               AVX512F
++ * _mm512_min_epi[8,16]            AVX512BW
++ * _mm512_min_epi[32,64]           AVX512F
++ * _mm512_min_epu[8,16]            AVX512BW
++ * _mm512_min_epu[32,64]           AVX512F
++ * _mm512_min_p[s,d]               AVX512F
++ * _mm512_mul_p[s,d]               AVX512F
++ * _mm512_mullo_epi16              AVX512BW
++ * _mm512_mullo_epi32              AVX512F
++ * _mm512_mullo_epi64              AVX512DQ
++ * _mm512_or_si512                 AVX512F
++ * _mm512_storeu_p[s,d]            AVX512F
++ * _mm512_storeu_si512             AVX512F
++ * _mm512_xor_si512                AVX512F
++ */
++
+ /*
+  * Since all the functions in this file are essentially identical, we
+  * use a macro to substitute in names and types.  The core operation
+@@ -62,13 +184,14 @@
+   (((_flag) & mca_op_avx_component.flags) == (_flag))
+ 
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512F__
+ #define OP_AVX_AVX512_FUNC(name, type_sign, type_size, type, op)               \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG|OMPI_OP_AVX_HAS_AVX512BW_FLAG) ) { \
+         int types_per_step = (512 / 8) / sizeof(type);                         \
+         for( ; left_over >= types_per_step; left_over -= types_per_step ) {    \
+-            __m512i vecA =  _mm512_loadu_si512((__m512*)in);                   \
++            __m512i vecA = _mm512_loadu_si512((__m512*)in);                    \
+             in += types_per_step;                                              \
+-            __m512i vecB =  _mm512_loadu_si512((__m512*)out);                  \
++            __m512i vecB = _mm512_loadu_si512((__m512*)out);                   \
+             __m512i res = _mm512_##op##_ep##type_sign##type_size(vecA, vecB);  \
+             _mm512_storeu_si512((__m512*)out, res);                            \
+             out += types_per_step;                                             \
+@@ -76,10 +199,14 @@
+         if( 0 == left_over ) return;                                           \
+     }
+ #else
++#error Target architecture lacks AVX512F support needed for _mm512_loadu_si512 and _mm512_storeu_si512
++#endif  /* __AVX512F__ */
++#else
+ #define OP_AVX_AVX512_FUNC(name, type_sign, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ 
+ #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
++#if __AVX__
+ #define OP_AVX_AVX2_FUNC(name, type_sign, type_size, type, op)                 \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX2_FLAG | OMPI_OP_AVX_HAS_AVX_FLAG) ) {  \
+         int types_per_step = (256 / 8) / sizeof(type);  /* AVX2 */             \
+@@ -87,30 +214,37 @@
+             __m256i vecA = _mm256_loadu_si256((__m256i*)in);                   \
+             in += types_per_step;                                              \
+             __m256i vecB = _mm256_loadu_si256((__m256i*)out);                  \
+-            __m256i res =  _mm256_##op##_ep##type_sign##type_size(vecA, vecB); \
++            __m256i res = _mm256_##op##_ep##type_sign##type_size(vecA, vecB);  \
+             _mm256_storeu_si256((__m256i*)out, res);                           \
+             out += types_per_step;                                             \
+         }                                                                      \
+         if( 0 == left_over ) return;                                           \
+     }
+ #else
++#error Target architecture lacks AVX support needed for _mm256_loadu_si256 and _mm256_storeu_si256
++#endif  /* __AVX__ */
++#else
+ #define OP_AVX_AVX2_FUNC(name, type_sign, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
+ 
+ #if defined(GENERATE_SSE3_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
++#if __SSE3__
+ #define OP_AVX_SSE4_1_FUNC(name, type_sign, type_size, type, op)               \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE3_FLAG | OMPI_OP_AVX_HAS_SSE4_1_FLAG) ) { \
+-        int types_per_step = (128 / 8) / sizeof(type);  /* AVX */              \
++        int types_per_step = (128 / 8) / sizeof(type);                         \
+         for( ; left_over >= types_per_step; left_over -= types_per_step ) {    \
+             __m128i vecA = _mm_lddqu_si128((__m128i*)in);                      \
+             in += types_per_step;                                              \
+             __m128i vecB = _mm_lddqu_si128((__m128i*)out);                     \
+-            __m128i res =  _mm_##op##_ep##type_sign##type_size(vecA, vecB);    \
++            __m128i res = _mm_##op##_ep##type_sign##type_size(vecA, vecB);     \
+             _mm_storeu_si128((__m128i*)out, res);                              \
+             out += types_per_step;                                             \
+         }                                                                      \
+     }
+ #else
++#error Target architecture lacks SSE3 support needed for _mm_lddqu_si128 and _mm_storeu_si128
++#endif  /* __SSE3__ */
++#else
+ #define OP_AVX_SSE4_1_FUNC(name, type_sign, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
+ 
+@@ -143,12 +277,13 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
+ }
+ 
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512BW__ && __AVX__
+ #define OP_AVX_AVX512_MUL(name, type_sign, type_size, type, op)         \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG | OMPI_OP_AVX_HAS_AVX512BW_FLAG) ) {  \
+         int types_per_step = (256 / 8) / sizeof(type);                  \
+         for (; left_over >= types_per_step; left_over -= types_per_step) { \
+-            __m256i vecA_tmp =  _mm256_loadu_si256((__m256i*)in);       \
+-            __m256i vecB_tmp =  _mm256_loadu_si256((__m256i*)out);      \
++            __m256i vecA_tmp = _mm256_loadu_si256((__m256i*)in);        \
++            __m256i vecB_tmp = _mm256_loadu_si256((__m256i*)out);       \
+             in += types_per_step;                                       \
+             __m512i vecA = _mm512_cvtepi8_epi16(vecA_tmp);              \
+             __m512i vecB = _mm512_cvtepi8_epi16(vecB_tmp);              \
+@@ -160,6 +295,9 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX512BW and AVX support needed for _mm256_loadu_si256, _mm256_storeu_si256 and _mm512_cvtepi8_epi16
++#endif  /* __AVX512BW__ && __AVX__ */
++#else
+ #define OP_AVX_AVX512_MUL(name, type_sign, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ /**
+@@ -201,13 +339,14 @@ static void OP_CONCAT( ompi_op_avx_2buff_##name##_##type, PREPEND)(const void *_
+  *
+  */
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512F__
+ #define OP_AVX_AVX512_BIT_FUNC(name, type_size, type, op)               \
+     if( OMPI_OP_AVX_HAS_FLAGS( OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {        \
+         types_per_step = (512 / 8) / sizeof(type);                      \
+         for (; left_over >= types_per_step; left_over -= types_per_step) { \
+-            __m512i vecA =  _mm512_loadu_si512((__m512i*)in);           \
++            __m512i vecA = _mm512_loadu_si512((__m512i*)in);            \
+             in += types_per_step;                                       \
+-            __m512i vecB =  _mm512_loadu_si512((__m512i*)out);          \
++            __m512i vecB = _mm512_loadu_si512((__m512i*)out);           \
+             __m512i res = _mm512_##op##_si512(vecA, vecB);              \
+             _mm512_storeu_si512((__m512i*)out, res);                    \
+             out += types_per_step;                                      \
+@@ -215,10 +354,14 @@ static void OP_CONCAT( ompi_op_avx_2buff_##name##_##type, PREPEND)(const void *_
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX512F support needed for _mm512_loadu_si512 and _mm512_storeu_si512
++#endif  /* __AVX512F__ */
++#else
+ #define OP_AVX_AVX512_BIT_FUNC(name, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ 
+ #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
++#if __AVX__
+ #define OP_AVX_AVX2_BIT_FUNC(name, type_size, type, op)                 \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX2_FLAG | OMPI_OP_AVX_HAS_AVX_FLAG) ) { \
+         types_per_step = (256 / 8) / sizeof(type);                      \
+@@ -226,17 +369,21 @@ static void OP_CONCAT( ompi_op_avx_2buff_##name##_##type, PREPEND)(const void *_
+             __m256i vecA = _mm256_loadu_si256((__m256i*)in);            \
+             in += types_per_step;                                       \
+             __m256i vecB = _mm256_loadu_si256((__m256i*)out);           \
+-            __m256i res =  _mm256_##op##_si256(vecA, vecB);             \
++            __m256i res = _mm256_##op##_si256(vecA, vecB);              \
+             _mm256_storeu_si256((__m256i*)out, res);                    \
+             out += types_per_step;                                      \
+         }                                                               \
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX support needed for _mm256_loadu_si256 and _mm256_storeu_si256
++#endif  /* __AVX__ */
++#else
+ #define OP_AVX_AVX2_BIT_FUNC(name, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
+ 
+ #if defined(GENERATE_SSE3_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
++#if __SSE3__ && __SSE2__
+ #define OP_AVX_SSE3_BIT_FUNC(name, type_size, type, op)                 \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE3_FLAG) ) {            \
+         types_per_step = (128 / 8) / sizeof(type);                      \
+@@ -244,12 +391,15 @@ static void OP_CONCAT( ompi_op_avx_2buff_##name##_##type, PREPEND)(const void *_
+             __m128i vecA = _mm_lddqu_si128((__m128i*)in);               \
+             in += types_per_step;                                       \
+             __m128i vecB = _mm_lddqu_si128((__m128i*)out);              \
+-            __m128i res =  _mm_##op##_si128(vecA, vecB);                \
++            __m128i res = _mm_##op##_si128(vecA, vecB);                 \
+             _mm_storeu_si128((__m128i*)out, res);                       \
+             out += types_per_step;                                      \
+         }                                                               \
+     }
+ #else
++#error Target architecture lacks SSE2 and SSE3 support needed for _mm_lddqu_si128 and _mm_storeu_si128
++#endif  /* __SSE3__ && __SSE2__ */
++#else
+ #define OP_AVX_SSE3_BIT_FUNC(name, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
+ 
+@@ -282,12 +432,13 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
+ }
+ 
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512F__
+ #define OP_AVX_AVX512_FLOAT_FUNC(op)                                    \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
+         types_per_step = (512 / 8) / sizeof(float);                     \
+         for (; left_over >= types_per_step; left_over -= types_per_step) { \
+-            __m512 vecA =  _mm512_loadu_ps((__m512*)in);                \
+-            __m512 vecB =  _mm512_loadu_ps((__m512*)out);         \
++            __m512 vecA = _mm512_loadu_ps((__m512*)in);                 \
++            __m512 vecB = _mm512_loadu_ps((__m512*)out);                \
+             in += types_per_step;                                       \
+             __m512 res = _mm512_##op##_ps(vecA, vecB);                  \
+             _mm512_storeu_ps((__m512*)out, res);                        \
+@@ -296,28 +447,36 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX512F support needed for _mm512_loadu_ps and _mm512_storeu_ps
++#endif  /* __AVX512F__ */
++#else
+ #define OP_AVX_AVX512_FLOAT_FUNC(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ 
+ #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
++#if __AVX__
+ #define OP_AVX_AVX_FLOAT_FUNC(op)                                       \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX_FLAG) ) {             \
+         types_per_step = (256 / 8) / sizeof(float);                     \
+         for( ; left_over >= types_per_step; left_over -= types_per_step ) { \
+-            __m256 vecA =  _mm256_loadu_ps(in);                          \
++            __m256 vecA = _mm256_loadu_ps(in);                          \
+             in += types_per_step;                                       \
+-            __m256 vecB =  _mm256_loadu_ps(out);                         \
++            __m256 vecB = _mm256_loadu_ps(out);                         \
+             __m256 res = _mm256_##op##_ps(vecA, vecB);                  \
+-            _mm256_storeu_ps(out, res);                                  \
++            _mm256_storeu_ps(out, res);                                 \
+             out += types_per_step;                                      \
+         }                                                               \
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX support needed for _mm256_loadu_ps and _mm256_storeu_ps
++#endif  /* __AVX__ */
++#else
+ #define OP_AVX_AVX_FLOAT_FUNC(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
+ 
+ #if defined(GENERATE_AVX_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
++#if __SSE__
+ #define OP_AVX_SSE_FLOAT_FUNC(op)                                       \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE_FLAG) ) {             \
+         types_per_step = (128 / 8) / sizeof(float);                     \
+@@ -331,6 +490,9 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
+         }                                                               \
+     }
+ #else
++#error Target architecture lacks SSE support needed for _mm_loadu_ps and _mm_storeu_ps
++#endif  /* __SSE__ */
++#else
+ #define OP_AVX_SSE_FLOAT_FUNC(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
+ 
+@@ -363,13 +525,14 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_float,PREPEND)(const void *_in, v
+ }
+ 
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512F__
+ #define OP_AVX_AVX512_DOUBLE_FUNC(op)                                   \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
+         types_per_step = (512 / 8)  / sizeof(double);                   \
+         for (; left_over >= types_per_step; left_over -= types_per_step) { \
+-            __m512d vecA =  _mm512_loadu_pd(in);                        \
++            __m512d vecA = _mm512_loadu_pd(in);                         \
+             in += types_per_step;                                       \
+-            __m512d vecB =  _mm512_loadu_pd(out);                       \
++            __m512d vecB = _mm512_loadu_pd(out);                        \
+             __m512d res = _mm512_##op##_pd(vecA, vecB);                 \
+             _mm512_storeu_pd((out), res);                               \
+             out += types_per_step;                                      \
+@@ -377,17 +540,21 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_float,PREPEND)(const void *_in, v
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVXF512 support needed for _mm512_loadu_pd and _mm512_storeu_pd
++#endif  /* __AVXF512__ */
++#else
+ #define OP_AVX_AVX512_DOUBLE_FUNC(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ 
+ #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
++#if __AVX__
+ #define OP_AVX_AVX_DOUBLE_FUNC(op)                                      \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX_FLAG) ) {             \
+         types_per_step = (256 / 8)  / sizeof(double);                   \
+         for( ; left_over >= types_per_step; left_over -= types_per_step ) { \
+-            __m256d vecA =  _mm256_loadu_pd(in);                        \
++            __m256d vecA = _mm256_loadu_pd(in);                         \
+             in += types_per_step;                                       \
+-            __m256d vecB =  _mm256_loadu_pd(out);                       \
++            __m256d vecB = _mm256_loadu_pd(out);                        \
+             __m256d res = _mm256_##op##_pd(vecA, vecB);                 \
+             _mm256_storeu_pd(out, res);                                 \
+             out += types_per_step;                                      \
+@@ -395,10 +562,14 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_float,PREPEND)(const void *_in, v
+         if( 0 == left_over ) return;                                    \
+       }
+ #else
++#error Target architecture lacks AVX support needed for _mm256_loadu_pd and _mm256_storeu_pd
++#endif  /* __AVX__ */
++#else
+ #define OP_AVX_AVX_DOUBLE_FUNC(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
+ 
+ #if defined(GENERATE_AVX_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
++#if __SSE2__
+ #define OP_AVX_SSE2_DOUBLE_FUNC(op)                                     \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE2_FLAG) ) {            \
+         types_per_step = (128 / 8)  / sizeof(double);                   \
+@@ -412,6 +583,9 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_float,PREPEND)(const void *_in, v
+         }                                                               \
+     }
+ #else
++#error Target architecture lacks SSE2 support needed for _mm_loadu_pd and _mm_storeu_pd
++#endif  /* __SSE2__ */
++#else
+ #define OP_AVX_SSE2_DOUBLE_FUNC(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
+ 
+@@ -580,12 +754,13 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_double,PREPEND)(const void *_in,
+  *  routines, needed for some optimizations.
+  */
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512F__
+ #define OP_AVX_AVX512_FUNC_3(name, type_sign, type_size, type, op)      \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG|OMPI_OP_AVX_HAS_AVX512BW_FLAG) ) {   \
+         int types_per_step = (512 / 8) / sizeof(type);                  \
+         for (; left_over >= types_per_step; left_over -= types_per_step) { \
+-            __m512i vecA =  _mm512_loadu_si512(in1);                    \
+-            __m512i vecB =  _mm512_loadu_si512(in2);                    \
++            __m512i vecA = _mm512_loadu_si512(in1);                     \
++            __m512i vecB = _mm512_loadu_si512(in2);                     \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+             __m512i res = _mm512_##op##_ep##type_sign##type_size(vecA, vecB); \
+@@ -595,10 +770,14 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_double,PREPEND)(const void *_in,
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX512F support needed for _mm512_loadu_si512 and _mm512_storeu_si512
++#endif  /* __AVX512F__ */
++#else
+ #define OP_AVX_AVX512_FUNC_3(name, type_sign, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ 
+ #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
++#if __AVX__
+ #define OP_AVX_AVX2_FUNC_3(name, type_sign, type_size, type, op)        \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX2_FLAG | OMPI_OP_AVX_HAS_AVX_FLAG) ) { \
+         int types_per_step = (256 / 8) / sizeof(type);                  \
+@@ -607,17 +786,21 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_double,PREPEND)(const void *_in,
+             __m256i vecB = _mm256_loadu_si256((__m256i*)in2);           \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+-            __m256i res =  _mm256_##op##_ep##type_sign##type_size(vecA, vecB); \
++            __m256i res = _mm256_##op##_ep##type_sign##type_size(vecA, vecB); \
+             _mm256_storeu_si256((__m256i*)out, res);                    \
+             out += types_per_step;                                      \
+         }                                                               \
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX support needed for _mm256_loadu_si256 and _mm256_storeu_si256
++#endif  /* __AVX__ */
++#else
+ #define OP_AVX_AVX2_FUNC_3(name, type_sign, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
+ 
+ #if defined(GENERATE_SSE3_CODE) && defined(OMPI_MCA_OP_HAVE_SSE41) && (1 == OMPI_MCA_OP_HAVE_SSE41) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
++#if __SSE3__ && __SSE2__
+ #define OP_AVX_SSE4_1_FUNC_3(name, type_sign, type_size, type, op)      \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE3_FLAG | OMPI_OP_AVX_HAS_SSE4_1_FLAG) ) {       \
+         int types_per_step = (128 / 8) / sizeof(type);                  \
+@@ -626,12 +809,15 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_double,PREPEND)(const void *_in,
+             __m128i vecB = _mm_lddqu_si128((__m128i*)in2);              \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+-            __m128i res =  _mm_##op##_ep##type_sign##type_size(vecA, vecB); \
++            __m128i res = _mm_##op##_ep##type_sign##type_size(vecA, vecB); \
+             _mm_storeu_si128((__m128i*)out, res);                       \
+             out += types_per_step;                                      \
+         }                                                               \
+     }
+ #else
++#error Target architecture lacks SSE2 and SSE3 support needed for _mm_lddqu_si128 and _mm_storeu_si128
++#endif  /* __SSE3__ && __SSE2__ */
++#else
+ #define OP_AVX_SSE4_1_FUNC_3(name, type_sign, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
+ 
+@@ -667,12 +853,13 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
+ }
+ 
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512BW__ && __AVX__
+ #define OP_AVX_AVX512_MUL_3(name, type_sign, type_size, type, op)       \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG | OMPI_OP_AVX_HAS_AVX512BW_FLAG) ) { \
+         int types_per_step = (256 / 8) / sizeof(type);                  \
+         for (; left_over >= types_per_step; left_over -= types_per_step) { \
+-            __m256i vecA_tmp =  _mm256_loadu_si256((__m256i*)in1);      \
+-            __m256i vecB_tmp =  _mm256_loadu_si256((__m256i*)in2);      \
++            __m256i vecA_tmp = _mm256_loadu_si256((__m256i*)in1);       \
++            __m256i vecB_tmp = _mm256_loadu_si256((__m256i*)in2);       \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+             __m512i vecA = _mm512_cvtepi8_epi16(vecA_tmp);              \
+@@ -685,6 +872,9 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
+         if( 0 == left_over ) return;                                    \
+   }
+ #else
++#error Target architecture lacks AVX512BW and AVX support needed for _mm256_loadu_si256, _mm256_storeu_si256 and _mm512_cvtepi8_epi16
++#endif  /* __AVX512BW__ && __AVX__ */
++#else
+ #define OP_AVX_AVX512_MUL_3(name, type_sign, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ /**
+@@ -723,12 +913,13 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
+ }
+ 
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512F__
+ #define OP_AVX_AVX512_BIT_FUNC_3(name, type_size, type, op)             \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
+         types_per_step = (512 / 8) / sizeof(type);                      \
+         for (; left_over >= types_per_step; left_over -= types_per_step) {  \
+-            __m512i vecA =  _mm512_loadu_si512(in1);                    \
+-            __m512i vecB =  _mm512_loadu_si512(in2);                    \
++            __m512i vecA = _mm512_loadu_si512(in1);                     \
++            __m512i vecB = _mm512_loadu_si512(in2);                     \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+             __m512i res = _mm512_##op##_si512(vecA, vecB);              \
+@@ -738,10 +929,14 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX512F support needed for _mm512_loadu_si512 and _mm512_storeu_si512
++#endif  /* __AVX512F__ */
++#else
+ #define OP_AVX_AVX512_BIT_FUNC_3(name, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ 
+ #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
++#if __AVX__
+ #define OP_AVX_AVX2_BIT_FUNC_3(name, type_size, type, op)               \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX2_FLAG | OMPI_OP_AVX_HAS_AVX_FLAG) ) { \
+         types_per_step = (256 / 8) / sizeof(type);                      \
+@@ -750,17 +945,21 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
+             __m256i vecB = _mm256_loadu_si256((__m256i*)in2);           \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+-            __m256i res =  _mm256_##op##_si256(vecA, vecB);             \
++            __m256i res = _mm256_##op##_si256(vecA, vecB);              \
+             _mm256_storeu_si256((__m256i*)out, res);                    \
+             out += types_per_step;                                      \
+         }                                                               \
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX support needed for _mm256_loadu_si256 and _mm256_storeu_si256
++#endif  /* __AVX__ */
++#else
+ #define OP_AVX_AVX2_BIT_FUNC_3(name, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
+ 
+ #if defined(GENERATE_SSE3_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
++#if __SSE3__ && __SSE2__
+ #define OP_AVX_SSE3_BIT_FUNC_3(name, type_size, type, op)               \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE3_FLAG) ) {            \
+         types_per_step = (128 / 8) / sizeof(type);                      \
+@@ -769,12 +968,15 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
+             __m128i vecB = _mm_lddqu_si128((__m128i*)in2);              \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+-            __m128i res =  _mm_##op##_si128(vecA, vecB);                \
++            __m128i res = _mm_##op##_si128(vecA, vecB);                 \
+             _mm_storeu_si128((__m128i*)out, res);                       \
+             out += types_per_step;                                      \
+         }                                                               \
+     }
+ #else
++#error Target architecture lacks SSE2 and SSE3 support needed for _mm_lddqu_si128 and _mm_storeu_si128
++#endif  /* __SSE3__ && __SSE2__ */
++#else
+ #define OP_AVX_SSE3_BIT_FUNC_3(name, type_size, type, op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
+ 
+@@ -809,12 +1011,13 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_##type,PREPEND)(const void *_in1,
+ }
+ 
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512F__
+ #define OP_AVX_AVX512_FLOAT_FUNC_3(op)                                  \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
+         types_per_step = (512 / 8) / sizeof(float);                     \
+         for (; left_over >= types_per_step; left_over -= types_per_step) { \
+-            __m512 vecA =  _mm512_loadu_ps(in1);                        \
+-            __m512 vecB =  _mm512_loadu_ps(in2);                        \
++            __m512 vecA = _mm512_loadu_ps(in1);                         \
++            __m512 vecB = _mm512_loadu_ps(in2);                         \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+             __m512 res = _mm512_##op##_ps(vecA, vecB);                  \
+@@ -824,16 +1027,20 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_##type,PREPEND)(const void *_in1,
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX512F support needed for _mm512_loadu_ps and _mm512_storeu_ps
++#endif  /* __AVX512F__ */
++#else
+ #define OP_AVX_AVX512_FLOAT_FUNC_3(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ 
+ #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
++#if __AVX__
+ #define OP_AVX_AVX_FLOAT_FUNC_3(op)                                     \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX_FLAG) ) {             \
+         types_per_step = (256 / 8) / sizeof(float);                     \
+         for( ; left_over >= types_per_step; left_over -= types_per_step ) { \
+-            __m256 vecA =  _mm256_loadu_ps(in1);                        \
+-            __m256 vecB =  _mm256_loadu_ps(in2);                        \
++            __m256 vecA = _mm256_loadu_ps(in1);                         \
++            __m256 vecB = _mm256_loadu_ps(in2);                         \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+             __m256 res = _mm256_##op##_ps(vecA, vecB);                  \
+@@ -843,10 +1050,14 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_##type,PREPEND)(const void *_in1,
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX support needed for _mm256_loadu_ps and _mm256_storeu_ps
++#endif  /* __AVX__ */
++#else
+ #define OP_AVX_AVX_FLOAT_FUNC_3(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
+ 
+ #if defined(GENERATE_AVX_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
++#if __SSE__
+ #define OP_AVX_SSE_FLOAT_FUNC_3(op)                  \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE_FLAG) ) {             \
+         types_per_step = (128 / 8) / sizeof(float);                     \
+@@ -861,6 +1072,9 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_##type,PREPEND)(const void *_in1,
+         }                                                               \
+     }
+ #else
++#error Target architecture lacks SSE support needed for _mm_loadu_ps and _mm_storeu_ps
++#endif  /* __SSE__ */
++#else
+ #define OP_AVX_SSE_FLOAT_FUNC_3(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
+ 
+@@ -895,12 +1109,13 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_float,PREPEND)(const void *_in1,
+ }
+ 
+ #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
++#if __AVX512F__
+ #define OP_AVX_AVX512_DOUBLE_FUNC_3(op)                                 \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
+         types_per_step = (512 / 8) / sizeof(double);                    \
+         for (; left_over >= types_per_step; left_over -= types_per_step) { \
+-            __m512d vecA =  _mm512_loadu_pd((in1));                     \
+-            __m512d vecB =  _mm512_loadu_pd((in2));                     \
++            __m512d vecA = _mm512_loadu_pd((in1));                      \
++            __m512d vecB = _mm512_loadu_pd((in2));                      \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+             __m512d res = _mm512_##op##_pd(vecA, vecB);                 \
+@@ -910,16 +1125,20 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_float,PREPEND)(const void *_in1,
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVXF512 support needed for _mm512_loadu_pd and _mm512_storeu_pd
++#endif  /* __AVXF512__ */
++#else
+ #define OP_AVX_AVX512_DOUBLE_FUNC_3(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
+ 
+ #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
++#if __AVX__
+ #define OP_AVX_AVX_DOUBLE_FUNC_3(op)                                    \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX_FLAG) ) {             \
+         types_per_step = (256 / 8) / sizeof(double);                    \
+         for( ; left_over >= types_per_step; left_over -= types_per_step ) { \
+-            __m256d vecA =  _mm256_loadu_pd(in1);                       \
+-            __m256d vecB =  _mm256_loadu_pd(in2);                       \
++            __m256d vecA = _mm256_loadu_pd(in1);                        \
++            __m256d vecB = _mm256_loadu_pd(in2);                        \
+             in1 += types_per_step;                                      \
+             in2 += types_per_step;                                      \
+             __m256d res = _mm256_##op##_pd(vecA, vecB);                 \
+@@ -929,10 +1148,14 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_float,PREPEND)(const void *_in1,
+         if( 0 == left_over ) return;                                    \
+     }
+ #else
++#error Target architecture lacks AVX support needed for _mm256_loadu_pd and _mm256_storeu_pd
++#endif  /* __AVX__ */
++#else
+ #define OP_AVX_AVX_DOUBLE_FUNC_3(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
+ 
+ #if defined(GENERATE_AVX_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
++#if __SSE2__
+ #define OP_AVX_SSE2_DOUBLE_FUNC_3(op)                                   \
+     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE2_FLAG) ) {            \
+         types_per_step = (128 / 8) / sizeof(double);                    \
+@@ -947,6 +1170,9 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_float,PREPEND)(const void *_in1,
+         }                                                               \
+     }
+ #else
++#error Target architecture lacks SSE2 support needed for _mm_loadu_pd and _mm_storeu_pd
++#endif  /* __SSE2__ */
++#else
+ #define OP_AVX_SSE2_DOUBLE_FUNC_3(op) {}
+ #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
+ 
+
+From ac6f658a4127bbfd916f26946330d9906dcbae54 Mon Sep 17 00:00:00 2001
+From: George Bosilca <bosilca@icl.utk.edu>
+Date: Tue, 5 Jan 2021 22:40:26 -0500
+Subject: [PATCH 3/3] A better test for MPI_OP performance.
+
+The test now has the ability to add a shift to all or to any of the
+input and output buffers to assess the impact of unaligned operations.
+
+Signed-off-by: George Bosilca <bosilca@icl.utk.edu>
+---
+ test/datatype/reduce_local.c | 161 ++++++++++++++++++++++-------------
+ 1 file changed, 104 insertions(+), 57 deletions(-)
+
+diff --git test/datatype/reduce_local.c test/datatype/reduce_local.c
+index 97890f94227..f227439b714 100644
+--- test/datatype/reduce_local.c
++++ test/datatype/reduce_local.c
+@@ -59,7 +59,7 @@ static int total_errors = 0;
+      _a < _b ? _a : _b; })
+ 
+ static void print_status(char* op, char* type, int type_size,
+-                         int count, double duration,
++                         int count, int max_shift, double *duration, int repeats,
+                          int correct )
+ {
+     if(correct) {
+@@ -68,7 +68,15 @@ static void print_status(char* op, char* type, int type_size,
+         printf("%-10s %s [\033[1;31mfail\033[0m]", op, type);
+         total_errors++;
+     }
+-    printf(" count  %-10d  time %.6f seconds\n", count, duration);
++    if( 1 == max_shift ) {
++        printf(" count  %-10d  time (seconds) %.8f seconds\n", count, duration[0] / repeats);
++    } else {
++        printf(" count  %-10d  time (seconds / shifts) ", count);
++        for( int i = 0; i < max_shift; i++ ) {
++            printf("%.8f ", duration[i] / repeats );
++        }
++        printf("\n");
++    }
+ }
+ 
+ static int do_ops_built = 0;
+@@ -115,19 +123,23 @@ do { \
+     const TYPE *_p1 = ((TYPE*)(INBUF)), *_p3 = ((TYPE*)(CHECK_BUF)); \
+     TYPE *_p2 = ((TYPE*)(INOUT_BUF)); \
+     skip_op_type = 0; \
+-    for(int _k = 0; _k < min((COUNT), 4); +_k++ ) { \
+-        memcpy(_p2, _p3, sizeof(TYPE) * (COUNT)); \
+-        tstart = MPI_Wtime(); \
+-        MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT)-_k, (MPITYPE), (MPIOP)); \
+-        tend = MPI_Wtime(); \
+-        if( check ) { \
+-            for( i = 0; i < (COUNT)-_k; i++ ) { \
+-                if(((_p2+_k)[i]) == (((_p1+_k)[i]) OPNAME ((_p3+_k)[i]))) \
+-                    continue; \
+-                printf("First error at alignment %d position %d (%" TYPE_PREFIX " %s %" TYPE_PREFIX " != %" TYPE_PREFIX ")\n", \
+-                       _k, i, (_p1+_k)[i], (#OPNAME), (_p3+_k)[i], (_p2+_k)[i]); \
+-                correctness = 0; \
+-                break; \
++    for(int _k = 0; _k < min((COUNT), max_shift); +_k++ ) { \
++        duration[_k] = 0.0; \
++        for(int _r = repeats; _r > 0; _r--) { \
++            memcpy(_p2, _p3, sizeof(TYPE) * (COUNT)); \
++            tstart = MPI_Wtime(); \
++            MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT)-_k, (MPITYPE), (MPIOP)); \
++            tend = MPI_Wtime(); \
++            duration[_k] += (tend - tstart); \
++            if( check ) { \
++                for( i = 0; i < (COUNT)-_k; i++ ) { \
++                    if(((_p2+_k)[i]) == (((_p1+_k)[i]) OPNAME ((_p3+_k)[i]))) \
++                        continue; \
++                    printf("First error at alignment %d position %d (%" TYPE_PREFIX " %s %" TYPE_PREFIX " != %" TYPE_PREFIX ")\n", \
++                           _k, i, (_p1+_k)[i], (#OPNAME), (_p3+_k)[i], (_p2+_k)[i]); \
++                    correctness = 0; \
++                    break; \
++                } \
+             } \
+         } \
+     } \
+@@ -139,20 +151,24 @@ do { \
+     const TYPE *_p1 = ((TYPE*)(INBUF)), *_p3 = ((TYPE*)(CHECK_BUF)); \
+     TYPE *_p2 = ((TYPE*)(INOUT_BUF)); \
+     skip_op_type = 0; \
+-    for(int _k = 0; _k < min((COUNT), 4); +_k++ ) { \
+-        memcpy(_p2, _p3, sizeof(TYPE) * (COUNT)); \
+-        tstart = MPI_Wtime(); \
+-        MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT), (MPITYPE), (MPIOP)); \
+-        tend = MPI_Wtime(); \
+-        if( check ) { \
+-            for( i = 0; i < (COUNT); i++ ) { \
+-                TYPE _v1 = *(_p1+_k), _v2 = *(_p2+_k), _v3 = *(_p3+_k); \
+-                if(_v2 == OPNAME(_v1, _v3)) \
+-                    continue; \
+-                printf("First error at alignment %d position %d (%" TYPE_PREFIX " !=  %s(%" TYPE_PREFIX ", %" TYPE_PREFIX ")\n", \
+-                       _k, i, _v1, (#OPNAME), _v3, _v2); \
+-                correctness = 0; \
+-                break; \
++    for(int _k = 0; _k < min((COUNT), max_shift); +_k++ ) { \
++        duration[_k] = 0.0; \
++        for(int _r = repeats; _r > 0; _r--) { \
++            memcpy(_p2, _p3, sizeof(TYPE) * (COUNT)); \
++            tstart = MPI_Wtime(); \
++            MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT), (MPITYPE), (MPIOP)); \
++            tend = MPI_Wtime(); \
++            duration[_k] += (tend - tstart); \
++            if( check ) { \
++                for( i = 0; i < (COUNT); i++ ) { \
++                    TYPE _v1 = *(_p1+_k), _v2 = *(_p2+_k), _v3 = *(_p3+_k); \
++                    if(_v2 == OPNAME(_v1, _v3)) \
++                        continue; \
++                    printf("First error at alignment %d position %d (%" TYPE_PREFIX " !=  %s(%" TYPE_PREFIX ", %" TYPE_PREFIX ")\n", \
++                           _k, i, _v1, (#OPNAME), _v3, _v2); \
++                    correctness = 0; \
++                    break; \
++                } \
+             } \
+         } \
+     } \
+@@ -163,24 +179,36 @@ int main(int argc, char **argv)
+ {
+     static void *in_buf = NULL, *inout_buf = NULL, *inout_check_buf = NULL;
+     int count, type_size = 8, rank, size, provided, correctness = 1;
+-    int repeats = 1, i, c;
+-    double tstart, tend;
++    int repeats = 1, i, c, op1_alignment = 0, res_alignment = 0;
++    int max_shift = 4;
++    double *duration, tstart, tend;
+     bool check = true;
+     char type[5] = "uifd", *op = "sum", *mpi_type;
+     int lower = 1, upper = 1000000, skip_op_type;
+     MPI_Op mpi_op;
+ 
+-    while( -1 != (c = getopt(argc, argv, "l:u:t:o:s:n:vfh")) ) {
++    while( -1 != (c = getopt(argc, argv, "l:u:r:t:o:i:s:n:1:2:vfh")) ) {
+         switch(c) {
+         case 'l':
+             lower = atoi(optarg);
+             if( lower <= 0 ) {
+-                fprintf(stderr, "The number of elements must be positive\n");
++                fprintf(stderr, "The lower number of elements must be positive\n");
+                 exit(-1);
+             }
+             break;
+         case 'u':
+             upper = atoi(optarg);
++            if( lower <= 0 ) {
++                fprintf(stderr, "The upper number of elements must be positive\n");
++                exit(-1);
++            }
++            break;
++        case 'i':
++            max_shift = atoi(optarg);
++            if( max_shift <= 0 ) {
++                fprintf(stderr, "The max shift must be positive\n");
++                exit(-1);
++            }
+             break;
+         case 'f':
+             check = false;
+@@ -216,14 +244,32 @@ int main(int argc, char **argv)
+                 exit(-1);
+             }
+             break;
++        case '1':
++            op1_alignment = atoi(optarg);
++            if( op1_alignment < 0 ) {
++                fprintf(stderr, "alignment for the first operand must be positive\n");
++                exit(-1);
++            }
++            break;
++        case '2':
++            res_alignment = atoi(optarg);
++            if( res_alignment < 0 ) {
++                fprintf(stderr, "alignment for the result must be positive\n");
++                exit(-1);
++            }
++            break;
+         case 'h':
+             fprintf(stdout, "%s options are:\n"
+                     " -l <number> : lower number of elements\n"
+                     " -u <number> : upper number of elements\n"
+                     " -s <type_size> : 8, 16, 32 or 64 bits elements\n"
+                     " -t [i,u,f,d] : type of the elements to apply the operations on\n"
++                    " -r <number> : number of repetitions for each test\n"
+                     " -o <op> : comma separated list of operations to execute among\n"
+                     "           sum, min, max, prod, bor, bxor, band\n"
++                    " -i <number> : shift on all buffers to check alignment\n"
++                    " -1 <number> : (mis)alignment in elements for the first op\n"
++                    " -2 <number> : (mis)alignment in elements for the result\n"
+                     " -v: increase the verbosity level\n"
+                     " -h: this help message\n", argv[0]);
+             exit(0);
+@@ -233,9 +279,10 @@ int main(int argc, char **argv)
+     if( !do_ops_built ) {  /* not yet done, take the default */
+             build_do_ops( "all", do_ops);
+     }
+-    in_buf          = malloc(upper * sizeof(double));
+-    inout_buf       = malloc(upper * sizeof(double));
+-    inout_check_buf = malloc(upper * sizeof(double));
++    posix_memalign( &in_buf,          64, (upper + op1_alignment) * sizeof(double));
++    posix_memalign( &inout_buf,       64, (upper + res_alignment) * sizeof(double));
++    posix_memalign( &inout_check_buf, 64, upper * sizeof(double));
++    duration = (double*)malloc(max_shift * sizeof(double));
+ 
+     ompi_mpi_init(argc, argv, MPI_THREAD_SERIALIZED, &provided, false);
+ 
+@@ -253,8 +300,8 @@ int main(int argc, char **argv)
+                 correctness = 1;
+                 if('i' == type[type_idx]) {
+                     if( 8 == type_size ) {
+-                        int8_t *in_int8 = (int8_t*)in_buf,
+-                            *inout_int8 = (int8_t*)inout_buf,
++                        int8_t *in_int8 = (int8_t*)((char*)in_buf + op1_alignment * sizeof(int8_t)),
++                            *inout_int8 = (int8_t*)((char*)inout_buf + res_alignment * sizeof(int8_t)),
+                             *inout_int8_for_check = (int8_t*)inout_check_buf;
+                         for( i = 0; i < count; i++ ) {
+                             in_int8[i] = 5;
+@@ -299,8 +346,8 @@ int main(int argc, char **argv)
+                         }
+                     }
+                     if( 16 == type_size ) {
+-                        int16_t *in_int16 = (int16_t*)in_buf,
+-                            *inout_int16 = (int16_t*)inout_buf,
++                        int16_t *in_int16 = (int16_t*)((char*)in_buf + op1_alignment * sizeof(int16_t)),
++                            *inout_int16 = (int16_t*)((char*)inout_buf + res_alignment * sizeof(int16_t)),
+                             *inout_int16_for_check = (int16_t*)inout_check_buf;
+                         for( i = 0; i < count; i++ ) {
+                             in_int16[i] = 5;
+@@ -345,8 +392,8 @@ int main(int argc, char **argv)
+                         }
+                     }
+                     if( 32 == type_size ) {
+-                        int32_t *in_int32 = (int32_t*)in_buf,
+-                            *inout_int32 = (int32_t*)inout_buf,
++                        int32_t *in_int32 = (int32_t*)((char*)in_buf + op1_alignment * sizeof(int32_t)),
++                            *inout_int32 = (int32_t*)((char*)inout_buf + res_alignment * sizeof(int32_t)),
+                             *inout_int32_for_check = (int32_t*)inout_check_buf;
+                         for( i = 0; i < count; i++ ) {
+                             in_int32[i] = 5;
+@@ -391,8 +438,8 @@ int main(int argc, char **argv)
+                         }
+                     }
+                     if( 64 == type_size ) {
+-                        int64_t *in_int64 = (int64_t*)in_buf,
+-                            *inout_int64 = (int64_t*)inout_buf,
++                        int64_t *in_int64 = (int64_t*)((char*)in_buf + op1_alignment * sizeof(int64_t)),
++                            *inout_int64 = (int64_t*)((char*)inout_buf + res_alignment * sizeof(int64_t)),
+                             *inout_int64_for_check = (int64_t*)inout_check_buf;
+                         for( i = 0; i < count; i++ ) {
+                             in_int64[i] = 5;
+@@ -440,8 +487,8 @@ int main(int argc, char **argv)
+ 
+                 if( 'u' == type[type_idx] ) {
+                     if( 8 == type_size ) {
+-                        uint8_t *in_uint8 = (uint8_t*)in_buf,
+-                            *inout_uint8 = (uint8_t*)inout_buf,
++                        uint8_t *in_uint8 = (uint8_t*)((char*)in_buf + op1_alignment * sizeof(uint8_t)),
++                            *inout_uint8 = (uint8_t*)((char*)inout_buf + res_alignment * sizeof(uint8_t)),
+                             *inout_uint8_for_check = (uint8_t*)inout_check_buf;
+                         for( i = 0; i < count; i++ ) {
+                             in_uint8[i] = 5;
+@@ -486,8 +533,8 @@ int main(int argc, char **argv)
+                         }
+                     }
+                     if( 16 == type_size ) {
+-                        uint16_t *in_uint16 = (uint16_t*)in_buf,
+-                            *inout_uint16 = (uint16_t*)inout_buf,
++                        uint16_t *in_uint16 = (uint16_t*)((char*)in_buf + op1_alignment * sizeof(uint16_t)),
++                            *inout_uint16 = (uint16_t*)((char*)inout_buf + res_alignment * sizeof(uint16_t)),
+                             *inout_uint16_for_check = (uint16_t*)inout_check_buf;
+                         for( i = 0; i < count; i++ ) {
+                             in_uint16[i] = 5;
+@@ -532,8 +579,8 @@ int main(int argc, char **argv)
+                         }
+                     }
+                     if( 32 == type_size ) {
+-                        uint32_t *in_uint32 = (uint32_t*)in_buf,
+-                            *inout_uint32 = (uint32_t*)inout_buf,
++                        uint32_t *in_uint32 = (uint32_t*)((char*)in_buf + op1_alignment * sizeof(uint32_t)),
++                            *inout_uint32 = (uint32_t*)((char*)inout_buf + res_alignment * sizeof(uint32_t)),
+                             *inout_uint32_for_check = (uint32_t*)inout_check_buf;
+                         for( i = 0; i < count; i++ ) {
+                             in_uint32[i] = 5;
+@@ -578,8 +625,8 @@ int main(int argc, char **argv)
+                         }
+                     }
+                     if( 64 == type_size ) {
+-                        uint64_t *in_uint64 = (uint64_t*)in_buf,
+-                              *inout_uint64 = (uint64_t*)inout_buf,
++                        uint64_t *in_uint64 = (uint64_t*)((char*)in_buf + op1_alignment * sizeof(uint64_t)),
++                              *inout_uint64 = (uint64_t*)((char*)inout_buf + res_alignment * sizeof(uint64_t)),
+                             *inout_uint64_for_check = (uint64_t*)inout_check_buf;
+                         for( i = 0; i < count; i++ ) {
+                             in_uint64[i] = 5;
+@@ -626,8 +673,8 @@ int main(int argc, char **argv)
+                 }
+ 
+                 if( 'f' == type[type_idx] ) {
+-                    float *in_float = (float*)in_buf,
+-                        *inout_float = (float*)inout_buf,
++                    float *in_float = (float*)((char*)in_buf + op1_alignment * sizeof(float)),
++                        *inout_float = (float*)((char*)inout_buf + res_alignment * sizeof(float)),
+                         *inout_float_for_check = (float*)inout_check_buf;
+                     for( i = 0; i < count; i++ ) {
+                         in_float[i] = 1000.0+1;
+@@ -658,8 +705,8 @@ int main(int argc, char **argv)
+                 }
+ 
+                 if( 'd' == type[type_idx] ) {
+-                    double *in_double = (double*)in_buf,
+-                        *inout_double = (double*)inout_buf,
++                    double *in_double = (double*)((char*)in_buf + op1_alignment * sizeof(double)),
++                        *inout_double = (double*)((char*)inout_buf + res_alignment * sizeof(double)),
+                         *inout_double_for_check = (double*)inout_check_buf;
+                     for( i = 0; i < count; i++ ) {
+                         in_double[i] = 10.0+1;
+@@ -691,7 +738,7 @@ int main(int argc, char **argv)
+         check_and_continue:
+                 if( !skip_op_type )
+                     print_status(array_of_ops[do_ops[op_idx]].mpi_op_name,
+-                                 mpi_type, type_size, count, tend-tstart, correctness);
++                                 mpi_type, type_size, count, max_shift, duration, repeats, correctness);
+             }
+             if( !skip_op_type )
+                 printf("\n");
diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index 5f962b4fd38d..c0eeb69b1e3a 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -1,12 +1,11 @@
 # Template file for 'openmpi'
 pkgname=openmpi
 version=4.1.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="gcc-fortran libgomp-devel perl pkg-config"
-makedepends="libgfortran-devel libgomp-devel libhwloc-devel zlib-devel
- libevent-devel"
+hostmakedepends="gcc-fortran libgomp-devel perl pkg-config automake libtool"
+makedepends="libgfortran-devel libgomp-devel libhwloc-devel zlib-devel libevent-devel"
 conf_files="
  /etc/openmpi-default-hostfile
  /etc/openmpi-mca-params.conf
@@ -26,6 +25,8 @@ post_extract() {
 }
 
 pre_configure() {
+	./autogen.pl --force
+
 	# used wrongly upstream? but nocross anyway
 	export CFLAGS="$CFLAGS $LDFLAGS"
 	export CXXFLAGS="$CXXFLAGS $LDFLAGS"

From 085a8b54943a9613f309d3eed0368c3a67a2606e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Feb 2021 08:28:26 -0500
Subject: [PATCH 2309/3458] python3: touch to trigger aarch64 build

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

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 8ba2baee2b15..fa8b19a95196 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3'
 #
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
+# THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
 version=3.9.2

From 16cd22972be21a1903d849a4a24b56daf89e7d39 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Feb 2021 08:28:39 -0500
Subject: [PATCH 2310/3458] python3-tkinter: touch to trigger aarch64 build

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

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index a7b4fa914b58..47824807034e 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -1,8 +1,9 @@
 # Template file for 'python3-tkinter'
 #
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python3"; IT IS SPLIT TO AVOID A
-# CYCLIC DEPENDENCY: python3 -> tk -> libX11 -> libxcb -> xcb-proto -> python3
-#
+# THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3"
+# 
+# IT IS SPLIT TO AVOID A CYCLIC DEPENDENCY:
+#   python3 -> tk -> libX11 -> libxcb -> xcb-proto -> python3
 
 _desc="Python programming language"
 

From ea76c82a25e9b7c8bf355ebcc3f1d015f022a56a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Feb 2021 09:09:44 -0500
Subject: [PATCH 2311/3458] python3-bokeh: update to 2.3.0.

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

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index 01d495f3dc2c..06b57a615c52 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-bokeh'
 pkgname=python3-bokeh
-version=2.2.3
+version=2.3.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
 homepage="https://bokeh.org"
 changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG"
 distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz"
-checksum=c4a3f97afe5f525019dd58ee8c4e3d43f53fe1b1ac264ccaae9b02c07b2abc17
+checksum=dd417708f90702190222b1068a645acae99e66d4b58d7a336d545aeaa04e9b40
 
 do_check() {
 	echo "Tests have unpackaged dependencies and require fetching data; skipping"

From b40e9a7480743d3fbc4ebce8ce039fdc27d77c76 Mon Sep 17 00:00:00 2001
From: TC <git@titouan.co>
Date: Fri, 26 Feb 2021 15:25:07 +0100
Subject: [PATCH 2312/3458] python3-pipx: add missing dependency

---
 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 77f215ac8c60..b1b4454ec85d 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
 version=0.16.1.0
-revision=1
+revision=2
 wrksrc="pipx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-argcomplete python3-userpath python3-setuptools python3-packaging"
+depends="python3-argcomplete python3-colorama python3-userpath python3-setuptools python3-packaging"
 short_desc="Install and Run Python Applications in Isolated Environments"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From edc541b8cfcb2d582e8c3987ef21e3db9a3fc54b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 26 Feb 2021 17:17:14 +0100
Subject: [PATCH 2313/3458] virtualbox-ose: fix dkms w/ linux5.11

---
 .../patches/018-vboxnetflt-linux5.11.patch             | 10 ++++++++++
 srcpkgs/virtualbox-ose/template                        |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/virtualbox-ose/patches/018-vboxnetflt-linux5.11.patch

diff --git a/srcpkgs/virtualbox-ose/patches/018-vboxnetflt-linux5.11.patch b/srcpkgs/virtualbox-ose/patches/018-vboxnetflt-linux5.11.patch
new file mode 100644
index 000000000000..8d7a4e86f495
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/patches/018-vboxnetflt-linux5.11.patch
@@ -0,0 +1,10 @@
+--- src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	2021-01-07 16:41:28.000000000 +0100
++++ src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	2021-02-26 17:02:45.083599418 +0100
+@@ -38,6 +38,7 @@
+ #include <linux/nsproxy.h>
+ #endif
+ #include <linux/netdevice.h>
++#include <linux/ethtool.h>
+ #include <linux/etherdevice.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/miscdevice.h>
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c9edf805df8f..d1efe1931d5b 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.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9780f277f6054e1e7431e48df1a191abc7e6e2f9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 26 Feb 2021 16:41:31 +0100
Subject: [PATCH 2314/3458] New package: poke-1.0

---
 srcpkgs/poke-devel    |  1 +
 srcpkgs/poke/template | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 120000 srcpkgs/poke-devel
 create mode 100644 srcpkgs/poke/template

diff --git a/srcpkgs/poke-devel b/srcpkgs/poke-devel
new file mode 120000
index 000000000000..16ae230b8ed0
--- /dev/null
+++ b/srcpkgs/poke-devel
@@ -0,0 +1 @@
+poke
\ No newline at end of file
diff --git a/srcpkgs/poke/template b/srcpkgs/poke/template
new file mode 100644
index 000000000000..3083839acd73
--- /dev/null
+++ b/srcpkgs/poke/template
@@ -0,0 +1,24 @@
+# Template file for 'poke'
+pkgname=poke
+version=1.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="gc-devel json-c-devel libatomic_ops-devel readline-devel"
+checkdepends="dejagnu"
+short_desc="Extensible editor for structured binary data"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="http://www.jemarch.net/poke.html"
+distfiles="${GNU_SITE}/poke/poke-${version}.tar.gz"
+checksum=de930b8700c0772b3c2cd0d0ca35f50fd3d77bdf82c6251eb516b49e8ca25b0a
+
+poke-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 501628008e6394f9e58df6be1d9f4c1045780e36 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 26 Feb 2021 17:26:25 +0100
Subject: [PATCH 2315/3458] knot-resolver: update to 5.3.0.

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

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index c8448f219cc6..cfc297980547 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,6 +1,6 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.2.1
+version=5.3.0
 revision=1
 build_style=meson
 configure_args="
@@ -17,7 +17,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=aa37b744c400f437acba7a54aebcbdbe722ece743d342cbc39f2dd8087f05826
+checksum=fb6cb2c03f4fffbdd8a0098127383d03b14cf7d6abf3a0cd229fb13ff68ee33e
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From 0dac07b8091f3181de20b3bb0ee0b190b6cc0796 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 26 Feb 2021 18:21:56 +0200
Subject: [PATCH 2316/3458] sublime-merge-bin: update to 2047.

---
 srcpkgs/sublime-merge-bin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index a57b827e614e..3a1604294e23 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,18 +1,18 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2039
+version=2047
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
 hostmakedepends="w3m"
 depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
 short_desc="New Git client, from the makers of Sublime Text"
-maintainer="Adelmo Junior <noblehelm@gmail.com>"
+maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=289218c5a06ad7516477456d7e372d01fc0fbeb5761d239835ef442a11200251
-_license_checksum=d2ee1cc3f8af74d1eacc960a81fdf1ebe58a9b801bf0b2e2a2302fdefb0ee370
+checksum=2ad671b58d5a00f8ccef4bcc6c2b4e119a4b16c4b79b448bf03775e822e4400d
+_license_checksum=0cf0c605c296198b1b176dcb56343e7eb4f297fdcc7ec64dc347bcabf48fc4e8
 nopie=yes
 repository=nonfree
 restricted=yes

From 4256ed48c5f35137641af94ff65e463e97663b0c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 26 Feb 2021 17:44:13 +0100
Subject: [PATCH 2317/3458] linux5.11: add (back) good patches, drop bad
 patches, enable ppc*

---
 .../patches/ppc-stack-traces-early-boot.patch |  37 +++++
 .../linux5.11/patches/ppc32-cpu-hotplug.patch |  34 -----
 .../patches/ppc64le-fix-static-keys.patch     | 140 ++++++++++++++++++
 .../linux5.11/patches/ppcle-broken-vdso.patch |  23 ---
 srcpkgs/linux5.11/patches/ppcle-enable.patch  |  23 +++
 srcpkgs/linux5.11/template                    |   3 +-
 6 files changed, 201 insertions(+), 59 deletions(-)
 create mode 100644 srcpkgs/linux5.11/patches/ppc-stack-traces-early-boot.patch
 delete mode 100644 srcpkgs/linux5.11/patches/ppc32-cpu-hotplug.patch
 create mode 100644 srcpkgs/linux5.11/patches/ppc64le-fix-static-keys.patch
 delete mode 100644 srcpkgs/linux5.11/patches/ppcle-broken-vdso.patch
 create mode 100644 srcpkgs/linux5.11/patches/ppcle-enable.patch

diff --git a/srcpkgs/linux5.11/patches/ppc-stack-traces-early-boot.patch b/srcpkgs/linux5.11/patches/ppc-stack-traces-early-boot.patch
new file mode 100644
index 000000000000..08b250113f3b
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/ppc-stack-traces-early-boot.patch
@@ -0,0 +1,37 @@
+From 0ecf6a9e47d825b7dddfebca738386b809e59a94 Mon Sep 17 00:00:00 2001
+From: Michael Ellerman <mpe@ellerman.id.au>
+Date: Wed, 3 Feb 2021 00:02:06 +1100
+Subject: powerpc/64: Make stack tracing work during very early boot
+
+If we try to stack trace very early during boot, either due to a
+WARN/BUG or manual dump_stack(), we will oops in
+valid_emergency_stack() when we try to dereference the paca_ptrs
+array.
+
+The fix is simple, we just return false if paca_ptrs isn't allocated
+yet. The stack pointer definitely isn't part of any emergency stack
+because we haven't allocated any yet.
+
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20210202130207.1303975-1-mpe@ellerman.id.au
+---
+ arch/powerpc/kernel/process.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
+index 8520ed5ae144d..e296440e9d16a 100644
+--- a/arch/powerpc/kernel/process.c
++++ b/arch/powerpc/kernel/process.c
+@@ -2047,6 +2047,9 @@ static inline int valid_emergency_stack(unsigned long sp, struct task_struct *p,
+ 	unsigned long stack_page;
+ 	unsigned long cpu = task_cpu(p);
+ 
++	if (!paca_ptrs)
++		return 0;
++
+ 	stack_page = (unsigned long)paca_ptrs[cpu]->emergency_sp - THREAD_SIZE;
+ 	if (sp >= stack_page && sp <= stack_page + THREAD_SIZE - nbytes)
+ 		return 1;
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/srcpkgs/linux5.11/patches/ppc32-cpu-hotplug.patch b/srcpkgs/linux5.11/patches/ppc32-cpu-hotplug.patch
deleted file mode 100644
index f61d9e497bed..000000000000
--- a/srcpkgs/linux5.11/patches/ppc32-cpu-hotplug.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Drop after the respective upstream fix.
-
-From e3f22abab59aad3af3b555c4aa9af4441d7b4085 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Thu, 17 Dec 2020 22:28:12 +0100
-Subject: [PATCH] powerpc: only call cleanup_cpu_mmu_context on PPC64 powermacs
-
-Originally introduced in 01b0f0eae0812e80efeee4ee17687e5386335e08.
-
-This was only implemented on book3s64, so on ppc32 build fails
-with implicit function declaration.
-
-Signed-off-by: Daniel Kolesa <daniel@octaforge.org>
----
- arch/powerpc/platforms/powermac/smp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
-index adae2a67..7ad90fd0 100644
---- a/arch/powerpc/platforms/powermac/smp.c
-+++ b/arch/powerpc/platforms/powermac/smp.c
-@@ -911,7 +911,9 @@ static int smp_core99_cpu_disable(void)
- 
- 	mpic_cpu_set_priority(0xf);
- 
-+#ifdef CONFIG_PPC64
- 	cleanup_cpu_mmu_context();
-+#endif
- 
- 	return 0;
- }
--- 
-2.29.2
-
diff --git a/srcpkgs/linux5.11/patches/ppc64le-fix-static-keys.patch b/srcpkgs/linux5.11/patches/ppc64le-fix-static-keys.patch
new file mode 100644
index 000000000000..d48f4039581f
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/ppc64le-fix-static-keys.patch
@@ -0,0 +1,140 @@
+From e7eb919057c3450cdd9d335e4a23a4da8da58db4 Mon Sep 17 00:00:00 2001
+From: Michael Ellerman <mpe@ellerman.id.au>
+Date: Wed, 3 Feb 2021 00:02:07 +1100
+Subject: [PATCH] powerpc/64s: Handle program checks in wrong endian during
+ early boot
+
+There's a short window during boot where although the kernel is
+running little endian, any exceptions will cause the CPU to switch
+back to big endian. This situation persists until we call
+configure_exceptions(), which calls either the hypervisor or OPAL to
+configure the CPU so that exceptions will be taken in little
+endian (via HID0[HILE]).
+
+We don't intend to take exceptions during early boot, but one way we
+sometimes do is via a WARN/BUG etc. Those all boil down to a trap
+instruction, which will cause a program check exception.
+
+The first instruction of the program check handler is an mtsprg, which
+when executed in the wrong endian is an lhzu with a ~3GB displacement
+from r3. The content of r3 is random, so that becomes a load from some
+random location, and depending on the system (installed RAM etc.) can
+easily lead to a checkstop, or an infinitely recursive page fault.
+That prevents whatever the WARN/BUG was complaining about being
+printed to the console, and the user just sees a dead system.
+
+We can fix it by having a trampoline at the beginning of the program
+check handler that detects we are in the wrong endian, and flips us
+back to the correct endian.
+
+We can't flip MSR[LE] using mtmsr (alas), so we have to use rfid. That
+requires backing up SRR0/1 as well as a GPR. To do that we use
+SPRG0/2/3 (SPRG1 is already used for the paca). SPRG3 is user
+readable, but this trampoline is only active very early in boot, and
+SPRG3 will be reinitialised in vdso_getcpu_init() before userspace
+starts.
+
+With this trampoline in place we can survive a WARN early in boot and
+print a stack trace, which is eventually printed to the console once
+the console is up, eg:
+
+  [83565.758545] kexec_core: Starting new kernel
+  [    0.000000] ------------[ cut here ]------------
+  [    0.000000] static_key_enable_cpuslocked(): static key '0xc000000000ea6160' used before call to jump_label_init()
+  [    0.000000] WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xfc/0x120
+  [    0.000000] Modules linked in:
+  [    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.10.0-gcc-8.2.0-dirty #618
+  [    0.000000] NIP:  c0000000002fd46c LR: c0000000002fd468 CTR: c000000000170660
+  [    0.000000] REGS: c000000001227940 TRAP: 0700   Not tainted  (5.10.0-gcc-8.2.0-dirty)
+  [    0.000000] MSR:  9000000002823003 <SF,HV,VEC,VSX,FP,ME,RI,LE>  CR: 24882422  XER: 20040000
+  [    0.000000] CFAR: 0000000000000730 IRQMASK: 1
+  [    0.000000] GPR00: c0000000002fd468 c000000001227bd0 c000000001228300 0000000000000065
+  [    0.000000] GPR04: 0000000000000001 0000000000000065 c0000000010cf970 000000000000000d
+  [    0.000000] GPR08: 0000000000000000 0000000000000000 0000000000000000 c00000000122763f
+  [    0.000000] GPR12: 0000000000002000 c000000000f8a980 0000000000000000 0000000000000000
+  [    0.000000] GPR16: 0000000000000000 0000000000000000 c000000000f88c8e c000000000f88c9a
+  [    0.000000] GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
+  [    0.000000] GPR24: 0000000000000000 c000000000dea3a8 0000000000000000 c000000000f35114
+  [    0.000000] GPR28: 0000002800000000 c000000000f88c9a c000000000f88c8e c000000000ea6160
+  [    0.000000] NIP [c0000000002fd46c] static_key_enable_cpuslocked+0xfc/0x120
+  [    0.000000] LR [c0000000002fd468] static_key_enable_cpuslocked+0xf8/0x120
+  [    0.000000] Call Trace:
+  [    0.000000] [c000000001227bd0] [c0000000002fd468] static_key_enable_cpuslocked+0xf8/0x120 (unreliable)
+  [    0.000000] [c000000001227c40] [c0000000002fd4c0] static_key_enable+0x30/0x50
+  [    0.000000] [c000000001227c70] [c000000000f6629c] early_page_poison_param+0x58/0x9c
+  [    0.000000] [c000000001227cb0] [c000000000f351b8] do_early_param+0xa4/0x10c
+  [    0.000000] [c000000001227d30] [c00000000011e020] parse_args+0x270/0x5e0
+  [    0.000000] [c000000001227e20] [c000000000f35864] parse_early_options+0x48/0x5c
+  [    0.000000] [c000000001227e40] [c000000000f358d0] parse_early_param+0x58/0x84
+  [    0.000000] [c000000001227e70] [c000000000f3a368] early_init_devtree+0xc4/0x490
+  [    0.000000] [c000000001227f10] [c000000000f3bca0] early_setup+0xc8/0x1c8
+  [    0.000000] [c000000001227f90] [000000000000c320] 0xc320
+  [    0.000000] Instruction dump:
+  [    0.000000] 4bfffddd 7c2004ac 39200001 913f0000 4bffffb8 7c651b78 3c82ffac 3c62ffc0
+  [    0.000000] 38841b00 3863f310 4bdf03a5 60000000 <0fe00000> 4bffff38 60000000 60000000
+  [    0.000000] random: get_random_bytes called from print_oops_end_marker+0x40/0x80 with crng_init=0
+  [    0.000000] ---[ end trace 0000000000000000 ]---
+  [    0.000000] dt-cpu-ftrs: setup for ISA 3000
+
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20210202130207.1303975-2-mpe@ellerman.id.au
+---
+ arch/powerpc/kernel/exceptions-64s.S | 45 ++++++++++++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
+index b3793f982b2be..c51c436d5845f 100644
+--- a/arch/powerpc/kernel/exceptions-64s.S
++++ b/arch/powerpc/kernel/exceptions-64s.S
+@@ -1630,6 +1630,51 @@ INT_DEFINE_BEGIN(program_check)
+ INT_DEFINE_END(program_check)
+ 
+ EXC_REAL_BEGIN(program_check, 0x700, 0x100)
++
++#ifdef CONFIG_CPU_LITTLE_ENDIAN
++	/*
++	 * There's a short window during boot where although the kernel is
++	 * running little endian, any exceptions will cause the CPU to switch
++	 * back to big endian. For example a WARN() boils down to a trap
++	 * instruction, which will cause a program check, and we end up here but
++	 * with the CPU in big endian mode. The first instruction of the program
++	 * check handler (in GEN_INT_ENTRY below) is an mtsprg, which when
++	 * executed in the wrong endian is an lhzu with a ~3GB displacement from
++	 * r3. The content of r3 is random, so that is a load from some random
++	 * location, and depending on the system can easily lead to a checkstop,
++	 * or an infinitely recursive page fault.
++	 *
++	 * So to handle that case we have a trampoline here that can detect we
++	 * are in the wrong endian and flip us back to the correct endian. We
++	 * can't flip MSR[LE] using mtmsr, so we have to use rfid. That requires
++	 * backing up SRR0/1 as well as a GPR. To do that we use SPRG0/2/3, as
++	 * SPRG1 is already used for the paca. SPRG3 is user readable, but this
++	 * trampoline is only active very early in boot, and SPRG3 will be
++	 * reinitialised in vdso_getcpu_init() before userspace starts.
++	 */
++BEGIN_FTR_SECTION
++	tdi   0,0,0x48    // Trap never, or in reverse endian: b . + 8
++	b     1f          // Skip trampoline if endian is correct
++	.long 0xa643707d  // mtsprg  0, r11      Backup r11
++	.long 0xa6027a7d  // mfsrr0  r11
++	.long 0xa643727d  // mtsprg  2, r11      Backup SRR0 in SPRG2
++	.long 0xa6027b7d  // mfsrr1  r11
++	.long 0xa643737d  // mtsprg  3, r11      Backup SRR1 in SPRG3
++	.long 0xa600607d  // mfmsr   r11
++	.long 0x01006b69  // xori    r11, r11, 1 Invert MSR[LE]
++	.long 0xa6037b7d  // mtsrr1  r11
++	.long 0x34076039  // li      r11, 0x734
++	.long 0xa6037a7d  // mtsrr0  r11
++	.long 0x2400004c  // rfid
++	mfsprg r11, 3
++	mtsrr1 r11        // Restore SRR1
++	mfsprg r11, 2
++	mtsrr0 r11        // Restore SRR0
++	mfsprg r11, 0     // Restore r11
++1:
++END_FTR_SECTION(0, 1)     // nop out after boot
++#endif /* CONFIG_CPU_LITTLE_ENDIAN */
++
+ 	GEN_INT_ENTRY program_check, virt=0
+ EXC_REAL_END(program_check, 0x700, 0x100)
+ EXC_VIRT_BEGIN(program_check, 0x4700, 0x100)
diff --git a/srcpkgs/linux5.11/patches/ppcle-broken-vdso.patch b/srcpkgs/linux5.11/patches/ppcle-broken-vdso.patch
deleted file mode 100644
index c559a94b196f..000000000000
--- a/srcpkgs/linux5.11/patches/ppcle-broken-vdso.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Disable vDSOs which are broken on 32 bit LE.
-
-Source: @eerykitty
-
-diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso32/vdso32.lds.S
-index a4b806b..0614638 100644
---- a/arch/powerpc/kernel/vdso32/vdso32.lds.S
-+++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S
-@@ -116,12 +116,14 @@ VERSION
- 	VDSO_VERSION_STRING {
- 	global:
- 		__kernel_get_syscall_map;
-+#ifndef __LITTLE_ENDIAN__
- 		__kernel_gettimeofday;
- 		__kernel_clock_gettime;
- 		__kernel_clock_gettime64;
- 		__kernel_clock_getres;
- 		__kernel_time;
- 		__kernel_get_tbfreq;
-+#endif
- 		__kernel_sync_dicache;
- 		__kernel_sigtramp32;
- 		__kernel_sigtramp_rt32;
diff --git a/srcpkgs/linux5.11/patches/ppcle-enable.patch b/srcpkgs/linux5.11/patches/ppcle-enable.patch
new file mode 100644
index 000000000000..b86ac79dde88
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/ppcle-enable.patch
@@ -0,0 +1,23 @@
+These are experimental fixes for running 32-bit little endian binaries on
+Linux/ppc64le. While this may seem pointless, it does work, does not break
+anything, and may allow enablement of things we couldn't do before (e.g.
+support for box86 and thus reasonably fast emulation of 32-bit x86 games).
+
+The first part is a signal handler fix, the second part enables the 32-bit
+VDSO by removing the ppc32/big endian restriction.
+
+Source: @eerykitty
+
+--- a/arch/powerpc/kernel/signal_32.c
++++ b/arch/powerpc/kernel/signal_32.c
+@@ -1427,8 +1427,9 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset,
+ 	regs->gpr[3] = ksig->sig;
+ 	regs->gpr[4] = (unsigned long) sc;
+ 	regs->nip = (unsigned long)ksig->ka.sa.sa_handler;
+-	/* enter the signal handler in big-endian mode */
++	/* enter the signal handler in native-endian mode */
+ 	regs->msr &= ~MSR_LE;
++	regs->msr |= (MSR_KERNEL & MSR_LE);
+ 	return 0;
+ 
+ badframe:
diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 08a8348811f0..1fcff6820c1e 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -16,8 +16,7 @@ python_version=3
 patch_args="-Np1"
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
-# XXX Add ppc back only if page poisoning is fixed
-archs="x86_64* i686* aarch64*"
+archs="x86_64* i686* aarch64* ppc*"
 
 nodebug=yes  # -dbg package is generated below manually
 nostrip=yes

From f679d39b540db43c7a05e363ffa233d7092df7bc Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 12 Feb 2021 21:45:56 +0400
Subject: [PATCH 2318/3458] nghttp2: update to 1.43.0.

By ericonr:
- python3 deps are necessary only if python bindings are being built,
which nothing requires; disable them for now. If bindings switch to
being built, following env vars are also needed for cross (found by
skmpz):
      export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
      export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}"

Closes: #28707 [via git-merge-pr]
---
 srcpkgs/nghttp2/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f36..89e0b6b8af93 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,8 +1,10 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
-version=1.42.0
+version=1.43.0
 revision=1
 build_style=gnu-configure
+# build system errors out if python isn't available
+configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
 makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
@@ -12,7 +14,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://nghttp2.org"
 distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz"
-checksum=c5a7f09020f31247d0d1609078a75efadeccb7e5b86fc2e4389189b1b431fe63
+checksum=f7d54fa6f8aed29f695ca44612136fa2359013547394d5dffeffca9e01a26b0f
 python_version=3
 
 post_install() {

From 342a614e393df9001ee95edf0fb0cf266f9de140 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 5 Nov 2020 21:32:59 +0400
Subject: [PATCH 2319/3458] New package: caja-dropbox-1.24.0

---
 srcpkgs/caja-dropbox/template | 19 +++++++++++++++++++
 srcpkgs/caja-dropbox/update   |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 srcpkgs/caja-dropbox/template
 create mode 100644 srcpkgs/caja-dropbox/update

diff --git a/srcpkgs/caja-dropbox/template b/srcpkgs/caja-dropbox/template
new file mode 100644
index 000000000000..952cccbd43a5
--- /dev/null
+++ b/srcpkgs/caja-dropbox/template
@@ -0,0 +1,19 @@
+# Template file for 'caja-dropbox'
+pkgname=caja-dropbox
+version=1.24.0
+revision=1
+build_style=gnu-configure
+configure_args="--disable-gksu --disable-static"
+hostmakedepends="pkg-config python3-docutils python3-gobject gdk-pixbuf-devel"
+makedepends="libcaja-devel glib-devel gtk+3-devel python3-gobject-devel"
+depends="caja"
+short_desc="Dropbox extension for Caja file manager"
+maintainer="skmpz <dem.procopiou@gmail.com>"
+license="CC-BY-ND-3.0, GPL-3.0-or-later"
+homepage="https://mate-desktop.org"
+distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=224a6ad0b9cc994384192469fbcd745f077e85577f57d58b85695754b04096e5
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/caja-dropbox/update b/srcpkgs/caja-dropbox/update
new file mode 100644
index 000000000000..5636324afbce
--- /dev/null
+++ b/srcpkgs/caja-dropbox/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"

From d4424f8be8497c03bbca33629501e222ebd912fa Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 26 Feb 2021 18:59:17 +0100
Subject: [PATCH 2320/3458] lowdown: update to 0.8.2.

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

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index 7baa4bf2de34..f7cf1acba040 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.1
+version=0.8.2
 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=e69b71b06bc26e538ba43b55134b931a7580b9bc8466b5f92408bbcd8354f394
+checksum=098c5df1d3c25f287427181913390b8bc1cc8cfac99b2d968f0c2d50966fa2c4
 
 post_install() {
 	vlicense LICENSE.md

From a5000c9e61967a5ae0f5d515b044adcb58a1dc02 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 18 Feb 2021 18:34:30 +0300
Subject: [PATCH 2321/3458] qalculate: update to 3.17.0

By ericonr:
- fix cross
---
 srcpkgs/qalculate/patches/cross.patch | 25 +++++++++++++++++++++++++
 srcpkgs/qalculate/template            |  4 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qalculate/patches/cross.patch

diff --git a/srcpkgs/qalculate/patches/cross.patch b/srcpkgs/qalculate/patches/cross.patch
new file mode 100644
index 000000000000..d6d146ec4136
--- /dev/null
+++ b/srcpkgs/qalculate/patches/cross.patch
@@ -0,0 +1,25 @@
+commit 4e227a03aaf5dfe3f9007c9d5f3516534d6b9006
+Author: Érico Rolim <erico.erc@gmail.com>
+Date:   Fri Feb 26 15:08:28 2021 -0300
+
+    Fix cross by building fixpo for the build system.
+    
+    Necessary after:
+    https://github.com/Qalculate/libqalculate/commit/8c4526941aed1e39187dba25eb1a74e8f91b56e0
+
+diff --git po-defs/Makefile.in po-defs/Makefile.in
+index af5218a..2c0f09e 100644
+--- po-defs/Makefile.in
++++ po-defs/Makefile.in
+@@ -399,9 +399,8 @@ clean-noinstPROGRAMS:
+ 	echo " rm -f" $$list; \
+ 	rm -f $$list
+ 
+-fixpo$(EXEEXT): $(fixpo_OBJECTS) $(fixpo_DEPENDENCIES) $(EXTRA_fixpo_DEPENDENCIES) 
+-	@rm -f fixpo$(EXEEXT)
+-	$(AM_V_CXXLD)$(CXXLINK) $(fixpo_OBJECTS) $(fixpo_LDADD) $(LIBS)
++fixpo$(EXEEXT): $(fixpo_SOURCES)
++	g++ $< -o $@
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index ec81d9cf9fd1..c223601ef705 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.16.1
+version=3.17.0
 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=bbe837073bf0d1995fe7ead4aae2b2e24260351048f6a513a9ca210342ce8e59
+checksum=7ea06b140b9238b44473e07b60e1e8cb5271e45b80cbdc27e7eb2e6f82c2ec8c
 
 libqalculate_package() {
 	short_desc+=" - library files"

From 442207893286816cbdaf97ef1fa0d7cf564d6bb5 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 18 Feb 2021 18:41:51 +0300
Subject: [PATCH 2322/3458] qalculate-gtk: update to 3.17.0

Closes: #28844 [via git-merge-pr]
---
 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 8d31b0842187..c8d3c8e309a8 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.16.0
+version=3.17.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=79cbdb9705921cbe5fe9593fb798cb68c455596bc20584c6d4c930c28137655f
+checksum=b95f4be3c6fd883dec280a92d46b4678f8a7de2e5b654344246bb9d87695626b

From 978ed69aca4b15cbce1bf94f0e274d76e4a8d905 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Fri, 26 Feb 2021 15:28:33 -0300
Subject: [PATCH 2323/3458] rust-analyzer: update to 2021.02.22.

---
 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 ff19c777d36d..f32c3b27177d 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.08
+version=2021.02.22
 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=f69633a368ecadba107ac38e041de29e37c1237ba742fe4a58c05dca69143cf5
+checksum=dbd152018e8327427dfaf12e7887134e51ce2567f2f6ad603ca0967f9370e92d
 
 export RUST_ANALYZER_REV=${_ver}
 

From 835c6238e8b4823a28cfe3a2233f2936434b2446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 13:55:23 -0300
Subject: [PATCH 2324/3458] linux5.11: update to 5.11.2.

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

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 1fcff6820c1e..555700f216a0 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.1
+version=5.11.2
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- 8808ee2c7e904f2fb3c830b41c8bbc2b2ad37638ee95fdfde68167f0be35dd3f"
+ 7a6d20308aed903a81a67e76e7c6cd294fb7cbb87f887e2168097da865def8ba"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 9c4e9a1d7f3a79e4979a7e7723f44b6bd5e54e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 16:33:54 -0300
Subject: [PATCH 2325/3458] timidity: explain broken= for musl.

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

diff --git a/srcpkgs/timidity/template b/srcpkgs/timidity/template
index 859e21578d60..855acc2f043c 100644
--- a/srcpkgs/timidity/template
+++ b/srcpkgs/timidity/template
@@ -19,7 +19,7 @@ distfiles="${SOURCEFORGE_SITE}/timidity/TiMidity++-${version}.tar.xz"
 checksum=9eaf4fadb0e19eb8e35cd4ac16142d604c589e43d0e8798237333697e6381d39
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="build finishes, but timidity segfaults right after execution";;
+	*-musl) broken="uses alsa's pcm_old.h, which depends on symbol versioning to work";;
 esac
 
 if [ "$CROSS_BUILD" ]; then

From 2958b8462ed7c3d3fb6ae680a8598f3525879124 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 26 Feb 2021 20:34:09 +0100
Subject: [PATCH 2326/3458] linux5.11: restore display on amd navi, maybe
 elsewhere

---
 srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch | 184 ++++++++++++++++++
 1 file changed, 184 insertions(+)
 create mode 100644 srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch

diff --git a/srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch b/srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch
new file mode 100644
index 000000000000..8d618cf26c94
--- /dev/null
+++ b/srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch
@@ -0,0 +1,184 @@
+From efc8278eecfd5e6fa36c5d41e71d038f534fe107 Mon Sep 17 00:00:00 2001
+From: Anson Jacob <Anson.Jacob@amd.com>
+Date: Thu, 18 Feb 2021 19:42:57 -0500
+Subject: Revert "drm/amd/display: reuse current context instead of recreating
+ one"
+
+This reverts commit 8866a67ab86cc0812e65c04f1ef02bcc41e24d68.
+
+Reason for revert: This breaks hotplug of HDMI on some systems,
+resulting in a blank screen. Caused general hangs on boot/hotplugs.
+
+Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1487
+Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1492
+Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211649
+Signed-off-by: Anson Jacob <Anson.Jacob@amd.com>
+Reviewed-by: Bhawanpreet Lakha <bhawanpreet.lakha@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 ++++++++++---------
+ drivers/gpu/drm/amd/display/dc/core/dc.c          | 27 +++++++----------------
+ drivers/gpu/drm/amd/display/dc/dc_stream.h        |  3 ++-
+ 3 files changed, 23 insertions(+), 30 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 94cd5ddd67ef8..344404c4ac75b 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -1936,7 +1936,7 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state,
+ 		dc_commit_updates_for_stream(
+ 			dm->dc, bundle->surface_updates,
+ 			dc_state->stream_status->plane_count,
+-			dc_state->streams[k], &bundle->stream_update);
++			dc_state->streams[k], &bundle->stream_update, dc_state);
+ 	}
+ 
+ cleanup:
+@@ -1967,7 +1967,8 @@ static void dm_set_dpms_off(struct dc_link *link)
+ 
+ 	stream_update.stream = stream_state;
+ 	dc_commit_updates_for_stream(stream_state->ctx->dc, NULL, 0,
+-				     stream_state, &stream_update);
++				     stream_state, &stream_update,
++				     stream_state->ctx->dc->current_state);
+ 	mutex_unlock(&adev->dm.dc_lock);
+ }
+ 
+@@ -7663,7 +7664,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
+ 				    struct drm_crtc *pcrtc,
+ 				    bool wait_for_vblank)
+ {
+-	int i;
++	uint32_t i;
+ 	uint64_t timestamp_ns;
+ 	struct drm_plane *plane;
+ 	struct drm_plane_state *old_plane_state, *new_plane_state;
+@@ -7704,7 +7705,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
+ 		amdgpu_dm_commit_cursors(state);
+ 
+ 	/* update planes when needed */
+-	for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
++	for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
+ 		struct drm_crtc *crtc = new_plane_state->crtc;
+ 		struct drm_crtc_state *new_crtc_state;
+ 		struct drm_framebuffer *fb = new_plane_state->fb;
+@@ -7927,7 +7928,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
+ 						     bundle->surface_updates,
+ 						     planes_count,
+ 						     acrtc_state->stream,
+-						     &bundle->stream_update);
++						     &bundle->stream_update,
++						     dc_state);
+ 
+ 		/**
+ 		 * Enable or disable the interrupts on the backend.
+@@ -8263,13 +8265,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
+ 		struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);
+ 		struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state);
+ 		struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc);
+-		struct dc_surface_update surface_updates[MAX_SURFACES];
++		struct dc_surface_update dummy_updates[MAX_SURFACES];
+ 		struct dc_stream_update stream_update;
+ 		struct dc_info_packet hdr_packet;
+ 		struct dc_stream_status *status = NULL;
+ 		bool abm_changed, hdr_changed, scaling_changed;
+ 
+-		memset(&surface_updates, 0, sizeof(surface_updates));
++		memset(&dummy_updates, 0, sizeof(dummy_updates));
+ 		memset(&stream_update, 0, sizeof(stream_update));
+ 
+ 		if (acrtc) {
+@@ -8326,15 +8328,16 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
+ 		 * To fix this, DC should permit updating only stream properties.
+ 		 */
+ 		for (j = 0; j < status->plane_count; j++)
+-			surface_updates[j].surface = status->plane_states[j];
++			dummy_updates[j].surface = status->plane_states[0];
+ 
+ 
+ 		mutex_lock(&dm->dc_lock);
+ 		dc_commit_updates_for_stream(dm->dc,
+-						surface_updates,
++						     dummy_updates,
+ 						     status->plane_count,
+ 						     dm_new_crtc_state->stream,
+-						     &stream_update);
++						     &stream_update,
++						     dc_state);
+ 		mutex_unlock(&dm->dc_lock);
+ 	}
+ 
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index c9aede2f783d3..8f8a13c7cf73d 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -2697,7 +2697,8 @@ void dc_commit_updates_for_stream(struct dc *dc,
+ 		struct dc_surface_update *srf_updates,
+ 		int surface_count,
+ 		struct dc_stream_state *stream,
+-		struct dc_stream_update *stream_update)
++		struct dc_stream_update *stream_update,
++		struct dc_state *state)
+ {
+ 	const struct dc_stream_status *stream_status;
+ 	enum surface_update_type update_type;
+@@ -2716,12 +2717,6 @@ void dc_commit_updates_for_stream(struct dc *dc,
+ 
+ 
+ 	if (update_type >= UPDATE_TYPE_FULL) {
+-		struct dc_plane_state *new_planes[MAX_SURFACES];
+-
+-		memset(new_planes, 0, sizeof(new_planes));
+-
+-		for (i = 0; i < surface_count; i++)
+-			new_planes[i] = srf_updates[i].surface;
+ 
+ 		/* initialize scratch memory for building context */
+ 		context = dc_create_state(dc);
+@@ -2730,21 +2725,15 @@ void dc_commit_updates_for_stream(struct dc *dc,
+ 			return;
+ 		}
+ 
+-		dc_resource_state_copy_construct(
+-				dc->current_state, context);
++		dc_resource_state_copy_construct(state, context);
+ 
+-		/*remove old surfaces from context */
+-		if (!dc_rem_all_planes_for_stream(dc, stream, context)) {
+-			DC_ERROR("Failed to remove streams for new validate context!\n");
+-			return;
+-		}
++		for (i = 0; i < dc->res_pool->pipe_count; i++) {
++			struct pipe_ctx *new_pipe = &context->res_ctx.pipe_ctx[i];
++			struct pipe_ctx *old_pipe = &dc->current_state->res_ctx.pipe_ctx[i];
+ 
+-		/* add surface to context */
+-		if (!dc_add_all_planes_for_stream(dc, stream, new_planes, surface_count, context)) {
+-			DC_ERROR("Failed to add streams for new validate context!\n");
+-			return;
++			if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state)
++				new_pipe->plane_state->force_full_update = true;
+ 		}
+-
+ 	}
+ 
+ 
+diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
+index a4f7ec888c676..80b67b860091e 100644
+--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
++++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
+@@ -294,7 +294,8 @@ void dc_commit_updates_for_stream(struct dc *dc,
+ 		struct dc_surface_update *srf_updates,
+ 		int surface_count,
+ 		struct dc_stream_state *stream,
+-		struct dc_stream_update *stream_update);
++		struct dc_stream_update *stream_update,
++		struct dc_state *state);
+ /*
+  * Log the current stream state.
+  */
+-- 
+cgit 1.2.3-1.el7
+

From ba9f65df7469fab54d1e3e4c1c42de9363b09966 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 26 Feb 2021 14:49:08 -0500
Subject: [PATCH 2327/3458] linux5.11: rebuild with AMD patch

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 555700f216a0..283e2ec85e43 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.2
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

From cf735a4259cb4ca8685f9e360c78f9920e5bdf78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:37:08 +0100
Subject: [PATCH 2328/3458] kwin: fix night color plugin/color management

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

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 4234b682a060..dcbfb2684764 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,14 +1,14 @@
 # Template file for 'kwin'
 pkgname=kwin
 version=5.21.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
 makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel
  kscreenlocker-devel kinit-devel xcb-util-cursor-devel qt5-multimedia-devel
  kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel
- libICE-devel xcb-util-wm-devel qt5-sensors-devel libcap-devel
+ libICE-devel xcb-util-wm-devel qt5-sensors-devel libcap-devel lcms2-devel
  kwayland-server-devel $(vopt_if pipewire pipewire-devel) krunner-devel"
 depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.15.3"
 short_desc="KDE Window manager"

From 75641fedf3edebbdf33174ec9733b630be4cff85 Mon Sep 17 00:00:00 2001
From: TC <git@titouan.co>
Date: Fri, 26 Feb 2021 20:26:45 +0100
Subject: [PATCH 2329/3458] python3-colorama: update to 0.4.4.

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

diff --git a/srcpkgs/python3-colorama/template b/srcpkgs/python3-colorama/template
index b8e418bb4c46..3545117fe9e3 100644
--- a/srcpkgs/python3-colorama/template
+++ b/srcpkgs/python3-colorama/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-colorama'
 pkgname=python3-colorama
-version=0.4.1
+version=0.4.4
 revision=4
 wrksrc="colorama-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="BSD-3-Clause"
 homepage="https://github.com/tartley/colorama"
 distfiles="${PYPI_SITE}/c/colorama/colorama-${version}.tar.gz"
-checksum=05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d
+checksum=5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b
 
 post_install() {
 	vlicense LICENSE.txt

From 4982bd919dd7e2fc0fe6d4bdb65c5877b05c9f60 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 27 Feb 2021 00:24:24 +0100
Subject: [PATCH 2330/3458] linux5.11: fix ppc32 build (bad dotconfig)

---
 srcpkgs/linux5.11/files/ppc-dotconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.11/files/ppc-dotconfig b/srcpkgs/linux5.11/files/ppc-dotconfig
index c794bedc6209..d47126937ab8 100644
--- a/srcpkgs/linux5.11/files/ppc-dotconfig
+++ b/srcpkgs/linux5.11/files/ppc-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.11.1 Kernel Configuration
+# Linux/powerpc 5.11.2 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
@@ -5205,7 +5205,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 # CONFIG_DRM_LONTIUM_LT9611 is not set
-CONFIG_DRM_LONTIUM_LT9611UXC=m
+# CONFIG_DRM_LONTIUM_LT9611UXC 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

From 00d7f9e0113657ffede6ae08763bdc12ab892d8f Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Wed, 24 Feb 2021 20:17:20 +0000
Subject: [PATCH 2331/3458] dunst: update to 1.6.1 Drop make_build_target it
 defaults to all Add wayland support (default force_wayland = false) Drop
 binary files install it's now handled too

update
---
 srcpkgs/dunst/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index ce1c91a5a53a..9d054656c503 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -1,23 +1,24 @@
 # Template file for 'dunst'
 pkgname=dunst
-version=1.5.0
+version=1.6.1
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
-make_build_target="all dunstify"
+make_build_args="SYSTEMD=0 WAYLAND=$(vopt_if wayland 1 0)"
 hostmakedepends="perl pkg-config"
 makedepends="gtk+-devel libXScrnSaver-devel libXinerama-devel libXrandr-devel
- libxdg-basedir-devel libnotify-devel"
+ libxdg-basedir-devel libnotify-devel $(vopt_if wayland 'wayland-devel wayland-protocols')"
 short_desc="Lightweight and customizable notification daemon"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="BSD-3-Clause"
 homepage="https://dunst-project.org"
 changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
 distfiles="https://github.com/dunst-project/dunst/archive/v${version}.tar.gz"
-checksum=2c390adf144b5fa0ff007ea3616c90f1bb537df6a8042196993f5585d1bc8c9a
+checksum=cc7d801575f75e92b18d46ee5d3df80aaf331c88b83ec6caabbecf8636310e13
+
+build_options="wayland"
+build_options_default="wayland"
 
 post_install() {
 	vlicense LICENSE
-	vbin dunstctl
-	vbin dunstify
 }

From d1604452c4fe6070cafbbda963f177147e601409 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 9 Nov 2020 01:10:56 +0300
Subject: [PATCH 2332/3458] New package: vivid-0.6.0

---
 srcpkgs/vivid/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/vivid/template

diff --git a/srcpkgs/vivid/template b/srcpkgs/vivid/template
new file mode 100644
index 000000000000..39124a35dc79
--- /dev/null
+++ b/srcpkgs/vivid/template
@@ -0,0 +1,20 @@
+# Template file for 'vivid'
+pkgname=vivid
+version=0.6.0
+revision=1
+build_style=cargo
+short_desc="LS_COLORS with support for multiple color themes"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://github.com/sharkdp/vivid"
+distfiles="https://github.com/sharkdp/vivid/archive/v${version}.tar.gz"
+checksum=c8640f524aef1cd4dc15286bdc6189894ad067ea79bf8c40b9ca8d9d752d161f
+
+post_install() {
+	vlicense LICENSE-MIT
+
+	# Sample configuration file + sample themes
+	vsconf config/filetypes.yml
+	vmkdir usr/share/examples/${pkgname}/themes
+	vcopy themes/*.yml usr/share/examples/${pkgname}/themes
+}

From 2a202a4dfc63cd716bf2457899a7d7d14583dc17 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 27 Feb 2021 10:19:46 +0100
Subject: [PATCH 2333/3458] wine: update to 6.3.

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 057c00088aee..cde19f7d2bd0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.2
+version=6.3
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 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="b6609609a3abcc6ad927cdd65c740be01162b801523e0f7ba9fd6691800bbf19
- 8ae73db67446d00ca7aef8c34c9a7336d6ca36893fa55f943e662cd1035844de"
+checksum="682a77c1fd12f56347ca2080d85fe17def1b655d3241d94582f87591d9d0cc3b
+ c490127b2bbbe326923ad32a5b730dc4d7541a07085a9553929b64b52a556c58"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 9faaaeb3a1967b8ff401d2dc0135c84a93d7c373 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 27 Feb 2021 10:22:36 +0100
Subject: [PATCH 2334/3458] linux5.4: update to 5.4.101.

---
 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 b35edec41a0f..ae1a202938cc 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.99
+version=5.4.101
 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=5bdad12c69253d30d836dd51e0b2a9a04a6749cc6b4b2412561a1efcb1351a27
+checksum=4e118c072dbe3209ddeaff32ecc558f7e809d54e661550342079f1ee76d9349d
 python_version=3
 patch_args="-Np1"
 

From 242b291320d796eaead14d6e749a9e744086558f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 27 Feb 2021 10:24:35 +0100
Subject: [PATCH 2335/3458] linux4.19: update to 4.19.177.

---
 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 c5c83ab3ff17..b0d83714ad0f 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.176
+version=4.19.177
 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=e1c3b8d21ba31bd5c50bb3b2a741f62958eb2a116bf13fa0e14f1656c4826073
+checksum=ac0eb3794e01eac66bea3ab39b8776dadf15c418ddc534ccfd95a0270302357d
 python_version=2 #unverified
 patch_args="-Np1"
 

From c43243cca7c146dda2220dbc2b3037246de46a0a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 27 Feb 2021 11:23:37 +0100
Subject: [PATCH 2336/3458] mono: update to 6.12.0.122.

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

diff --git a/srcpkgs/mono/template b/srcpkgs/mono/template
index c4ecfa3060aa..3846d0a93e1e 100644
--- a/srcpkgs/mono/template
+++ b/srcpkgs/mono/template
@@ -1,6 +1,6 @@
 # Template file for 'mono'
 pkgname=mono
-version=6.12.0.107
+version=6.12.0.122
 revision=1
 build_style=gnu-configure
 configure_args="--disable-system-aot"
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="MIT, BSD-3-Clause, GPL-2.0-or-later, LGPL-2.0-or-later, MPL-1.1"
 homepage="https://www.mono-project.com"
 distfiles="https://download.mono-project.com/sources/mono/${pkgname}-${version}.tar.xz"
-checksum=61f3cd629f8e99371c6b47c1f8d96b8ac46d9e851b5531eef20cdf9ab60d2a5f
+checksum=29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23
 lib32disabled=yes
 python_version="3"
 

From b8a573094252ee22c34202919822682252b01314 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Feb 2021 13:57:35 +0100
Subject: [PATCH 2337/3458] libabigail: update to 1.8.2.

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

diff --git a/srcpkgs/libabigail/template b/srcpkgs/libabigail/template
index 602ed7723bab..ed30ffd85c54 100644
--- a/srcpkgs/libabigail/template
+++ b/srcpkgs/libabigail/template
@@ -1,6 +1,6 @@
 # Template file for 'libabigail'
 pkgname=libabigail
-version=1.8
+version=1.8.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-cxx11=yes"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-3.0-or-later"
 homepage="https://www.sourceware.org/libabigail/"
 distfiles="http://mirrors.kernel.org/sourceware/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1cbf260b894ccafc61b2673ba30c020c3f67dbba9dfa88dca3935dff661d665c
+checksum=86347c9f0a8666f263fd63f8c3fe4c4f9cb1bdb3ec4260ecbaf117d137e89787
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" musl-fts-devel"; LDFLAGS="-lfts" ;;

From 4e2c0d97f6b9bd028f02d0faaaa707934ac076dc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Feb 2021 14:35:06 +0100
Subject: [PATCH 2338/3458] perl-IO-Socket-SSL: update to 2.070.

---
 srcpkgs/perl-IO-Socket-SSL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index 6821590299ce..9424b10668f2 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.069
+version=2.070
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -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=d83c2cae5e8a22ab49c9f2d964726625e9efe56490d756a48a7b149a3d6e278d
+checksum=876fe09763e7a474519431aff248cb1f1abaf070d6bdc791f60bf9abe781cd3b

From 096efbe3005c3ac3d4e72d3e6e2fa3ce25b5e9c3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Feb 2021 14:36:57 +0100
Subject: [PATCH 2339/3458] linux5.10: update to 5.10.19.

---
 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 84498596e21f..6b37aa21b44e 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.18
+version=5.10.19
 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=3bc1ee2b1bf73b5ba936721953f3f9599fd165cef906cd5163c68d23cb9bb611
+checksum=27e7bbb0de7f0acc29c3c2e0a70c9a5fafc5fcf250993ce48713f809862ab4d6
 python_version=3
 patch_args="-Np1"
 

From 62093f403b0db76b8fb0cacd087556db04b1a516 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 24 Feb 2021 15:05:48 -0500
Subject: [PATCH 2340/3458] buildah: update to 1.19.6.

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

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 18c5caea77eb..86c7a21de131 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.18.0
+version=1.19.6
 revision=1
 build_style=go
 go_import_path=github.com/containers/buildah
@@ -16,7 +16,7 @@ license="Apache-2.0"
 homepage="https://github.com/containers/buildah"
 changelog="https://github.com/containers/buildah/blob/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=500c82fb369fd08a9bb9a41f294c5975f17575770dbfaba5cce9a6e09b6a3fb9
+checksum=4f2e737521691abddfff7eaf6d7a7137db019c842de61d68054ccc2a6587c2fd
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man

From b930fa8b7ffdc2e1884a48703283325fecc9136f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 24 Feb 2021 15:05:50 -0500
Subject: [PATCH 2341/3458] podman: update to 3.0.1.

Closes: #29038 [via git-merge-pr]
---
 srcpkgs/podman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 0770cc6ec14c..470a811d86f6 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=2.2.1
+version=3.0.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v2"
@@ -15,7 +15,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
 distfiles="https://github.com/containers/libpod/archive/v${version}.tar.gz"
-checksum=bd86b181251e2308cb52f18410fb52d89df7f130cecf0298bbf9a848fe7daf60
+checksum=259e682d6e90595573fe8880e0252cc8b08c813e19408b911c43383a6edd6852
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 2c5526e4e7e685b70bcfe7830f784ecc5deaddea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sat, 27 Feb 2021 08:48:00 -0700
Subject: [PATCH 2342/3458] nvidia: update to 460.56.

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

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 15cab648bf89..c854dd200074 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=460.39
-revision=3
+version=460.56
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -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=0bf0664078013aa62ed6840caed0637b226884b9398e1fb647e127ad3ad9a37f
+checksum=4e571cba0d1f6f5116689dca9f4b396b3e7f6c3d4de14ce3143d52f834e57300
 # 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 f8f36b1ea7ae60e5d55b051d440020ec02f61440 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 27 Feb 2021 20:35:34 +0300
Subject: [PATCH 2343/3458] imv: enable HEIF & AVIF support

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

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index f80eea83d21d..5da389f2ba95 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,10 +1,10 @@
 # Template file for 'imv'
 pkgname=imv
 version=4.2.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"
-makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libxkbcommon-devel
+makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel
  pango-devel wayland-devel inih-devel"
 depends="desktop-file-utils"
 conf_files="/etc/imv_config"

From f0ce79ed401de698c4355dd2938833addfea1dae Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 26 Feb 2021 20:18:10 +0200
Subject: [PATCH 2344/3458] 66: fix manpage generation, fix INSTALL.msg.

---
 srcpkgs/66/INSTALL.msg               |  5 ++--
 srcpkgs/66/patches/man_page_fix.diff | 40 ++++++++++++++++++++++++++++
 srcpkgs/66/template                  |  2 +-
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/66/patches/man_page_fix.diff

diff --git a/srcpkgs/66/INSTALL.msg b/srcpkgs/66/INSTALL.msg
index 48212a333c1e..cc530a3ed814 100644
--- a/srcpkgs/66/INSTALL.msg
+++ b/srcpkgs/66/INSTALL.msg
@@ -1,6 +1,5 @@
 CAUTION: package revision 0.6.1.1_2 changes the default system-dir
 from /var/lib/66 to /etc/66/lib. The change requires user intervention.
-Users who upgrade from an earlier version should either copy the 
-contents of the old dir to the new one after installation, or re-create
-trees and re-enable services. That should be done before rebooting/halting
+Users who upgrade from an earlier version should re-create all trees 
+and re-enable services in them. That should be done before rebooting/halting
 the system.
diff --git a/srcpkgs/66/patches/man_page_fix.diff b/srcpkgs/66/patches/man_page_fix.diff
new file mode 100644
index 000000000000..2d25a6ccf4aa
--- /dev/null
+++ b/srcpkgs/66/patches/man_page_fix.diff
@@ -0,0 +1,40 @@
+diff --git a/doc/make-man.sh b/doc/make-man.sh
+index fd5d9cd..0c3fee6 100755
+--- a/doc/make-man.sh
++++ b/doc/make-man.sh
+@@ -14,29 +14,26 @@ done
+ 
+ for i in ${man1}; do
+     lowdown -s -Tman doc/"${i}".md -o doc/man/man1/"${i}".1 || exit 1
+-    var=$(head -n1 < doc/man/man1/"${i}".1)
++    var=$( sed -n -e '/^.TH/p' < doc/man/man1/"${i}".1)
+     var=$(printf '%s' "$var" | tr '7' '1')
+-    var="${var} \"\" \"General Commands Manual\""
+     sed -i "s!^.TH.*!${var}!" doc/man/man1/"${i}".1 || exit 1
+-    sed -i '2,5d' doc/man/man1/"${i}".1 || exit 1
++    sed -i '4,8d' doc/man/man1/"${i}".1 || exit 1
+ done
+ 
+ for i in ${man5}; do
+     lowdown -s -Tman doc/"${i}".md -o doc/man/man5/"${i}".5 || exit 1
+-    var=$(head -n1 < doc/man/man5/"${i}".5)
++    var=$( sed -n -e '/^.TH/p' < doc/man/man5/"${i}".5)
+     var=$(printf '%s' "$var" | tr '7' '5')
+-    var="${var} \"\" \"File Formats Manual\""
+     sed -i "s!^.TH.*!${var}!" doc/man/man5/"${i}".5 || exit 1
+-    sed -i '2,5d' doc/man/man5/"${i}".5 || exit 1
++    sed -i '4,8d' doc/man/man5/"${i}".5 || exit 1
+ done
+ 
+ for i in ${man8}; do
+     lowdown -s -Tman doc/"${i}".md -o doc/man/man8/"${i}".8 || exit 1
+-    var=$(head -n1 < doc/man/man8/"${i}".8)
++    var=$( sed -n -e '/^.TH/p' < doc/man/man8/"${i}".8)
+     var=$(printf '%s' "$var" | tr '7' '8')
+-    var="${var} \"\" \"System Administration\""
+     sed -i "s!^.TH.*!${var}!" doc/man/man8/"${i}".8 || exit 1
+-    sed -i '2,5d' doc/man/man8/"${i}".8 || exit 1
++    sed -i '4,8d' doc/man/man8/"${i}".8 || exit 1
+ done
+ 
+ exit 0
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index a89b5257868a..849e5c42c37d 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
 # Template file for '66'
 pkgname=66
 version=0.6.1.1
-revision=2
+revision=3
 wrksrc="66-v${version}"
 build_style=configure
 configure_args="--prefix=/usr

From bda9bd617c020abb15f0e6c8e03c439573dc087e Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 27 Feb 2021 13:43:11 +1100
Subject: [PATCH 2345/3458] snapcast: update to 0.24.0

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

diff --git a/srcpkgs/snapcast/template b/srcpkgs/snapcast/template
index d169582b17fd..ccc2087253d9 100644
--- a/srcpkgs/snapcast/template
+++ b/srcpkgs/snapcast/template
@@ -1,6 +1,6 @@
 # Template file for 'snapcast'
 pkgname=snapcast
-version=0.23.0
+version=0.24.0
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DBUILD_WITH_TREMOR=OFF
@@ -15,7 +15,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/badaix/snapcast"
 distfiles="https://github.com/badaix/snapcast/archive/v${version}.tar.gz"
-checksum=70efdeea60021f493f77ba1f3d00784911463cad11c6df214ecb19d74899b611
+checksum=3f179ad0326627f66fd2e581359366c6c49ef51cb1c7b87ed8739fb9d0969a3c
 
 build_options="avahi pulseaudio"
 build_options_default="avahi pulseaudio"

From 777e9cc8ac8b674ffca629367499ccc0eea38df6 Mon Sep 17 00:00:00 2001
From: saqfish <saqfish@gmail.com>
Date: Fri, 26 Feb 2021 20:09:14 -0600
Subject: [PATCH 2346/3458] xjobs: update to 20200726

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

diff --git a/srcpkgs/xjobs/template b/srcpkgs/xjobs/template
index 1f77c7a3e410..951188cc0634 100644
--- a/srcpkgs/xjobs/template
+++ b/srcpkgs/xjobs/template
@@ -1,6 +1,6 @@
 # Template file for 'xjobs'
 pkgname=xjobs
-version=20191217
+version=20200726
 revision=1
 build_style=gnu-configure
 hostmakedepends="flex which"
@@ -9,4 +9,4 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.maier-komor.de/xjobs.html"
 distfiles="http://www.maier-komor.de/xjobs/xjobs-${version}.tgz"
-checksum=2ffd64574c7c4519b35fb6df419a87de5e7150e69dfe349b0c7dcc4e1e448873
+checksum=23820f4e375df000963c82327b902d4fae6328f3f7f1aa64c8a7da3b887dc62b

From f509587491f2c3598203340562a410d09b57c557 Mon Sep 17 00:00:00 2001
From: saqfish <saqfish@gmail.com>
Date: Fri, 26 Feb 2021 23:39:13 -0600
Subject: [PATCH 2347/3458] entr: update to 4.8

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

diff --git a/srcpkgs/entr/template b/srcpkgs/entr/template
index 0b42bf9c50e1..5d209da87439 100644
--- a/srcpkgs/entr/template
+++ b/srcpkgs/entr/template
@@ -1,6 +1,6 @@
 # Template file for 'entr'
 pkgname=entr
-version=4.7
+version=4.8
 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=b6c1ab7644d83bb2a269dc74160867a3be0f5df116c7eb453c25053173534429
+checksum=f05555cd745b7dc67b61a98cf79971125b7e43931a5772d5bce2d891327425ae
 
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in

From 6e8db3ba93405e5606518afc7e711d18e9598e0a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 27 Feb 2021 00:23:44 +0200
Subject: [PATCH 2348/3458] xfce4-panel: update to 4.16.2.

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

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 2df7a5c04a8b..fe3c276b27f5 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.16.1
+version=4.16.2
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -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=fa099bc6be6592dbb828747a473c2e1b0e7f85afd945a98002b475bb6f975991
+checksum=8634166e6f14318daec363f7e2371d49b98986f9bce313a7dd1554f30b48b5cf
 
 # Package build options
 build_options="gir"

From bccdd7e7140eee46edceedf9a6e8fb62796760c6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 27 Feb 2021 00:33:04 +0200
Subject: [PATCH 2349/3458] xfce4-cpufreq-plugin: update to 1.2.4.

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

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 9a51200ee801..713aa0da6660 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
-version=1.2.3
+version=1.2.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,4 +11,4 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=7d399cb205b3a03d70f1c5dac99beab7fa1bcdef60edfdc16fab0583d7cd07bc
+checksum=815218b53f8cab554b532e6686d63f38817c6e01e04d7d1599cbe26e4af07f9e

From 0d13510a9d9557073efcbc31aa28023949ecbfa2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 27 Feb 2021 00:36:53 +0200
Subject: [PATCH 2350/3458] xfce4-genmon-plugin: update to 4.1.1.

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

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 096fbddb09ba..e12ff660c7ee 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,4 +11,4 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d1256b4b47545c7bdb16842b21eaf3ac167be443e8f2f1093cf4209e65c84e7d
+checksum=b2119fd0ff19fa293b97ec97b0de8e241799e08b86218515167c568bd9b50135

From 098a1857c1e1d38fb5abaa80c1802fc967883467 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 27 Feb 2021 00:45:34 +0200
Subject: [PATCH 2351/3458] xfce4-weather-plugin: update to 0.11.0.

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

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index cdc60bc529ad..ef47f0f6143a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
-version=0.10.2
-revision=2
+version=0.11.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -12,5 +12,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9017790b92953090c849b17b357b42fa8c562bf0e25af2fd2e5f53cfebc662c6
+checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes

From ac3c8ef418cde03733e13cad4065441ef0760859 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 27 Feb 2021 00:46:41 +0200
Subject: [PATCH 2352/3458] xfce4-cpugraph-plugin: update to 1.2.3.

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

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 929d5573b453..0881e627357f 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
-version=1.2.0
+version=1.2.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7
+checksum=fb0cccd9a678136256edd0f04f945e611ab0aa912837f57413ef3bb0f515608c
 
 post_install() {
 	vlicense COPYING

From f1791ac7b09c25a331346f43624bbdadad7e8969 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 22:37:07 +0100
Subject: [PATCH 2353/3458] ImageMagick6: update to 6.9.12.1

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

diff --git a/common/shlibs b/common/shlibs
index b016d28f7886..52915c72c82f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -340,7 +340,7 @@ libMagickWand-7.Q16HDRI.so.8 libmagick-7.0.10.37_1
 libMagick++-7.Q16HDRI.so.4 libmagick-7.0.9.1_1
 libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
-libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1
+libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1
 libltdl.so.7 libltdl-2.2.6_1
 libpoppler.so.102 libpoppler102-20.09.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 578d3843b2f8..341bdf824bea 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
-_majorver=6.9.11
-_patchver=61
+_majorver=6.9.12
+_patchver=1
 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=8621f619c5c9ce1bf7260c8fc8fa01a7414079cf7b0777a9b0a048a22c85647a
+checksum=9a799c054ff5925cbeb730624aa398562aac0550f30389ea5aadbeeda6007f95
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"

From 17f56c47e669c70b4d7f21bc5c28fd33bdedaa56 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sat, 27 Feb 2021 18:03:41 -0600
Subject: [PATCH 2354/3458] zfsbootmenu: require ncurses for bin/tput

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

diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template
index 4b36fd6865e4..16e0d4f60b63 100644
--- a/srcpkgs/zfsbootmenu/template
+++ b/srcpkgs/zfsbootmenu/template
@@ -1,10 +1,10 @@
 # Template file for 'zfsbootmenu'
 pkgname=zfsbootmenu
 version=1.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 conf_files="/etc/zfsbootmenu/config.yaml"
-depends="dracut zfs kexec-tools bash pigz mbuffer
+depends="dracut zfs kexec-tools bash pigz mbuffer ncurses
  perl-Config-IniFiles perl-Sort-Versions perl-boolean perl-YAML-PP"
 short_desc="ZFS Boot Environment menu, implemented in Dracut"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From ad92cd935e4548f8346669ceb8092a88f7a01a5c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 28 Feb 2021 01:34:19 +0100
Subject: [PATCH 2355/3458] base-files: make some sysctls like kexec setting
 user-alterable

While at it, relax the pkglint for base-files only.
---
 common/hooks/pre-pkg/99-pkglint.sh        | 17 +++++++++++------
 srcpkgs/base-files/files/sysctl-user.conf | 13 +++++++++++++
 srcpkgs/base-files/files/sysctl.conf      | 14 +++++---------
 srcpkgs/base-files/template               |  4 +++-
 4 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/base-files/files/sysctl-user.conf

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index ada06c485ea9..330df6d24542 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -83,12 +83,17 @@ hook() {
 
 	# Prevent packages from installing to these paths in etc, they should use
 	# their equivalent in usr/lib
-	for f in udev/{rules.d,hwdb.d} modprobe.d sysctl.d; do
-		if [ -d ${PKGDESTDIR}/etc/${f} ]; then
-			msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/lib/${f}.\n"
-			error=1
-		fi
-	done
+	#
+	# But base-files is a special case, since it may contains suggested but
+	# still user-alterable default files (particularly sysctl.d)
+	if [ "${pkgname}" != "base-files" ]; then
+		for f in udev/{rules.d,hwdb.d} modprobe.d sysctl.d; do
+			if [ -d ${PKGDESTDIR}/etc/${f} ]; then
+				msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/lib/${f}.\n"
+				error=1
+			fi
+		done
+	fi
 
 	# Likewise with the comment above but for usr/share
 	for f in X11/xorg.conf.d gconf/schemas; do
diff --git a/srcpkgs/base-files/files/sysctl-user.conf b/srcpkgs/base-files/files/sysctl-user.conf
new file mode 100644
index 000000000000..4fff32d3ce2e
--- /dev/null
+++ b/srcpkgs/base-files/files/sysctl-user.conf
@@ -0,0 +1,13 @@
+# These are some recommended defaults that users can alter if needed.
+# For example, developer systems may want to enable kexec for kernel
+# testing, or disable the ptrace restrictions to be able to gdb attach
+# to processes without root.
+
+# Avoid kernel memory address exposures via dmesg.
+kernel.dmesg_restrict=1
+
+# Turn off kexec, even if it's built in.
+kernel.kexec_load_disabled=1
+
+# Avoid non-ancestor ptrace access to running processes and their credentials.
+kernel.yama.ptrace_scope=1
diff --git a/srcpkgs/base-files/files/sysctl.conf b/srcpkgs/base-files/files/sysctl.conf
index 540bffbef9e1..56b7579f530e 100644
--- a/srcpkgs/base-files/files/sysctl.conf
+++ b/srcpkgs/base-files/files/sysctl.conf
@@ -1,3 +1,8 @@
+# These are hardening options that users should typically not be altering.
+# This file is not tracked as a configuration file, so any changes in it
+# will get overwritten with updates. Void systems also by default install
+# certain hardening options that may be altered, in /etc/sysctl.d.
+
 # Append the PID to the core filename
 kernel.core_uses_pid = 1
 
@@ -8,14 +13,5 @@ fs.protected_symlinks=1
 # Try to keep kernel address exposures out of various /proc files (kallsyms, modules, etc).
 kernel.kptr_restrict=1
 
-# Avoid kernel memory address exposures via dmesg.
-kernel.dmesg_restrict=1
-
 # Block non-uid-0 kernel profiling
 kernel.perf_event_paranoid=2
-
-# Turn off kexec, even if it's built in.
-kernel.kexec_load_disabled=1
-
-# Avoid non-ancestor ptrace access to running processes and their credentials.
-kernel.yama.ptrace_scope=1
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 8040a801110c..d887d5c96205 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=7
+revision=8
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -18,6 +18,7 @@ conf_files="
 	/etc/skel/.bash_logout
 	/etc/skel/.bashrc
 	/etc/skel/.inputrc
+	/etc/sysctl.d/10-void.conf
 	/etc/subuid
 	/etc/subgid
 	/etc/issue
@@ -74,6 +75,7 @@ do_install() {
 	vinstall ${FILESDIR}/blacklist.conf 644 usr/lib/modprobe.d
 	# sysctl(8) files
 	vinstall ${FILESDIR}/sysctl.conf 644 usr/lib/sysctl.d 10-void.conf
+	vinstall ${FILESDIR}/sysctl-user.conf 644 etc/sysctl.d 10-void.conf
 
 	# Install common licenses, from Debian.
 	vmkdir usr/share/licenses

From ba0102537c3292267a1ddfdd796a99e316f3a14b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 28 Feb 2021 02:00:31 +0100
Subject: [PATCH 2356/3458] base-files: fix conf files replacing each other
 wrong

---
 common/hooks/pre-pkg/99-pkglint.sh        | 17 ++++++-----------
 srcpkgs/base-files/files/sysctl-user.conf |  2 ++
 srcpkgs/base-files/files/sysctl.conf      |  4 +---
 srcpkgs/base-files/template               |  5 ++---
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 330df6d24542..ada06c485ea9 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -83,17 +83,12 @@ hook() {
 
 	# Prevent packages from installing to these paths in etc, they should use
 	# their equivalent in usr/lib
-	#
-	# But base-files is a special case, since it may contains suggested but
-	# still user-alterable default files (particularly sysctl.d)
-	if [ "${pkgname}" != "base-files" ]; then
-		for f in udev/{rules.d,hwdb.d} modprobe.d sysctl.d; do
-			if [ -d ${PKGDESTDIR}/etc/${f} ]; then
-				msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/lib/${f}.\n"
-				error=1
-			fi
-		done
-	fi
+	for f in udev/{rules.d,hwdb.d} modprobe.d sysctl.d; do
+		if [ -d ${PKGDESTDIR}/etc/${f} ]; then
+			msg_red "${pkgver}: /etc/${f} is forbidden. Use /usr/lib/${f}.\n"
+			error=1
+		fi
+	done
 
 	# Likewise with the comment above but for usr/share
 	for f in X11/xorg.conf.d gconf/schemas; do
diff --git a/srcpkgs/base-files/files/sysctl-user.conf b/srcpkgs/base-files/files/sysctl-user.conf
index 4fff32d3ce2e..fa70767ef372 100644
--- a/srcpkgs/base-files/files/sysctl-user.conf
+++ b/srcpkgs/base-files/files/sysctl-user.conf
@@ -2,6 +2,8 @@
 # For example, developer systems may want to enable kexec for kernel
 # testing, or disable the ptrace restrictions to be able to gdb attach
 # to processes without root.
+#
+# To replace, create a file of the same name in /etc/sysctl.d.
 
 # Avoid kernel memory address exposures via dmesg.
 kernel.dmesg_restrict=1
diff --git a/srcpkgs/base-files/files/sysctl.conf b/srcpkgs/base-files/files/sysctl.conf
index 56b7579f530e..1e1a2768d677 100644
--- a/srcpkgs/base-files/files/sysctl.conf
+++ b/srcpkgs/base-files/files/sysctl.conf
@@ -1,7 +1,5 @@
 # These are hardening options that users should typically not be altering.
-# This file is not tracked as a configuration file, so any changes in it
-# will get overwritten with updates. Void systems also by default install
-# certain hardening options that may be altered, in /etc/sysctl.d.
+# User-alterable options are in 10-void-user.conf.
 
 # Append the PID to the core filename
 kernel.core_uses_pid = 1
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index d887d5c96205..c143cf024a1d 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=8
+revision=9
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -18,7 +18,6 @@ conf_files="
 	/etc/skel/.bash_logout
 	/etc/skel/.bashrc
 	/etc/skel/.inputrc
-	/etc/sysctl.d/10-void.conf
 	/etc/subuid
 	/etc/subgid
 	/etc/issue
@@ -75,7 +74,7 @@ do_install() {
 	vinstall ${FILESDIR}/blacklist.conf 644 usr/lib/modprobe.d
 	# sysctl(8) files
 	vinstall ${FILESDIR}/sysctl.conf 644 usr/lib/sysctl.d 10-void.conf
-	vinstall ${FILESDIR}/sysctl-user.conf 644 etc/sysctl.d 10-void.conf
+	vinstall ${FILESDIR}/sysctl-user.conf 644 usr/lib/sysctl.d 10-void-user.conf
 
 	# Install common licenses, from Debian.
 	vmkdir usr/share/licenses

From c45fc65c4381f46b70ef550d3697cea2c6883b27 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 28 Feb 2021 01:18:26 +0100
Subject: [PATCH 2357/3458] linux5.10: drop page poison patch in favor of
 fixing static keys

---
 .../linux5.10/patches/page-poison-fix.patch   |  58 --------
 .../patches/ppc-stack-traces-early-boot.patch |  37 +++++
 .../patches/ppc64le-fix-static-keys.patch     | 140 ++++++++++++++++++
 3 files changed, 177 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/linux5.10/patches/page-poison-fix.patch
 create mode 100644 srcpkgs/linux5.10/patches/ppc-stack-traces-early-boot.patch
 create mode 100644 srcpkgs/linux5.10/patches/ppc64le-fix-static-keys.patch

diff --git a/srcpkgs/linux5.10/patches/page-poison-fix.patch b/srcpkgs/linux5.10/patches/page-poison-fix.patch
deleted file mode 100644
index d319dfec8243..000000000000
--- a/srcpkgs/linux5.10/patches/page-poison-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-
diff --git a/srcpkgs/linux5.10/patches/ppc-stack-traces-early-boot.patch b/srcpkgs/linux5.10/patches/ppc-stack-traces-early-boot.patch
new file mode 100644
index 000000000000..08b250113f3b
--- /dev/null
+++ b/srcpkgs/linux5.10/patches/ppc-stack-traces-early-boot.patch
@@ -0,0 +1,37 @@
+From 0ecf6a9e47d825b7dddfebca738386b809e59a94 Mon Sep 17 00:00:00 2001
+From: Michael Ellerman <mpe@ellerman.id.au>
+Date: Wed, 3 Feb 2021 00:02:06 +1100
+Subject: powerpc/64: Make stack tracing work during very early boot
+
+If we try to stack trace very early during boot, either due to a
+WARN/BUG or manual dump_stack(), we will oops in
+valid_emergency_stack() when we try to dereference the paca_ptrs
+array.
+
+The fix is simple, we just return false if paca_ptrs isn't allocated
+yet. The stack pointer definitely isn't part of any emergency stack
+because we haven't allocated any yet.
+
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20210202130207.1303975-1-mpe@ellerman.id.au
+---
+ arch/powerpc/kernel/process.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
+index 8520ed5ae144d..e296440e9d16a 100644
+--- a/arch/powerpc/kernel/process.c
++++ b/arch/powerpc/kernel/process.c
+@@ -2047,6 +2047,9 @@ static inline int valid_emergency_stack(unsigned long sp, struct task_struct *p,
+ 	unsigned long stack_page;
+ 	unsigned long cpu = task_cpu(p);
+ 
++	if (!paca_ptrs)
++		return 0;
++
+ 	stack_page = (unsigned long)paca_ptrs[cpu]->emergency_sp - THREAD_SIZE;
+ 	if (sp >= stack_page && sp <= stack_page + THREAD_SIZE - nbytes)
+ 		return 1;
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/srcpkgs/linux5.10/patches/ppc64le-fix-static-keys.patch b/srcpkgs/linux5.10/patches/ppc64le-fix-static-keys.patch
new file mode 100644
index 000000000000..d48f4039581f
--- /dev/null
+++ b/srcpkgs/linux5.10/patches/ppc64le-fix-static-keys.patch
@@ -0,0 +1,140 @@
+From e7eb919057c3450cdd9d335e4a23a4da8da58db4 Mon Sep 17 00:00:00 2001
+From: Michael Ellerman <mpe@ellerman.id.au>
+Date: Wed, 3 Feb 2021 00:02:07 +1100
+Subject: [PATCH] powerpc/64s: Handle program checks in wrong endian during
+ early boot
+
+There's a short window during boot where although the kernel is
+running little endian, any exceptions will cause the CPU to switch
+back to big endian. This situation persists until we call
+configure_exceptions(), which calls either the hypervisor or OPAL to
+configure the CPU so that exceptions will be taken in little
+endian (via HID0[HILE]).
+
+We don't intend to take exceptions during early boot, but one way we
+sometimes do is via a WARN/BUG etc. Those all boil down to a trap
+instruction, which will cause a program check exception.
+
+The first instruction of the program check handler is an mtsprg, which
+when executed in the wrong endian is an lhzu with a ~3GB displacement
+from r3. The content of r3 is random, so that becomes a load from some
+random location, and depending on the system (installed RAM etc.) can
+easily lead to a checkstop, or an infinitely recursive page fault.
+That prevents whatever the WARN/BUG was complaining about being
+printed to the console, and the user just sees a dead system.
+
+We can fix it by having a trampoline at the beginning of the program
+check handler that detects we are in the wrong endian, and flips us
+back to the correct endian.
+
+We can't flip MSR[LE] using mtmsr (alas), so we have to use rfid. That
+requires backing up SRR0/1 as well as a GPR. To do that we use
+SPRG0/2/3 (SPRG1 is already used for the paca). SPRG3 is user
+readable, but this trampoline is only active very early in boot, and
+SPRG3 will be reinitialised in vdso_getcpu_init() before userspace
+starts.
+
+With this trampoline in place we can survive a WARN early in boot and
+print a stack trace, which is eventually printed to the console once
+the console is up, eg:
+
+  [83565.758545] kexec_core: Starting new kernel
+  [    0.000000] ------------[ cut here ]------------
+  [    0.000000] static_key_enable_cpuslocked(): static key '0xc000000000ea6160' used before call to jump_label_init()
+  [    0.000000] WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xfc/0x120
+  [    0.000000] Modules linked in:
+  [    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.10.0-gcc-8.2.0-dirty #618
+  [    0.000000] NIP:  c0000000002fd46c LR: c0000000002fd468 CTR: c000000000170660
+  [    0.000000] REGS: c000000001227940 TRAP: 0700   Not tainted  (5.10.0-gcc-8.2.0-dirty)
+  [    0.000000] MSR:  9000000002823003 <SF,HV,VEC,VSX,FP,ME,RI,LE>  CR: 24882422  XER: 20040000
+  [    0.000000] CFAR: 0000000000000730 IRQMASK: 1
+  [    0.000000] GPR00: c0000000002fd468 c000000001227bd0 c000000001228300 0000000000000065
+  [    0.000000] GPR04: 0000000000000001 0000000000000065 c0000000010cf970 000000000000000d
+  [    0.000000] GPR08: 0000000000000000 0000000000000000 0000000000000000 c00000000122763f
+  [    0.000000] GPR12: 0000000000002000 c000000000f8a980 0000000000000000 0000000000000000
+  [    0.000000] GPR16: 0000000000000000 0000000000000000 c000000000f88c8e c000000000f88c9a
+  [    0.000000] GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
+  [    0.000000] GPR24: 0000000000000000 c000000000dea3a8 0000000000000000 c000000000f35114
+  [    0.000000] GPR28: 0000002800000000 c000000000f88c9a c000000000f88c8e c000000000ea6160
+  [    0.000000] NIP [c0000000002fd46c] static_key_enable_cpuslocked+0xfc/0x120
+  [    0.000000] LR [c0000000002fd468] static_key_enable_cpuslocked+0xf8/0x120
+  [    0.000000] Call Trace:
+  [    0.000000] [c000000001227bd0] [c0000000002fd468] static_key_enable_cpuslocked+0xf8/0x120 (unreliable)
+  [    0.000000] [c000000001227c40] [c0000000002fd4c0] static_key_enable+0x30/0x50
+  [    0.000000] [c000000001227c70] [c000000000f6629c] early_page_poison_param+0x58/0x9c
+  [    0.000000] [c000000001227cb0] [c000000000f351b8] do_early_param+0xa4/0x10c
+  [    0.000000] [c000000001227d30] [c00000000011e020] parse_args+0x270/0x5e0
+  [    0.000000] [c000000001227e20] [c000000000f35864] parse_early_options+0x48/0x5c
+  [    0.000000] [c000000001227e40] [c000000000f358d0] parse_early_param+0x58/0x84
+  [    0.000000] [c000000001227e70] [c000000000f3a368] early_init_devtree+0xc4/0x490
+  [    0.000000] [c000000001227f10] [c000000000f3bca0] early_setup+0xc8/0x1c8
+  [    0.000000] [c000000001227f90] [000000000000c320] 0xc320
+  [    0.000000] Instruction dump:
+  [    0.000000] 4bfffddd 7c2004ac 39200001 913f0000 4bffffb8 7c651b78 3c82ffac 3c62ffc0
+  [    0.000000] 38841b00 3863f310 4bdf03a5 60000000 <0fe00000> 4bffff38 60000000 60000000
+  [    0.000000] random: get_random_bytes called from print_oops_end_marker+0x40/0x80 with crng_init=0
+  [    0.000000] ---[ end trace 0000000000000000 ]---
+  [    0.000000] dt-cpu-ftrs: setup for ISA 3000
+
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20210202130207.1303975-2-mpe@ellerman.id.au
+---
+ arch/powerpc/kernel/exceptions-64s.S | 45 ++++++++++++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
+index b3793f982b2be..c51c436d5845f 100644
+--- a/arch/powerpc/kernel/exceptions-64s.S
++++ b/arch/powerpc/kernel/exceptions-64s.S
+@@ -1630,6 +1630,51 @@ INT_DEFINE_BEGIN(program_check)
+ INT_DEFINE_END(program_check)
+ 
+ EXC_REAL_BEGIN(program_check, 0x700, 0x100)
++
++#ifdef CONFIG_CPU_LITTLE_ENDIAN
++	/*
++	 * There's a short window during boot where although the kernel is
++	 * running little endian, any exceptions will cause the CPU to switch
++	 * back to big endian. For example a WARN() boils down to a trap
++	 * instruction, which will cause a program check, and we end up here but
++	 * with the CPU in big endian mode. The first instruction of the program
++	 * check handler (in GEN_INT_ENTRY below) is an mtsprg, which when
++	 * executed in the wrong endian is an lhzu with a ~3GB displacement from
++	 * r3. The content of r3 is random, so that is a load from some random
++	 * location, and depending on the system can easily lead to a checkstop,
++	 * or an infinitely recursive page fault.
++	 *
++	 * So to handle that case we have a trampoline here that can detect we
++	 * are in the wrong endian and flip us back to the correct endian. We
++	 * can't flip MSR[LE] using mtmsr, so we have to use rfid. That requires
++	 * backing up SRR0/1 as well as a GPR. To do that we use SPRG0/2/3, as
++	 * SPRG1 is already used for the paca. SPRG3 is user readable, but this
++	 * trampoline is only active very early in boot, and SPRG3 will be
++	 * reinitialised in vdso_getcpu_init() before userspace starts.
++	 */
++BEGIN_FTR_SECTION
++	tdi   0,0,0x48    // Trap never, or in reverse endian: b . + 8
++	b     1f          // Skip trampoline if endian is correct
++	.long 0xa643707d  // mtsprg  0, r11      Backup r11
++	.long 0xa6027a7d  // mfsrr0  r11
++	.long 0xa643727d  // mtsprg  2, r11      Backup SRR0 in SPRG2
++	.long 0xa6027b7d  // mfsrr1  r11
++	.long 0xa643737d  // mtsprg  3, r11      Backup SRR1 in SPRG3
++	.long 0xa600607d  // mfmsr   r11
++	.long 0x01006b69  // xori    r11, r11, 1 Invert MSR[LE]
++	.long 0xa6037b7d  // mtsrr1  r11
++	.long 0x34076039  // li      r11, 0x734
++	.long 0xa6037a7d  // mtsrr0  r11
++	.long 0x2400004c  // rfid
++	mfsprg r11, 3
++	mtsrr1 r11        // Restore SRR1
++	mfsprg r11, 2
++	mtsrr0 r11        // Restore SRR0
++	mfsprg r11, 0     // Restore r11
++1:
++END_FTR_SECTION(0, 1)     // nop out after boot
++#endif /* CONFIG_CPU_LITTLE_ENDIAN */
++
+ 	GEN_INT_ENTRY program_check, virt=0
+ EXC_REAL_END(program_check, 0x700, 0x100)
+ EXC_VIRT_BEGIN(program_check, 0x4700, 0x100)

From cf1d661b7b7bef7ff69d851ea8ebb704e94e0284 Mon Sep 17 00:00:00 2001
From: Noel Cower <ncower@nil.dev>
Date: Sat, 27 Feb 2021 21:10:05 -0800
Subject: [PATCH 2358/3458] xq-api: update to 0.5.0.

Adds the RELOAD_EVERY config option to set the -reload-every flag for
the service.
---
 srcpkgs/xq-api/files/xq-api/conf | 1 +
 srcpkgs/xq-api/files/xq-api/run  | 1 +
 srcpkgs/xq-api/template          | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xq-api/files/xq-api/conf b/srcpkgs/xq-api/files/xq-api/conf
index 869fe0ace996..c3695497dc2d 100644
--- a/srcpkgs/xq-api/files/xq-api/conf
+++ b/srcpkgs/xq-api/files/xq-api/conf
@@ -6,3 +6,4 @@ LOG_ACCESS=f
 LOG_TO_STDERR=t
 LOG_DIR=
 REPODATA=/var/db/xbps
+RELOAD_EVERY=
diff --git a/srcpkgs/xq-api/files/xq-api/run b/srcpkgs/xq-api/files/xq-api/run
index d998291d0396..b6c0533f194b 100755
--- a/srcpkgs/xq-api/files/xq-api/run
+++ b/srcpkgs/xq-api/files/xq-api/run
@@ -6,6 +6,7 @@ exec 2>&1
 exec chpst -u _xqapi:_xqapi xq-api \
         ${NET:+-net="$NET"} \
         ${ADDR:+-listen="$ADDR"} \
+        ${RELOAD_EVERY:+-reload-every="$RELOAD_EVERY"} \
         ${MAX_QUERIES:+-max-queries="$MAX_QUERIES"} \
         ${LOG_V:+-v="$LOG_V"} \
         ${LOG_ACCESS:+-log-access="$LOG_ACCESS"} \
diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index 16e97083cae4..c22ae1d72d59 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
-version=0.4.0
-revision=2
+version=0.5.0
+revision=1
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"
@@ -11,7 +11,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-2-Clause"
 homepage="https://github.com/nilium/xq-api"
 distfiles="https://github.com/nilium/xq-api/archive/v${version}.tar.gz"
-checksum=0d03345899feb2094e662e6e1d0a4de09ebb82f4f2a474cdc48504059c837c6d
+checksum=087940a16830eaf821abfcb8c6e0daad47078b4859b9acf236464bfca809ed43
 system_accounts="_xqapi"
 _xqapi_homedir="/var/lib/xq-api"
 

From 0ce0f1d10c90c5ff212aedd8c349fd2a9c8545eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 28 Feb 2021 07:43:55 +0100
Subject: [PATCH 2359/3458] doomretro: update to 4.0.4.

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

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 7f9c8350e3f9..b2e2ce4fe4b4 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.0.3
+version=4.0.4
 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=0c356204285479db8989139639e1dd16c1116a804fa5e320fe1f669084c820d7
+checksum=d8e65732d07c7fcf31d49587039f50d9728425744990c75cb636fe57c36cfca1

From 347d109474491735f8bd3cb6d1dca8340439cd8c Mon Sep 17 00:00:00 2001
From: saqfish <saqfish@gmail.com>
Date: Sat, 27 Feb 2021 23:50:43 -0600
Subject: [PATCH 2360/3458] jrnl: update to 2.7.1

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

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index 14d12b70acb3..3a1244757918 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,6 +1,6 @@
 # Template file for 'jrnl'
 pkgname=jrnl
-version=2.6
+version=2.7.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
 homepage="https://jrnl.sh"
 changelog="https://raw.githubusercontent.com/jrnl-org/jrnl/develop/CHANGELOG.md"
 distfiles="${PYPI_SITE}/j/jrnl/jrnl-${version}.tar.gz"
-checksum=ea2c35737bdda0ab5f8887d81733e1ad7d1f6e61fa13745102651386b530c15d
+checksum=53fa205afc3853c5e93ecf2bdcef2208331cc8ce235bfe864edfe936780888ca
 
 do_check() {
 	: # Downloads many deps and no tests are ran

From 9935427f854f17f8bc66ae696623e814df347f06 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 25 Feb 2021 22:17:41 +0100
Subject: [PATCH 2361/3458] musescore: update to 3.6.2.

change maintainer
enable cross builds
add soundfont to distfiles
disable qtwebengine because its unportable and unnecessary as it just provides web content in the start center
---
 srcpkgs/musescore/template | 39 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template
index a853eedba5d8..9bc29cf33078 100644
--- a/srcpkgs/musescore/template
+++ b/srcpkgs/musescore/template
@@ -1,15 +1,13 @@
 # Template file for 'musescore'
-# TODO: Add MuseScore Soundfont as distfiles or separate package instead of
-# downloading in the build process.
-# https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
 pkgname=musescore
-version=3.5.2
+version=3.6.2
 revision=1
 wrksrc="MuseScore-${version}"
 build_style=gnu-makefile
-make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON MUSESCORE_BUILD_CONFIG=release"
+make_build_args="PREFIX=/usr USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF
+ DOWNLOAD_SOUNDFONT=OFF MUSESCORE_BUILD_CONFIG=release"
 make_install_args="-C build.release"
-hostmakedepends="cmake pkg-config"
+hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-tools"
 makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
  portmidi-devel pulseaudio-devel qt5-declarative-devel qt5-script-devel
  qt5-svg-devel qt5-tools-devel qt5-webchannel-devel
@@ -17,22 +15,19 @@ makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel
  qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel"
 depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2"
 short_desc="Create, play and print beautiful sheet music"
-maintainer="Brian Olsen <bnolsen@comcast.net>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://musescore.org/"
-distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"
-checksum=75b8e783edca9d23718770b3f715d95b88f64545e0372f4ccba58ab073cc7068
-nocross="genManual: cannot execute binary file: Exec format error"
+_soundfont_url="https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General"
+distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz
+ ${_soundfont_url}/MuseScore_General.sf3
+ ${_soundfont_url}/MuseScore_General_License.md"
+checksum="c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45
+ 5b85b6c2c61d10b2b91cddd41efcce7b25cd31c8271d511c73afafbef20b6fa3
+ 5ad8d737e13c7f01f5b9674872a82a92b4ba253603e8ed14b9db12293550b4b9"
+skip_extraction="MuseScore_General.sf3 MuseScore_General_License.md"
 
-build_options="webengine"
-desc_option_webengine="Build with Qt5 WebEngine support"
-
-if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
-	build_options_default="webengine"
-fi
-
-if [ "$build_option_webengine" ]; then
-	makedepends+=" qt5-webengine-devel"
-else
-	make_build_args+=" BUILD_WEBENGINE=OFF"
-fi
+post_extract() {
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/MuseScore_General.sf3" "${wrksrc}/share/sound/"
+	cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/MuseScore_General_License.md" "${wrksrc}/share/sound/"
+}

From f2b5b2ae414b303738065eebcbbdd8f1b1a56a04 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Sat, 27 Feb 2021 20:36:46 -0500
Subject: [PATCH 2362/3458] lighttpd: update to 1.4.59

remove obsoleted devel packages
---
 srcpkgs/lighttpd/patches/020-meson-zstd.patch | 29 +++++++++++++++++++
 srcpkgs/lighttpd/template                     | 14 +++++----
 2 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/lighttpd/patches/020-meson-zstd.patch

diff --git a/srcpkgs/lighttpd/patches/020-meson-zstd.patch b/srcpkgs/lighttpd/patches/020-meson-zstd.patch
new file mode 100644
index 000000000000..0cd481de9b93
--- /dev/null
+++ b/srcpkgs/lighttpd/patches/020-meson-zstd.patch
@@ -0,0 +1,29 @@
+From a737572aa4b7a50fd9ac3f54245e40fd5cd2609d Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Wed, 3 Feb 2021 00:35:34 -0500
+Subject: [PATCH] [meson] add with_zstd to meson_options.txt
+
+Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
+---
+ meson_options.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git meson_options.txt meson_options.txt
+index 51bea44d..f6687159 100644
+--- meson_options.txt
++++ meson_options.txt
+@@ -148,6 +148,11 @@ option('with_zlib',
+ 	value: true,
+ 	description: 'with deflate-support for mod_deflate [default: on]',
+ )
++option('with_zstd',
++	type: 'boolean',
++	value: false,
++	description: 'with zstd-support for mod_deflate [default: off]',
++)
+ 
+ option('build_extra_warnings',
+ 	type: 'boolean',
+-- 
+2.29.2
+
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3c..0babfffe4d38 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,16 +1,18 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
-version=1.4.57
+version=1.4.59
 revision=1
 build_style=meson
-configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
+configure_args="-Dwith_brotli=false -Dwith_bzip=false
+ -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true
  -Dwith_libunwind=false -Dwith_lua=true -Dwith_memcached=true
  -Dwith_mysql=false -Dwith_openssl=true -Dwith_pcre=true -Dwith_pgsql=false
- -Dwith_sasl=false -Dwith_xattr=true -Dwith_zlib=true -Dwith_webdav_props=true
- -Dwith_webdav_locks=true -Dmoduledir=lib/lighttpd/modules"
+ -Dwith_sasl=false -Dwith_webdav_props=true -Dwith_webdav_locks=true
+ -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false
+ -Dmoduledir=lib/lighttpd/modules"
 hostmakedepends="pkg-config"
-makedepends="attr-devel fcgi-devel gdbm-devel libev-devel libmemcached-devel
+makedepends="gdbm-devel libev-devel libmemcached-devel
  libxml2-devel lua53-devel mit-krb5-devel pcre-devel sqlite-devel"
 checkdepends="perl"
 short_desc="Secure, fast, compliant and very flexible web-server"
@@ -18,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
 distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz"
-checksum=52ca961b89c12f7ecbb2e4e0c5a9e79b2863c64e33c42832a165e7f894d6217f
+checksum=fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5
 
 conf_files="/etc/lighttpd/lighttpd.conf"
 system_accounts="_${pkgname}"

From e3856577702a44c0e8a2d8c3ba534056e77410c0 Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Sat, 27 Feb 2021 20:03:09 +0000
Subject: [PATCH 2363/3458] efibootmgr: move setup instructions to
 README.voidlinux

---
 srcpkgs/efibootmgr/INSTALL.msg            | 21 ++-------------------
 srcpkgs/efibootmgr/files/README.voidlinux | 19 +++++++++++++++++++
 srcpkgs/efibootmgr/template               |  4 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/efibootmgr/files/README.voidlinux

diff --git a/srcpkgs/efibootmgr/INSTALL.msg b/srcpkgs/efibootmgr/INSTALL.msg
index 2b27d196f3ea..3c1f4796dbab 100644
--- a/srcpkgs/efibootmgr/INSTALL.msg
+++ b/srcpkgs/efibootmgr/INSTALL.msg
@@ -1,19 +1,2 @@
-efibootmgr can automatically generate EFI boot entries to
-directly boot the kernel after every kernel update or installation.
-Enable this by editing /etc/default/efibootmgr-kernel-hook.
-
-The efi variables need to be accessible in order for this to work, so
-add this line to your fstab and reboot or mount manually:
-  efivarfs /sys/firmware/efi/efivars efivarfs 0 0
------------------------------------------------------------------------
-Kernel cmd options can be configured in /etc/default/efibootmgr-kernel-hook,
-but you always have to reconfigure the kernel:
-
-	$ xbps-reconfigure -f linux4.8
-	(or any other kernel version)
-
-This is also required after the first installation of this package.
------------------------------------------------------------------------
-The bootorder itself is not changed, so your previous boot loader will
-stay enabled until you can edit the order in your firmware interface or
-using "efibootmgr -o <hexnum>"
+See /usr/share/doc/efibootmgr/README.voidlinux for instructions on
+using efibootmgr to automatically manage EFI boot entries.
diff --git a/srcpkgs/efibootmgr/files/README.voidlinux b/srcpkgs/efibootmgr/files/README.voidlinux
new file mode 100644
index 000000000000..98844fd85a65
--- /dev/null
+++ b/srcpkgs/efibootmgr/files/README.voidlinux
@@ -0,0 +1,19 @@
+efibootmgr can automatically generate EFI boot entries to
+directly boot the kernel after every kernel update or installation.
+Enable this by editing /etc/default/efibootmgr-kernel-hook.
+
+The EFI variables need to be accessible in order for this to work, so
+add this line to your fstab and reboot or mount manually:
+  efivarfs /sys/firmware/efi/efivars efivarfs defaults 0 0
+-----------------------------------------------------------------------
+Kernel cmd options can be configured in /etc/default/efibootmgr-kernel-hook,
+but you always have to reconfigure the kernel:
+
+	$ xbps-reconfigure -f linux4.8
+	(or any other kernel version)
+
+This is also required after the first installation of this package.
+-----------------------------------------------------------------------
+The bootorder itself is not changed, so your previous boot loader will
+stay enabled until you can edit the order in your firmware interface or
+using "efibootmgr -o <hexnum>"
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index e9b1bff036a8..ca131efb1b14 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -1,7 +1,7 @@
 # Template file for 'efibootmgr'
 pkgname=efibootmgr
 version=17
-revision=3
+revision=4
 hostmakedepends="pkg-config"
 makedepends="libefivar-devel popt-devel"
 short_desc="Tool to modify UEFI Firmware Boot Manager Variables"
@@ -39,7 +39,7 @@ do_install() {
 }
 
 post_install() {
-	vlicense COPYING
+	vdoc ${FILESDIR}/README.voidlinux
 	vmkdir etc/
 	vinstall "${FILESDIR}/efibootmgr-kernel-hook.confd" 644 etc/default efibootmgr-kernel-hook
 	vinstall ${FILESDIR}/kernel.d/efibootmgr.post-install 744 \

From a51135b96b5edb7a3a379c7e82f2b44e7bb9c62a Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:22:19 +0100
Subject: [PATCH 2364/3458] ImageMagick: update to 7.0.11.1.

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

diff --git a/common/shlibs b/common/shlibs
index 52915c72c82f..959f1692961f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -335,9 +335,9 @@ liblcms.so.1 lcms-1.18_1
 libgd.so.3 gd-2.1.0_1
 libcroco-0.6.so.3 libcroco-0.6.2_1
 libgsf-1.so.114 libgsf-1.14.11_1
-libMagickCore-7.Q16HDRI.so.8 libmagick-7.0.10.37_1
-libMagickWand-7.Q16HDRI.so.8 libmagick-7.0.10.37_1
-libMagick++-7.Q16HDRI.so.4 libmagick-7.0.9.1_1
+libMagickCore-7.Q16HDRI.so.9 libmagick-7.0.11.1_1
+libMagickWand-7.Q16HDRI.so.9 libmagick-7.0.11.1_1
+libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1
 libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1
 libMagick++-6.Q16.so.9 libmagick6-6.9.12.1_1
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 17e597557405..2e59b3052ea2 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-_majorver=7.0.10
-_patchver=60
+_majorver=7.0.11
+_patchver=1
 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=044fc1b27bd9aab515d4c512a33cf3a39313af2baef4aebf5c5c3044b7366ee4
+checksum=c04992429200d1168d6f45e2615e8ad6939dddb8f7559ebda669bcac66bc3165
 
 subpackages="libmagick libmagick-devel"
 

From f851ac173179022ef710614f05aa680d38d98b02 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:24:23 +0100
Subject: [PATCH 2365/3458] chafa: rebuild for ImageMagick-7.0.11.1

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

diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index 6153df30ecb3..1b07026b9ea4 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,7 +1,7 @@
 # Template file for 'chafa'
 pkgname=chafa
 version=1.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libglib-devel libmagick-devel libXext-devel libxml2-devel"

From 4d92ea6b92a25a6b35b95b51dab9c32c0b653cff Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:24:24 +0100
Subject: [PATCH 2366/3458] dmtx-utils: rebuild for ImageMagick-7.0.11.1

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

diff --git a/srcpkgs/dmtx-utils/template b/srcpkgs/dmtx-utils/template
index 470f72df0f49..b251f0a2061b 100644
--- a/srcpkgs/dmtx-utils/template
+++ b/srcpkgs/dmtx-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'dmtx-utils'
 pkgname=dmtx-utils
 version=0.7.6
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libdmtx-devel libmagick-devel libXext-devel libxml2-devel"

From a55133bcb1c2bd01868bbb71d1fa50cf870f4005 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:24:24 +0100
Subject: [PATCH 2367/3458] libopenshot: rebuild for ImageMagick-7.0.11.1

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

diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 1c602b3386ae..7a3a5a2cfd9d 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
 # Template file for 'libopenshot'
 pkgname=libopenshot
 version=0.2.5
-revision=3
+revision=4
 archs="i686 x86_64 ppc64le"
 build_style=cmake
 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1
@@ -17,6 +17,8 @@ homepage="https://github.com/OpenShot/libopenshot"
 distfiles="https://github.com/OpenShot/libopenshot/archive/v${version}.tar.gz"
 checksum=8ae7d226fbd2efbc84da4f7d9d8c7f3cc9616e4de46e1233e3b0a84ac0a429bc
 patch_args="-Np1"
+# FIXME: tests segfault
+make_check=extended
 
 libopenshot-devel_package() {
 	short_desc+=" - development files"

From 678af9e759d4dacb9493fdc8fb628dbd8a82d17a Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:24:24 +0100
Subject: [PATCH 2368/3458] php-imagick: rebuild for ImageMagick-7.0.11.1

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

diff --git a/srcpkgs/php-imagick/template b/srcpkgs/php-imagick/template
index d23bd8e86cff..dba22bb860cd 100644
--- a/srcpkgs/php-imagick/template
+++ b/srcpkgs/php-imagick/template
@@ -1,7 +1,7 @@
 # Template file for 'php-imagick'
 pkgname=php-imagick
 version=3.4.4
-revision=2
+revision=3
 wrksrc="imagick-$version"
 build_style=gnu-configure
 hostmakedepends="php-devel autoconf pkg-config"

From be1f41008c76dedb447c8f84b4cde46f29c3bb9d Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:24:24 +0100
Subject: [PATCH 2369/3458] sk1: rebuild for ImageMagick-7.0.11.1

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

diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template
index cccedeba0d9f..18804e74fc39 100644
--- a/srcpkgs/sk1/template
+++ b/srcpkgs/sk1/template
@@ -1,7 +1,7 @@
 # Template file for 'sk1'
 pkgname=sk1
 version=2.0rc4
-revision=3
+revision=4
 build_style=python2-module
 pycompile_dirs="/usr/lib/sk1-wx-${version}"
 hostmakedepends="pkg-config python"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://sk1project.net"
 distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz"
 checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063
-python_version=2 #unverified
+python_version=2
 
 pre_configure() {
 	# python2: can't open file 'setup.py': [Errno 2] No such file or directory

From 32bd9b82d9db2cc0faf6f492d974cdc8257d940d Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:24:24 +0100
Subject: [PATCH 2370/3458] vapoursynth: rebuild for ImageMagick-7.0.11.1

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

diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index da9181e67ce8..8508ca671104 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,7 +1,7 @@
 # Template file for 'vapoursynth'
 pkgname=vapoursynth
 version=R52
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool nasm pkg-config python3-Cython"
 makedepends="ffmpeg-devel python3-devel zimg-devel libass-devel libmagick-devel

From c651ddef7a9f3d8d81baacf622228de32dc0e0e0 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:24:25 +0100
Subject: [PATCH 2371/3458] zbar: rebuild for ImageMagick-7.0.11.1

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

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index be74e55f0d9f..68549362754c 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -1,7 +1,7 @@
 # Template file for 'zbar'
 pkgname=zbar
 version=0.23.1
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper=gir
 configure_args="$(vopt_with qt) --with-gir --with-python=python3"
@@ -23,6 +23,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) build_options_default="qt" ;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" argp-standalone"
+		LDFLAGS="-largp"
+		;;
+esac
+
 export PYTHON_CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
 CFLAGS="-DNDEBUG"
 

From bd2b7a3614341def88a1beb972f2b15249441e75 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 Feb 2021 13:11:00 +0100
Subject: [PATCH 2372/3458] python3-boto3: update to 1.17.17.

---
 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 4f2d53d41ba3..5ee2fe25e98b 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.17.12
+version=1.17.17
 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=0eef717261da7c0aa6fa538c7cacf8c489123fd247a94a9c86a604ddeff7443b
+checksum=1e72508628811ab2514cebee19a45c66b1ce11ac6bae5e69a867607dece8c454
 
 post_install() {
 	vlicense LICENSE

From f780173160c4e3a5315af0954f057cb8c4584e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sun, 28 Feb 2021 09:17:36 +0100
Subject: [PATCH 2373/3458] Clight: Update to 4.3

---
 srcpkgs/Clight/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index 5d9c87c2cd99..e77ac5ee11e2 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,6 +1,6 @@
 # Template file for 'Clight'
 pkgname=Clight
-version=4.2
+version=4.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,11 +12,12 @@ 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=fc3c4952c755bad5f4274f69f5cc17142abb51d88d7c615873e3058edc1c1137
+checksum=f354ba50fd74931c1fecc832f41334bae7c98c3aad81341bbbd79bd4d7853982
 
 post_install() {
-	vcompletion Extra/_clight zsh
-	vcompletion Extra/clight bash
+	vcompletion Extra/completions/_clight zsh
+	vcompletion Extra/completions/clight bash
+	vcompletion Extra/completions/clight.fish fish
 
 	vinstall Extra/desktop/clight.desktop 644 usr/share/applications
 }

From f181730ef7f7918ee92fa6e5822582fb685bfb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Sun, 28 Feb 2021 09:27:43 +0100
Subject: [PATCH 2374/3458] Clightd: Update to 5.2

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

diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index f64c47da4914..ac41b06939b0 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,6 +1,6 @@
 # Template file for 'Clightd'
 pkgname=Clightd
-version=5.1
+version=5.2
 revision=1
 build_style=cmake
 cmake_builddir=build
@@ -15,7 +15,7 @@ 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=ce5002ed7790fce64e323bd483d8e5dde70a7fa9bbebc8311f514e0d5a64ab10
+checksum=6636d58eae7aff4780534258940d1f680637fc1b983320e15aa2fd5be8648853
 
 post_install() {
 	vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/

From 560ac04407ee9533ad8ef740895c1c08fb120ce0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 27 Feb 2021 17:21:30 +0100
Subject: [PATCH 2375/3458] electron10: update to 10.4.0.

---
 .../patches/electron-exclude-content-test-patches.patch      | 2 +-
 srcpkgs/electron10/template                                  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
index edb0ed214ff3..ccc17a0f303f 100644
--- a/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
+++ b/srcpkgs/electron10/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/**', 'test/unittests/**'],
++      exclude=['test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**'],
        committer_name="Electron Scripts", committer_email="scripts@electron")
  
  
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index e529c6341ffe..aecda9043c4f 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -1,6 +1,6 @@
 # Template file for 'electron10'
 pkgname=electron10
-version=10.3.0
+version=10.4.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="2938b0fd433d2a3f89eecaf3d28ecfec333ab15da84ae2e0a0db70cc3b047d75
+checksum="83dfdc6921ab0263c08168536570720b19eb251a1655715fc5b9b100efecde38
  e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
  dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
 
@@ -293,7 +293,6 @@ do_configure() {
 		'is_component_build=false'
 		"is_debug=$_is_debug"
 		'is_desktop_linux=true'
-		'linux_use_bundled_binutils=false'
 		'proprietary_codecs=true'
 		'treat_warnings_as_errors=false'
 		'use_allocator_shim=false'

From 3c6df121c32bd8e1573017f7494e6460b3aec046 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sun, 28 Feb 2021 18:40:15 +0100
Subject: [PATCH 2376/3458] mkvtoolnix: update to 54.0.0

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

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 457671f25faf..18b16d506ae2 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=53.0.0
+version=54.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=8dfd66278c81e6f1df0fd84aad30ce2b4cf7a2ad4336924f01f1879f9d1e4cd6
+checksum=792fa095eaeeda9030f1f189ab40c2ebf8363c9a90ebe482d68dc05b4e16a52c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 49f2190939ed6b4d0dde3e126c8cbe87d1727f35 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 Feb 2021 20:17:17 +0100
Subject: [PATCH 2377/3458] janet: update to 1.15.3.

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

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 3ad4c7f07c33..bf4e50ac6e81 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.15.2
+version=1.15.3
 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=9d08e24c1beaf01231fde469a097ae04c51673be37ab25ca6fef82324a8f7ee9
+checksum=a92d8540f422eb690fa1634e01cd18b4a2a3d184f7d3f219bf4a77c3a655baae
 
 post_install() {
 	vlicense LICENSE

From 943cac0563dde8b05c3814a3397a3d44fca40a17 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sun, 28 Feb 2021 13:32:00 -0700
Subject: [PATCH 2378/3458] python3-rich: update to 9.12.2.

---
 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 4de139faeee3..ecee68704e03 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.12.0
+version=9.12.2
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,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=27e3deb24555d7dad554afa871c7e77f16a0336a625ed78dd10de21193b4ec11
+checksum=493b4288273aa46475230733358696457e5df9215c898b164a324b7d9d694e88
 
 post_install() {
 	vlicense LICENSE

From 0e84882bcfbdaa87805192e65eea999efb2408b8 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sun, 28 Feb 2021 13:33:43 -0700
Subject: [PATCH 2379/3458] python3-youtube-search: update to 2.1.0.

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

diff --git a/srcpkgs/python3-youtube-search/template b/srcpkgs/python3-youtube-search/template
index 4c78f4d732b8..349e80f46991 100644
--- a/srcpkgs/python3-youtube-search/template
+++ b/srcpkgs/python3-youtube-search/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtube-search'
 pkgname=python3-youtube-search
-version=1.1.1
+version=2.1.0
 revision=1
 _gitver=86af3e73bd340f37be56f2be6a5ff706b16e454e
 create_wrksrc=yes
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/joetats/youtube_search"
 distfiles="${PYPI_SITE}/y/youtube-search/youtube-search-${version}.tar.gz
  https://raw.githubusercontent.com/joetats/youtube_search/${_gitver}/LICENSE>LICENSE.txt"
-checksum="ba6f59960191140e14f0440725438ddaf7403f52447854fa25c8b2f8218fd118
+checksum="1541120273996fa433698b2e57b73296dfb8e90536211f29ea997dcf161b66fe
  cd58d968a55585bfc21aea093aee5ba92a6785bab24c9969cfe2cd8bfe9ea83d"
 
 post_install() {

From 76151d30dc04f9adf605d0fcf5bf4165e0dd43b8 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 28 Feb 2021 10:50:05 +0300
Subject: [PATCH 2380/3458] lf: update to r21.

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

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 721a33cbf580..e3a467f9aa9d 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
 # Template file for 'lf'
 pkgname=lf
-version=r20
+version=r21
 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=b0d755e255d48229c14b7ec5f86788c6fc96df1f6859f677b313fd9deb856398
+checksum=088510cc1f86084c02353d55e56a8c44576b5dbfc37327daabaa86ae6b287a20
 
 post_install() {
 	vlicense LICENSE

From 557c16e3874ec6fc01b58dff850f34cbd89ade85 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 28 Feb 2021 20:36:36 +0400
Subject: [PATCH 2381/3458] xkeyboard-config: update to 2.32.

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

diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index 427417b56c48..879e4d2a98d1 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -1,6 +1,6 @@
 # Template file for 'xkeyboard-config'
 pkgname=xkeyboard-config
-version=2.31
+version=2.32
 revision=1
 build_style=gnu-configure
 configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules"
@@ -12,7 +12,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 distfiles="${XORG_SITE}/data/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=da44181f2c8828789c720decf7d13acb3c3950e2a040af5132f50f04bb6aada3
+checksum=1feee317ba39b91902b0cbd2987c0c73e6afbfc8f4c096367a5c86c216c036a8
 
 post_install() {
 	vlicense COPYING

From b904eb91c5d3b52b722069a217eb54633893e1a3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 28 Feb 2021 20:26:53 +0400
Subject: [PATCH 2382/3458] osinfo-db: update to 20210215.

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

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 0377c7686ad9..da4243ed68f7 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210202
+version=20210215
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=0bb56aeddf94a2cf48853c0e82cacaeb873d98c19590d81fbceadb06a391b11b
+checksum=1c8337b2ae3bfb49c89a26b0f828e38e0627048a2bc2603a53168d79f8d83598
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From e0d10d691993483eb4fd29aa791e5e3d187ce04b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 28 Feb 2021 22:24:31 +0100
Subject: [PATCH 2383/3458] linux5.4: backport the static keys patch

---
 .../patches/ppc64le-fix-static-keys.patch     | 140 ++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 srcpkgs/linux5.4/patches/ppc64le-fix-static-keys.patch

diff --git a/srcpkgs/linux5.4/patches/ppc64le-fix-static-keys.patch b/srcpkgs/linux5.4/patches/ppc64le-fix-static-keys.patch
new file mode 100644
index 000000000000..7c46dcd06239
--- /dev/null
+++ b/srcpkgs/linux5.4/patches/ppc64le-fix-static-keys.patch
@@ -0,0 +1,140 @@
+From e7eb919057c3450cdd9d335e4a23a4da8da58db4 Mon Sep 17 00:00:00 2001
+From: Michael Ellerman <mpe@ellerman.id.au>
+Date: Wed, 3 Feb 2021 00:02:07 +1100
+Subject: [PATCH] powerpc/64s: Handle program checks in wrong endian during
+ early boot
+
+There's a short window during boot where although the kernel is
+running little endian, any exceptions will cause the CPU to switch
+back to big endian. This situation persists until we call
+configure_exceptions(), which calls either the hypervisor or OPAL to
+configure the CPU so that exceptions will be taken in little
+endian (via HID0[HILE]).
+
+We don't intend to take exceptions during early boot, but one way we
+sometimes do is via a WARN/BUG etc. Those all boil down to a trap
+instruction, which will cause a program check exception.
+
+The first instruction of the program check handler is an mtsprg, which
+when executed in the wrong endian is an lhzu with a ~3GB displacement
+from r3. The content of r3 is random, so that becomes a load from some
+random location, and depending on the system (installed RAM etc.) can
+easily lead to a checkstop, or an infinitely recursive page fault.
+That prevents whatever the WARN/BUG was complaining about being
+printed to the console, and the user just sees a dead system.
+
+We can fix it by having a trampoline at the beginning of the program
+check handler that detects we are in the wrong endian, and flips us
+back to the correct endian.
+
+We can't flip MSR[LE] using mtmsr (alas), so we have to use rfid. That
+requires backing up SRR0/1 as well as a GPR. To do that we use
+SPRG0/2/3 (SPRG1 is already used for the paca). SPRG3 is user
+readable, but this trampoline is only active very early in boot, and
+SPRG3 will be reinitialised in vdso_getcpu_init() before userspace
+starts.
+
+With this trampoline in place we can survive a WARN early in boot and
+print a stack trace, which is eventually printed to the console once
+the console is up, eg:
+
+  [83565.758545] kexec_core: Starting new kernel
+  [    0.000000] ------------[ cut here ]------------
+  [    0.000000] static_key_enable_cpuslocked(): static key '0xc000000000ea6160' used before call to jump_label_init()
+  [    0.000000] WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xfc/0x120
+  [    0.000000] Modules linked in:
+  [    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 5.10.0-gcc-8.2.0-dirty #618
+  [    0.000000] NIP:  c0000000002fd46c LR: c0000000002fd468 CTR: c000000000170660
+  [    0.000000] REGS: c000000001227940 TRAP: 0700   Not tainted  (5.10.0-gcc-8.2.0-dirty)
+  [    0.000000] MSR:  9000000002823003 <SF,HV,VEC,VSX,FP,ME,RI,LE>  CR: 24882422  XER: 20040000
+  [    0.000000] CFAR: 0000000000000730 IRQMASK: 1
+  [    0.000000] GPR00: c0000000002fd468 c000000001227bd0 c000000001228300 0000000000000065
+  [    0.000000] GPR04: 0000000000000001 0000000000000065 c0000000010cf970 000000000000000d
+  [    0.000000] GPR08: 0000000000000000 0000000000000000 0000000000000000 c00000000122763f
+  [    0.000000] GPR12: 0000000000002000 c000000000f8a980 0000000000000000 0000000000000000
+  [    0.000000] GPR16: 0000000000000000 0000000000000000 c000000000f88c8e c000000000f88c9a
+  [    0.000000] GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
+  [    0.000000] GPR24: 0000000000000000 c000000000dea3a8 0000000000000000 c000000000f35114
+  [    0.000000] GPR28: 0000002800000000 c000000000f88c9a c000000000f88c8e c000000000ea6160
+  [    0.000000] NIP [c0000000002fd46c] static_key_enable_cpuslocked+0xfc/0x120
+  [    0.000000] LR [c0000000002fd468] static_key_enable_cpuslocked+0xf8/0x120
+  [    0.000000] Call Trace:
+  [    0.000000] [c000000001227bd0] [c0000000002fd468] static_key_enable_cpuslocked+0xf8/0x120 (unreliable)
+  [    0.000000] [c000000001227c40] [c0000000002fd4c0] static_key_enable+0x30/0x50
+  [    0.000000] [c000000001227c70] [c000000000f6629c] early_page_poison_param+0x58/0x9c
+  [    0.000000] [c000000001227cb0] [c000000000f351b8] do_early_param+0xa4/0x10c
+  [    0.000000] [c000000001227d30] [c00000000011e020] parse_args+0x270/0x5e0
+  [    0.000000] [c000000001227e20] [c000000000f35864] parse_early_options+0x48/0x5c
+  [    0.000000] [c000000001227e40] [c000000000f358d0] parse_early_param+0x58/0x84
+  [    0.000000] [c000000001227e70] [c000000000f3a368] early_init_devtree+0xc4/0x490
+  [    0.000000] [c000000001227f10] [c000000000f3bca0] early_setup+0xc8/0x1c8
+  [    0.000000] [c000000001227f90] [000000000000c320] 0xc320
+  [    0.000000] Instruction dump:
+  [    0.000000] 4bfffddd 7c2004ac 39200001 913f0000 4bffffb8 7c651b78 3c82ffac 3c62ffc0
+  [    0.000000] 38841b00 3863f310 4bdf03a5 60000000 <0fe00000> 4bffff38 60000000 60000000
+  [    0.000000] random: get_random_bytes called from print_oops_end_marker+0x40/0x80 with crng_init=0
+  [    0.000000] ---[ end trace 0000000000000000 ]---
+  [    0.000000] dt-cpu-ftrs: setup for ISA 3000
+
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20210202130207.1303975-2-mpe@ellerman.id.au
+---
+ arch/powerpc/kernel/exceptions-64s.S | 45 ++++++++++++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
+index b3793f982b2be..c51c436d5845f 100644
+--- a/arch/powerpc/kernel/exceptions-64s.S
++++ b/arch/powerpc/kernel/exceptions-64s.S
+@@ -1281,6 +1281,51 @@ EXC_COMMON_BEGIN(alignment_common)
+ 
+ 
+ EXC_REAL_BEGIN(program_check, 0x700, 0x100)
++
++#ifdef CONFIG_CPU_LITTLE_ENDIAN
++	/*
++	 * There's a short window during boot where although the kernel is
++	 * running little endian, any exceptions will cause the CPU to switch
++	 * back to big endian. For example a WARN() boils down to a trap
++	 * instruction, which will cause a program check, and we end up here but
++	 * with the CPU in big endian mode. The first instruction of the program
++	 * check handler (in GEN_INT_ENTRY below) is an mtsprg, which when
++	 * executed in the wrong endian is an lhzu with a ~3GB displacement from
++	 * r3. The content of r3 is random, so that is a load from some random
++	 * location, and depending on the system can easily lead to a checkstop,
++	 * or an infinitely recursive page fault.
++	 *
++	 * So to handle that case we have a trampoline here that can detect we
++	 * are in the wrong endian and flip us back to the correct endian. We
++	 * can't flip MSR[LE] using mtmsr, so we have to use rfid. That requires
++	 * backing up SRR0/1 as well as a GPR. To do that we use SPRG0/2/3, as
++	 * SPRG1 is already used for the paca. SPRG3 is user readable, but this
++	 * trampoline is only active very early in boot, and SPRG3 will be
++	 * reinitialised in vdso_getcpu_init() before userspace starts.
++	 */
++BEGIN_FTR_SECTION
++	tdi   0,0,0x48    // Trap never, or in reverse endian: b . + 8
++	b     1f          // Skip trampoline if endian is correct
++	.long 0xa643707d  // mtsprg  0, r11      Backup r11
++	.long 0xa6027a7d  // mfsrr0  r11
++	.long 0xa643727d  // mtsprg  2, r11      Backup SRR0 in SPRG2
++	.long 0xa6027b7d  // mfsrr1  r11
++	.long 0xa643737d  // mtsprg  3, r11      Backup SRR1 in SPRG3
++	.long 0xa600607d  // mfmsr   r11
++	.long 0x01006b69  // xori    r11, r11, 1 Invert MSR[LE]
++	.long 0xa6037b7d  // mtsrr1  r11
++	.long 0x34076039  // li      r11, 0x734
++	.long 0xa6037a7d  // mtsrr0  r11
++	.long 0x2400004c  // rfid
++	mfsprg r11, 3
++	mtsrr1 r11        // Restore SRR1
++	mfsprg r11, 2
++	mtsrr0 r11        // Restore SRR0
++	mfsprg r11, 0     // Restore r11
++1:
++END_FTR_SECTION(0, 1)     // nop out after boot
++#endif /* CONFIG_CPU_LITTLE_ENDIAN */
++
+ 	INT_HANDLER program_check, 0x700, kvm=1
+ EXC_REAL_END(program_check, 0x700, 0x100)
+ EXC_VIRT_BEGIN(program_check, 0x4700, 0x100)

From 00419e5d25e42f41d44ba116ab3d526fc9e4018b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 22:45:47 +0100
Subject: [PATCH 2384/3458] zathura-pdf-mupdf: remove unused libressl
 makedepends

---
 srcpkgs/zathura-pdf-mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189ed..7aff4456b5e8 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
 revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel libopenjpeg2-devel
  libjpeg-turbo-devel libjbig2dec"
 depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"

From cd2187b832ce687ece8843d57c7b488a9078ec44 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 23 Feb 2021 16:57:08 -0600
Subject: [PATCH 2385/3458] New package: bbkeys-0.9.2

---
 srcpkgs/bbkeys/patches/fix-cross.patch | 37 ++++++++++++++++++++++++++
 srcpkgs/bbkeys/template                | 17 ++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/bbkeys/patches/fix-cross.patch
 create mode 100644 srcpkgs/bbkeys/template

diff --git a/srcpkgs/bbkeys/patches/fix-cross.patch b/srcpkgs/bbkeys/patches/fix-cross.patch
new file mode 100644
index 000000000000..48dcdac17ac9
--- /dev/null
+++ b/srcpkgs/bbkeys/patches/fix-cross.patch
@@ -0,0 +1,37 @@
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -108,7 +108,6 @@
+ 	Netclient.$(OBJEXT) ScreenHandler.$(OBJEXT) window.$(OBJEXT) \
+ 	WindowlistMenu.$(OBJEXT)
+ bbkeys_OBJECTS = $(am_bbkeys_OBJECTS)
+-bbkeys_DEPENDENCIES = /usr/lib/libbt.a
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -350,7 +349,7 @@
+ 	WindowlistMenu.cpp \
+ 	WindowlistMenu.h 
+ 
+-bbkeys_LDADD = /usr/lib/libbt.a
++bbkeys_LDADD = -lbt
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = bbkeys
+ all: all-am
+ 
+@@ -444,7 +443,7 @@
+ 	  done; \
+ 	done; rm -f c$${pid}_.???; exit $$bad
+ 
+-bbkeys$(EXEEXT): $(bbkeys_OBJECTS) $(bbkeys_DEPENDENCIES) $(EXTRA_bbkeys_DEPENDENCIES) 
++bbkeys$(EXEEXT): $(bbkeys_OBJECTS) $(EXTRA_bbkeys_DEPENDENCIES) 
+ 	@rm -f bbkeys$(EXEEXT)
+ 	$(AM_V_CXXLD)$(CXXLINK) $(bbkeys_OBJECTS) $(bbkeys_LDADD) $(LIBS)
+ 
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -31,6 +31,5 @@
+ 	window.hh \
+ 	WindowlistMenu.cpp \
+ 	WindowlistMenu.h 
+-bbkeys_LDADD = /usr/lib/libbt.a
+ 
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = bbkeys
diff --git a/srcpkgs/bbkeys/template b/srcpkgs/bbkeys/template
new file mode 100644
index 000000000000..a9a52c11007a
--- /dev/null
+++ b/srcpkgs/bbkeys/template
@@ -0,0 +1,17 @@
+# Template file for 'bbkeys'
+pkgname=bbkeys
+version=0.9.2
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config perl"
+makedepends="blackboxwm-devel libX11-devel libXext-devel libXft-devel"
+short_desc="Blackbox tool for setting keyboard shortcuts"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/bbidulock/bbkeys"
+distfiles="${homepage}/releases/download/rel-${version//.}/bbkeys-${version}.tar.lz"
+checksum=ece0113b2cc6367e2cad95f59cf43d7576b5a1a7eb8a9e3f10ce9814db67b95c
+
+post_install() {
+	vlicense COPYING
+}

From 0505808d976d1319db72d66d7e6dcfd5414b1115 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sun, 28 Feb 2021 13:43:23 -0700
Subject: [PATCH 2386/3458] libredwg: update to 0.12.3.

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

diff --git a/srcpkgs/libredwg/template b/srcpkgs/libredwg/template
index f25e84658d2d..e7dd4fe40dd2 100644
--- a/srcpkgs/libredwg/template
+++ b/srcpkgs/libredwg/template
@@ -1,6 +1,6 @@
 # Template file for 'libredwg'
 pkgname=libredwg
-version=0.12.2
+version=0.12.3
 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=9227f4cb8a4aa1b785038e2c583affe0d84194c97dca4794e143258b0302fb85
+checksum=b31a33466ba23312119138d0ac022399841ee0f40d9bbd970410a2fc471e15ee
 
 post_install() {
 	rm ${DESTDIR}/usr/share/{dwgadd.example,load_dwg.py}

From 88244b9db1ed8b698d1e9c8aa2130f76a2b6cc3c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Sun, 28 Feb 2021 13:39:21 -0700
Subject: [PATCH 2387/3458] bzflag: update to 2.4.22.

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

diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index 95a2c37185ab..d58270495975 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,7 +1,7 @@
 # Template file for 'bzflag'
 pkgname=bzflag
-version=2.4.20
-revision=2
+version=2.4.22
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel c-ares-devel glew-devel libcurl-devel ncurses-devel zlib-devel"
@@ -11,4 +11,4 @@ license="LGPL-2.1-only, MPL-2.0"
 homepage="https://www.bzflag.org"
 changelog="https://raw.githubusercontent.com/BZFlag-Dev/bzflag/2.4/ChangeLog"
 distfiles="https://download.bzflag.org/bzflag/source/${version}/bzflag-${version}.tar.bz2"
-checksum=62c9c6175d805b4ac65d328eba8daefa56cc17931f46b42891e4fbe82aee7999
+checksum=9e64653302b657bd8b5f96fe1150a9ff80a1d53a6d7e8a35138c6b1b02006a4d

From 63f3d3d489cbab2b61db2a845a19369ecff93d71 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 25 Feb 2021 16:08:07 +0100
Subject: [PATCH 2388/3458] texstudio: update to 3.1.1.

Closes: #29051 [via git-merge-pr]
---
 srcpkgs/texstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template
index 059a4a59e4a0..601a7d048be3 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -1,6 +1,6 @@
 # Template file for 'texstudio'
 pkgname=texstudio
-version=3.0.4
+version=3.1.1
 revision=1
 build_style=qmake
 configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://texstudio.org/"
 changelog="https://raw.githubusercontent.com/texstudio-org/texstudio/master/utilities/manual/CHANGELOG.txt"
 distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz"
-checksum=eaa8d67ee5894692c5c39880ab0fcbc4fb42fd5e22242e5c192dfe025a208a36
+checksum=386a3d09d222a65f3c2a4dbb0cbafe6c6784987487a19299cf96a1f4000e16d2
 
 build_options="phonon poppler"
 desc_option_phonon="build with phonon (=media support for pdf preview)"

From f2bcf47da7b2fa9cbf821e6dd538aadd7828850d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 23:12:41 +0100
Subject: [PATCH 2389/3458] tagparser: remove libressl makedepends

it would only be used for tests, so checkdepends would be correct
Tests aren't enabled, it requires quite a lot external files downloaded for tests
---
 srcpkgs/tagparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c4..7c976a88232c 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel"
 short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"

From 1aba1c32c2e10d44ecc7136c413ec2bb7581cc4b Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Sun, 28 Feb 2021 21:42:19 +0100
Subject: [PATCH 2390/3458] ddcutil: update to 1.0.1 (with soname)

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

diff --git a/common/shlibs b/common/shlibs
index 959f1692961f..858957c29f75 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3041,7 +3041,7 @@ libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
 libtacacs.so.1 tacacs-4.0.4.28_1
 libffms2.so.4 libffms2-2.23.1_1
-libddcutil.so.3 ddcutil-0.9.9_1
+libddcutil.so.4 ddcutil-1.0.1_1
 liblsmash.so.2 liblsmash-2.9.1_1
 libgiac.so.0 libgiac-1.4.9r17_1
 libgnustep-base.so.1.27 gnustep-base-1.27.0_1
diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template
index ef35fdc987f5..44e17314e64a 100644
--- a/srcpkgs/ddcutil/template
+++ b/srcpkgs/ddcutil/template
@@ -1,6 +1,6 @@
 # Template file for 'ddcutil'
 pkgname=ddcutil
-version=0.9.9
+version=1.0.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.ddcutil.com"
 distfiles="https://github.com/rockowitz/ddcutil/archive/v${version}.tar.gz"
-checksum=fcb4125be4f6f95c69160bcd8bf6b39b5ae0e2f18f0f7742398cd43e082b82cd
+checksum=348495de551f3da390639459d42f33a59554b8648dde3294279ed6d11bf0e2ef
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel musl-legacy-compat"

From 74975c85446be01f03c3b5d854a925fd84f91da1 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Sun, 28 Feb 2021 21:43:04 +0100
Subject: [PATCH 2391/3458] Clightd: revbump for ddcutil

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

diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index ac41b06939b0..5d63698607ec 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,7 +1,7 @@
 # Template file for 'Clightd'
 pkgname=Clightd
 version=5.2
-revision=1
+revision=2
 build_style=cmake
 cmake_builddir=build
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"

From 7effa9ae2c495c1575b2c6ca3208dbe563ceefa1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 28 Feb 2021 23:19:46 +0100
Subject: [PATCH 2392/3458] kernels: enable init_on_alloc by default

https://cateee.net/lkddb/web-lkddb/INIT_ON_ALLOC_DEFAULT_ON.html

This will replace `slub_debug=P page_poison=1`. Only enabling
on x86, ARM and ppc64le for now and not ppc64/ppc because of
performance concerns on old hardware.

Not enabling init_on_free by default since that has a much larger
impact.
---
 srcpkgs/linux5.10/files/arm64-dotconfig            | 2 +-
 srcpkgs/linux5.10/files/i386-dotconfig             | 2 +-
 srcpkgs/linux5.10/files/ppc64le-dotconfig          | 2 +-
 srcpkgs/linux5.10/files/x86_64-dotconfig           | 2 +-
 srcpkgs/linux5.11/files/arm64-dotconfig            | 2 +-
 srcpkgs/linux5.11/files/i386-dotconfig             | 2 +-
 srcpkgs/linux5.11/files/ppc64le-dotconfig          | 2 +-
 srcpkgs/linux5.11/files/x86_64-dotconfig           | 2 +-
 srcpkgs/linux5.4/files/arm-dotconfig               | 2 +-
 srcpkgs/linux5.4/files/arm64-dotconfig             | 2 +-
 srcpkgs/linux5.4/files/i386-dotconfig              | 2 +-
 srcpkgs/linux5.4/files/ppc64le-dotconfig           | 2 +-
 srcpkgs/linux5.4/files/x86_64-dotconfig            | 2 +-
 srcpkgs/pinebookpro-kernel/files/dotconfig         | 2 +-
 srcpkgs/pinephone-kernel/files/pinephone-dotconfig | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index e089585f4d42..218fc965d543 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -10717,7 +10717,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index d7414d89262d..49b3633c6af4 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -9251,7 +9251,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index 08459346e243..21a2401e1de4 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -9090,7 +9090,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 5cfcbb3f3485..5044f775a5bc 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -9404,7 +9404,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.11/files/arm64-dotconfig b/srcpkgs/linux5.11/files/arm64-dotconfig
index cdc4c921deba..2ae2b39dd4ed 100644
--- a/srcpkgs/linux5.11/files/arm64-dotconfig
+++ b/srcpkgs/linux5.11/files/arm64-dotconfig
@@ -10821,7 +10821,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.11/files/i386-dotconfig b/srcpkgs/linux5.11/files/i386-dotconfig
index a87f89e7f5c8..8be6f073bf13 100644
--- a/srcpkgs/linux5.11/files/i386-dotconfig
+++ b/srcpkgs/linux5.11/files/i386-dotconfig
@@ -9319,7 +9319,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.11/files/ppc64le-dotconfig b/srcpkgs/linux5.11/files/ppc64le-dotconfig
index 8deca7091036..b187b7baebd2 100644
--- a/srcpkgs/linux5.11/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.11/files/ppc64le-dotconfig
@@ -9157,7 +9157,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.11/files/x86_64-dotconfig b/srcpkgs/linux5.11/files/x86_64-dotconfig
index 729170cafe01..dae7db0d64aa 100644
--- a/srcpkgs/linux5.11/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.11/files/x86_64-dotconfig
@@ -9472,7 +9472,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.4/files/arm-dotconfig b/srcpkgs/linux5.4/files/arm-dotconfig
index e54fc6c40808..0953e0c0054c 100644
--- a/srcpkgs/linux5.4/files/arm-dotconfig
+++ b/srcpkgs/linux5.4/files/arm-dotconfig
@@ -6725,7 +6725,7 @@ CONFIG_INIT_STACK_NONE=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index 3f4082418c75..15305c7782c6 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -9971,7 +9971,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig
index 51445aa49688..88f5a3de1367 100644
--- a/srcpkgs/linux5.4/files/i386-dotconfig
+++ b/srcpkgs/linux5.4/files/i386-dotconfig
@@ -8814,7 +8814,7 @@ CONFIG_INIT_STACK_NONE=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.4/files/ppc64le-dotconfig b/srcpkgs/linux5.4/files/ppc64le-dotconfig
index 97d31795f388..00d74543add1 100644
--- a/srcpkgs/linux5.4/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64le-dotconfig
@@ -8666,7 +8666,7 @@ CONFIG_INIT_STACK_NONE=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig
index 5b30546a8d62..f8f2c5da51d6 100644
--- a/srcpkgs/linux5.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.4/files/x86_64-dotconfig
@@ -8973,7 +8973,7 @@ CONFIG_INIT_STACK_NONE=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/pinebookpro-kernel/files/dotconfig b/srcpkgs/pinebookpro-kernel/files/dotconfig
index c45b7930c76c..2c383ae77363 100644
--- a/srcpkgs/pinebookpro-kernel/files/dotconfig
+++ b/srcpkgs/pinebookpro-kernel/files/dotconfig
@@ -8421,7 +8421,7 @@ CONFIG_INIT_STACK_NONE=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/pinephone-kernel/files/pinephone-dotconfig b/srcpkgs/pinephone-kernel/files/pinephone-dotconfig
index f112f3ebe650..812eb55a5c69 100644
--- a/srcpkgs/pinephone-kernel/files/pinephone-dotconfig
+++ b/srcpkgs/pinephone-kernel/files/pinephone-dotconfig
@@ -4686,7 +4686,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options

From 2dd0f8039a13f1e1b17dbec18256775458595d3a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 28 Feb 2021 23:24:44 +0100
Subject: [PATCH 2393/3458] dracut: remove slub_debug/page_poison from uefi
 hook conf

---
 srcpkgs/dracut/files/dracut-uefi-hook.confd | 2 +-
 srcpkgs/dracut/template                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dracut/files/dracut-uefi-hook.confd b/srcpkgs/dracut/files/dracut-uefi-hook.confd
index 50647c483a90..5638da56f415 100644
--- a/srcpkgs/dracut/files/dracut-uefi-hook.confd
+++ b/srcpkgs/dracut/files/dracut-uefi-hook.confd
@@ -7,7 +7,7 @@
 # Booting without a kernel command line is unsupported.
 
 # You can set the kernel command line with
-#KERNEL_CMDLINE="loglevel=4 slub_debug=P page_poison=1"
+#KERNEL_CMDLINE="loglevel=4"
 # or by setting kernel_cmdline in a dracut.conf(5) file.
 # The bundle can also use the command line from a bootloader / boot manager
 # if Secure Boot is disabled.
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index d58e168497d5..791591ae7c30 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=051
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"

From 89b9d1a8d26cbb073df6a564d72ac1df8fc4d42e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 28 Feb 2021 23:25:43 +0100
Subject: [PATCH 2394/3458] efibootmgr: remove slub_debug/page_poison from conf
 example

---
 srcpkgs/efibootmgr/files/efibootmgr-kernel-hook.confd | 2 +-
 srcpkgs/efibootmgr/template                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/efibootmgr/files/efibootmgr-kernel-hook.confd b/srcpkgs/efibootmgr/files/efibootmgr-kernel-hook.confd
index 374a26848825..42adfc0da400 100644
--- a/srcpkgs/efibootmgr/files/efibootmgr-kernel-hook.confd
+++ b/srcpkgs/efibootmgr/files/efibootmgr-kernel-hook.confd
@@ -3,7 +3,7 @@ MODIFY_EFI_ENTRIES=0
 # To allow efibootmgr to modify boot entries, set
 # MODIFY_EFI_ENTRIES=1
 # Kernel command-line options.  Example:
-# OPTIONS="root=/dev/sda3 loglevel=4 slub_debug=P page_poison=1"
+# OPTIONS="root=/dev/sda3 loglevel=4"
 # Disk where EFI Partition is.  Default is /dev/sda
 # DISK="/dev/sda"
 # Partition number of EFI Partition.  Default is 1
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index ca131efb1b14..36a0b6f6bb9d 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -1,7 +1,7 @@
 # Template file for 'efibootmgr'
 pkgname=efibootmgr
 version=17
-revision=4
+revision=5
 hostmakedepends="pkg-config"
 makedepends="libefivar-devel popt-devel"
 short_desc="Tool to modify UEFI Firmware Boot Manager Variables"

From 2bed4540447afe36f145f1b4fb61bf7dbb498080 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 28 Feb 2021 23:26:29 +0100
Subject: [PATCH 2395/3458] refind: remove slub_debug/page_poison from kernel
 hook

---
 srcpkgs/refind/files/refind-kernel-hook.conf | 2 +-
 srcpkgs/refind/template                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/refind/files/refind-kernel-hook.conf b/srcpkgs/refind/files/refind-kernel-hook.conf
index dd61097eb941..5c48e89ebeda 100644
--- a/srcpkgs/refind/files/refind-kernel-hook.conf
+++ b/srcpkgs/refind/files/refind-kernel-hook.conf
@@ -19,4 +19,4 @@ UPDATE_REFIND_CONF=0
 REFIND_CONF=/boot/EFI/refind/refind.conf
 
 # addition kernel cmdline
-OPTIONS="quiet page_poison=1 loglevel=4 slub_debug=P"
+OPTIONS="quiet loglevel=4"
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 2cd2bb683ee5..1c3d80eae41d 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -1,7 +1,7 @@
 # Template file for 'refind'
 pkgname=refind
 version=0.13.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64*"
 makedepends="gnu-efi-libs"
 depends="bash dosfstools efibootmgr"

From bec007c4e82822889d2cb915f36e14e993fe6d8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 22:32:52 +0100
Subject: [PATCH 2396/3458] zola: remove libressl build dep

they switched to rustls at 0.10.0
---
 srcpkgs/zola/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698cd..545f91da5006 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="libsass-devel oniguruma-devel"
 short_desc="Fast opinionated static site generator written in rust"
 maintainer="Carson Page <pagem.carson@gmail.com>"
 license="MIT"
@@ -13,8 +13,9 @@ changelog="https://github.com/getzola/zola/raw/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
 checksum=84c20cf5c851a465266c5cc343623752102c53929f6da31b2a4ce747a87c5c23
 
-case $XBPS_TARGET_MACHINE in
-	ppc*) broken="segfaults" ;;
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*) ;;
+	*) broken="ftbfs in ring" ;;
 esac
 
 pre_build() {

From a0e40935a63c36133214c9babc1fa9afb998966f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 23:45:46 +0100
Subject: [PATCH 2397/3458] rdesktop: remove unused libressl makedepends

this package does use gnutls since 1.9.0
---
 srcpkgs/rdesktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c81..6130c88becc9 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -3,9 +3,9 @@ pkgname=rdesktop
 version=1.9.0
 revision=3
 build_style=gnu-configure
-configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
+configure_args="--with-ipv6 --with-sound=alsa"
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="alsa-lib-devel libsamplerate-devel libXrandr-devel
  pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
  nettle-devel gnutls-devel"
 short_desc="Open source client for Windows Remote Desktop Services"

From 5bb228bad251786253e139dc172c4524af274cec Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 10 Feb 2021 08:39:31 +0100
Subject: [PATCH 2398/3458] fakeroot: update to 1.25.3.

---
 .../busybox_compat_force_abslibpath.patch     | 14 ----
 .../cross-dont-run-sysv-ipc-test.patch        | 72 +++++++++++++++++++
 .../patches/fakeroot-hide-dlsym-errors.patch  | 20 ------
 srcpkgs/fakeroot/template                     | 41 ++++++++---
 4 files changed, 103 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch
 create mode 100644 srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch
 delete mode 100644 srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch

diff --git a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch b/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch
deleted file mode 100644
index 2bd1b4129bd1..000000000000
--- a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-- Always force absolute path for LD_PRELOAD.
-- Make getopt test work with busybox implementation.
-
---- scripts/fakeroot.in.orig	2011-12-01 05:00:36.000000000 +0100
-+++ scripts/fakeroot.in	2012-02-01 16:04:04.707499043 +0100
-@@ -33,7 +33,7 @@ fatal ()
- FAKEROOT_PREFIX=@prefix@
- FAKEROOT_BINDIR=@bindir@
- 
--USEABSLIBPATH=@LDPRELOADABS@
-+USEABSLIBPATH=1
- LIB=lib@fakeroot_transformed@@DLSUFFIX@
- PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
- FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
diff --git a/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch b/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch
new file mode 100644
index 000000000000..d878145e5fd0
--- /dev/null
+++ b/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch
@@ -0,0 +1,72 @@
+Revert "Select TCP when lack of SYSV IPC"
+
+This reverts commit 19d204548d4f141fcc8a5e494eea84282b17f4a2.
+
+From 19d204548d4f141fcc8a5e494eea84282b17f4a2 Mon Sep 17 00:00:00 2001
+From: Matt Weber <matthew.weber@rockwellcollins.com>
+Date: Mon, 16 Sep 2019 22:00:29 -0500
+Subject: [PATCH] Select TCP when lack of SYSV IPC
+
+Update to add a configure test to build and install the TCP IPC version
+when detecting SYSV IPC MsgQ support isn't available.
+
+The issue was initially discovered on Windows Services for Linux
+(WSL1.0). WSL does have some SysV IPC, but no message Q's, which is
+required by fakeroot/faked by default.
+
+Fixes:
+https://github.com/Microsoft/WSL/issues/2465
+
+Additional bug reports:
+https://bugs.busybox.net/show_bug.cgi?id=11366
+
+Signed-off-by: Jean-Francois Doyon <jfdoyon@gmail.com>
+Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
+
+diff --git a/configure.ac b/configure.ac
+index 73415d2..ddde5c9 100644
+--- configure.ac
++++ configure.ac
+@@ -25,42 +25,6 @@ AC_CACHE_CHECK([which IPC method to use],
+ 	       [ac_cv_use_ipc],
+ 	       [ac_cv_use_ipc=sysv])
+ 
+-if test $ac_cv_use_ipc = "sysv"; then
+-  AC_MSG_CHECKING([whether SysV IPC message queues are actually working on the host])
+-
+-  AC_LANG_PUSH(C)
+-  AC_TRY_RUN([
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/ipc.h>
+-#include <sys/msg.h>
+-#include <time.h>
+-#include <unistd.h>
+-
+-int main() {
+-
+-  srandom(time(NULL)+getpid()*33151);
+-  key_t msg_key = random();
+-  int msg_get = msgget(msg_key, IPC_CREAT|0600);
+-
+-  if (msg_get==-1) {
+-    return 1;
+-  } else {
+-    msgctl(msg_get, IPC_RMID, NULL);
+-    return 0;
+-  }
+-
+-}], [ac_cv_use_ipc=sysv], [ac_cv_use_ipc=tcp])
+-
+-  if test $ac_cv_use_ipc = "tcp"; then
+-    AC_MSG_RESULT([No, using TCP])
+-  else
+-    AC_MSG_RESULT([Yes])
+-  fi
+-
+-  AC_LANG_POP(C)
+-fi
+-
+ AC_ARG_WITH([dbformat],
+ 	    AS_HELP_STRING([--with-dbformat@<:@=DBFORMAT@:>@],
+ 			   [database format to use: either inode (default) or path]),
diff --git a/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch b/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch
deleted file mode 100644
index 71c2d214e68a..000000000000
--- a/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-it's normal that the acl_* symbols are not found if the application
-is not linked against -lacl. these errors harmless, but mighty
-annoying.
-
---- libfakeroot.c.orig	2014-03-07 11:20:26.120532847 +0200
-+++ libfakeroot.c	2014-03-07 11:21:26.486872482 +0200
-@@ -258,10 +258,12 @@
-  /* clear dlerror() just in case dlsym() legitimately returns NULL */
-     msg = dlerror();
-     *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
--    if ( (msg = dlerror()) != NULL){
-+#ifdef LIBFAKEROOT_DEBUGGING
-+    if ( fakeroot_debug && (msg = dlerror()) != NULL) {
-       fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
- /*    abort ();*/
-     }
-+#endif
-   }
- }
- 
diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template
index 053cbc1babf2..b1ea59cac187 100644
--- a/srcpkgs/fakeroot/template
+++ b/srcpkgs/fakeroot/template
@@ -1,30 +1,51 @@
 # Template file for 'fakeroot'
 pkgname=fakeroot
-version=1.24
+version=1.25.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake libtool"
 makedepends="acl-devel libcap-devel"
+#checkdepends="sharutils"
 short_desc="Gives a fake root environment"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-or-later"
 homepage="http://packages.debian.org/fakeroot"
 distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.gz"
-checksum=2e045b3160370b8ab4d44d1f8d267e5d1d555f1bb522d650e7167b09477266ed
+checksum=8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c
 
 lib32disabled=yes
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS="-D_STAT_VER=0" ;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	CFLAGS="-D_STAT_VER=0"
+fi
+
+post_patch() {
+	# always force absolute path for LD_PRELOAD
+	vsed -i scripts/fakeroot.in -e 's/@LDPRELOADABS@/1/'
+
+	# don't build translated manpages
+	vsed -i doc/Makefile.am -e '/SUBDIRS/d'
+
+	# disable failing tests
+	#
+	# depends on chown which dosn't work in chroot
+	vsed -i test/Makefile.am -e '/  t\.tar/d'
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		#mknod: Operation not permitted
+		vsed -i test/Makefile.am \
+			-e '/  t\.chmod_dev/d' \
+			-e '/  t\.mknod/d'
+		#ls doesn't report owner as root
+		vsed -i test/Makefile.am \
+			-e '/  t\.touchinstall/d'
+	fi
+}
 
 pre_configure() {
-	sed -i /SUBDIRS/d doc/Makefile.am
 	sh ./bootstrap
 }
 
-post_install() {
-	# Use /bin/sh shebang.
-	sed -i -e "s|^#!/bin/bash$|#!/bin/sh|" ${DESTDIR}/usr/bin/fakeroot
+pre_check() {
+	export VERBOSE=x
 }

From 01ad864d9aef7e135338f4c44dd61275b608bb77 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 28 Feb 2021 18:11:31 -0500
Subject: [PATCH 2399/3458] neomutt: update to 20210205.

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

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d2..eda14c53ef3e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20201120
+version=20210205
 revision=1
 wrksrc="neomutt-${version}"
 create_wrksrc=true
@@ -23,7 +23,7 @@ homepage="https://neomutt.org/"
 _test_files_hash=8629adab700a75c54e8e28bf05ad092503a98f75
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="48191d4f17cb1e5fd094ca92c581e1bb9599f058c122cc0e35df4e1c0cb53f47
+checksum="77e177780fc2d8abb475d9cac4342c7e61d53c243f6ce2f9bc86d819fc962cdb
  a53d6447cf4e8f60bd9a3caf68a1cfe1bfda878b5bcb8c60b965b5214de73ff9"
 python_version=3
 

From 98b7e2c762f393046df026a6d1a3b313388960cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 01:13:24 +0100
Subject: [PATCH 2400/3458] libsidplayfp: update to 2.1.1

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

diff --git a/srcpkgs/libsidplayfp/template b/srcpkgs/libsidplayfp/template
index 6d610d7bc2fe..2c4004c11d3c 100644
--- a/srcpkgs/libsidplayfp/template
+++ b/srcpkgs/libsidplayfp/template
@@ -1,6 +1,6 @@
 # Template file for 'libsidplayfp'
 pkgname=libsidplayfp
-version=2.1.0
+version=2.1.1
 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=03af34ab2114990ea299f61afa6cb123fb65e22ece1ee51c28ce6d9d671fe5b7
+checksum=3793b61eeaf95a4a43334548b3b29292e83c53664d937e50a8877c35098b9d39
 
 libsidplayfp-devel_package() {
 	short_desc+=" - development files"

From f88d5685da1e15673c111d9863e0b2369071d80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 01:33:30 +0100
Subject: [PATCH 2401/3458] spin2cpp: update to 5.2.0

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

diff --git a/srcpkgs/spin2cpp/template b/srcpkgs/spin2cpp/template
index 3771aca670f9..c73220201a7a 100644
--- a/srcpkgs/spin2cpp/template
+++ b/srcpkgs/spin2cpp/template
@@ -1,7 +1,7 @@
 # Template file for 'spin2cpp'
 pkgname=spin2cpp
-version=5.1.1
-revision=2
+version=5.2.0
+revision=1
 build_style=gnu-makefile
 hostmakedepends="bison"
 short_desc="Converting languages for the Parallax Inc. Propeller 1 and 2"
@@ -9,7 +9,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MIT"
 homepage="https://github.com/totalspectrum/spin2cpp/"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
-checksum=72cc53a17c528541170361d70344f08bdf6ac719c875b6bbd71e0ae398d1eea8
+checksum=aa5a356440e14543cfc367c436f782436900eec25ce9a13e9972bfe28706dfbe
 
 CFLAGS="-I. -I./build -DFLEXSPIN_BUILD -fcommon"
 

From 8645e4833b960314f4ae6ed6732f3de399b29ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 01:33:47 +0100
Subject: [PATCH 2402/3458] flexprop: update to 5.2.0

src/tcl_library was removed by upstream. Install doc/help.txt.
---
 srcpkgs/flexprop/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/flexprop/template b/srcpkgs/flexprop/template
index 248d38e100ad..3b8ce55d3c82 100644
--- a/srcpkgs/flexprop/template
+++ b/srcpkgs/flexprop/template
@@ -1,6 +1,6 @@
 # Template file for 'flexprop'
 pkgname=flexprop
-version=5.1.1
+version=5.2.0
 revision=1
 hostmakedepends="loadp2 which"
 makedepends="tk-devel"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MIT"
 homepage="https://github.com/totalspectrum/flexprop/"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
-checksum=65cf8b0cd04d439d3b694962579d2f44602cecfa7bd2dee24540be601cfa5f2a
+checksum=bc72b9cc0729869cc0c4d298606f9a8d0fe937f85e9d0ef3a352f4a577147680
 
 do_build() {
 	${CPP} -xc++ -I /usr/libexec/p2tools -DTCL_SRC < version.inp > src/version.tcl
@@ -18,12 +18,13 @@ do_build() {
 
 do_install() {
 	vinstall flexprop.tcl 755 usr/libexec/p2tools
+
 	# Install a copy of the examples
 	vcopy samples usr/libexec/p2tools
-	# Let's use the system provided tcl/tk instead
-	rm -rf src/tcl_library
+
 	# No need for flexprop.c which is a Windows source file
 	rm -f src/flexprop.c
+
 	# Install a copy of the tcl/tk source scripts
 	vcopy src usr/libexec/p2tools
 
@@ -42,5 +43,6 @@ export SOURCE=/usr/libexec/p2tools/src
 exec /usr/bin/wish /usr/libexec/p2tools/flexprop.tcl
 EOF
 	chmod 755 ${DESTDIR}/usr/bin/flexprop
+	vdoc doc/help.txt
 	vlicense License.txt LICENSE
 }

From 81ab58ddd2d877ebecbee8e4397293c84ecf4328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 10:31:26 +0100
Subject: [PATCH 2403/3458] rocksndiamonds: update to 4.2.3.1

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

diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 5d4cba4d7664..473813e47672 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
 # Template file for 'rocksndiamonds'
 pkgname=rocksndiamonds
-version=4.2.3.0
+version=4.2.3.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=d931216d1dc52d98565dc178881b8e29b992293c043223889d67cd3e6fcf718c
+checksum=58c1a63c147b7e6a2294d461cb65e6162e8493ec144a4d7b405544f48c432dca
 replaces="rocksndiamonds-data>=0"
 
 do_build() {

From c033875d076a37bce158153315db56209eaf3a79 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 1 Mar 2021 12:29:56 +0100
Subject: [PATCH 2404/3458] 0ad: update to 0.0.24.

---
 srcpkgs/0ad/patches/musl.patch                |  11 -
 srcpkgs/0ad/patches/ppc-musl.patch            |  17 +-
 srcpkgs/0ad/patches/ppc64-spidermonkey.patch  |  43 ----
 srcpkgs/0ad/patches/ppc64.patch               | 217 +++---------------
 .../0ad/patches/remove-macos-include.patch    |  11 +
 srcpkgs/0ad/patches/template-misuse.patch     |  43 ----
 srcpkgs/0ad/template                          |  17 +-
 7 files changed, 64 insertions(+), 295 deletions(-)
 delete mode 100644 srcpkgs/0ad/patches/ppc64-spidermonkey.patch
 create mode 100644 srcpkgs/0ad/patches/remove-macos-include.patch
 delete mode 100644 srcpkgs/0ad/patches/template-misuse.patch

diff --git a/srcpkgs/0ad/patches/musl.patch b/srcpkgs/0ad/patches/musl.patch
index 59a59f9d2ecd..768ebc01932d 100644
--- a/srcpkgs/0ad/patches/musl.patch
+++ b/srcpkgs/0ad/patches/musl.patch
@@ -1,14 +1,3 @@
---- libraries/source/nvtt/src/src/nvmath/nvmath.h.orig	2018-06-16 16:01:48.511540946 +0200
-+++ libraries/source/nvtt/src/src/nvmath/nvmath.h	2018-06-16 16:02:29.935000183 +0200
-@@ -130,7 +130,7 @@
- {
- #if NV_OS_WIN32
- 	return _isnan(f) != 0;
--#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD
-+#elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD || !defined(__GLIBC__)
- 	return isnan(f);
- #elif NV_OS_LINUX
- 	return isnanf(f);
 --- source/lib/sysdep/os/linux/ldbg.cpp.orig	2018-06-16 16:27:55.639277094 +0200
 +++ source/lib/sysdep/os/linux/ldbg.cpp	2018-06-16 16:28:17.342014019 +0200
 @@ -33,7 +33,7 @@
diff --git a/srcpkgs/0ad/patches/ppc-musl.patch b/srcpkgs/0ad/patches/ppc-musl.patch
index 388943badb16..a10b97af3aa0 100644
--- a/srcpkgs/0ad/patches/ppc-musl.patch
+++ b/srcpkgs/0ad/patches/ppc-musl.patch
@@ -1,15 +1,14 @@
-On musl this is necessary to get full definition of pt_regs.
-
---- libraries/source/nvtt/src/src/nvcore/Debug.cpp
-+++ libraries/source/nvtt/src/src/nvcore/Debug.cpp
-@@ -27,6 +27,10 @@
- #	include <signal.h>
+--- libraries/source/nvtt/src/src/nvcore/Debug.cpp	2021-02-27 11:38:49.764811556 +0100
++++ libraries/source/nvtt/src/src/nvcore/Debug.cpp	2021-02-27 11:39:48.919032920 +0100
+@@ -40,6 +40,11 @@
+ #   include <signal.h>
  #endif
  
 +#if NV_OS_LINUX
-+#	include <asm/ptrace.h> // struct pt_regs
++#      include <asm/ptrace.h> // struct pt_regs
 +#endif
 +
- #if NV_OS_LINUX || NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD
- #	include <unistd.h>	// getpid
++
+ #if NV_OS_UNIX
+ #   include <unistd.h> // getpid
  #endif
diff --git a/srcpkgs/0ad/patches/ppc64-spidermonkey.patch b/srcpkgs/0ad/patches/ppc64-spidermonkey.patch
deleted file mode 100644
index 948d1c66033c..000000000000
--- a/srcpkgs/0ad/patches/ppc64-spidermonkey.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- libraries/source/spidermonkey/patch.sh
-+++ libraries/source/spidermonkey/patch.sh
-@@ -53,3 +53,4 @@ patch -p1  < ../FixTracelogger.diff
- # Based on: https://svnweb.freebsd.org/ports/head/sysutils/py-psutil121/files/patch-_psutil_bsd.c?revision=436575&view=markup
- # Related: https://bugzilla.mozilla.org/show_bug.cgi?id=1238983
- patch -p0 < ../FixpsutilFreeBSD.diff
-+patch -p0 < ../ppc64.diff
---- /dev/null
-+++ libraries/source/spidermonkey/ppc64.diff
-@@ -0,0 +1,33 @@
-+--- js/src/jit/CodeGenerator.cpp
-++++ js/src/jit/CodeGenerator.cpp
-+@@ -3464,12 +3464,12 @@ CodeGenerator::visitCallDirectEvalV(LCallDirectEvalV* lir)
-+     callVM(DirectEvalValueInfo, lir);
-+ }
-+ 
-+-// Registers safe for use before generatePrologue().
-+-static const uint32_t EntryTempMask = Registers::TempMask & ~(1 << OsrFrameReg.code());
-+-
-+ void
-+ CodeGenerator::generateArgumentsChecks(bool bailout)
-+ {
-++    // Registers safe for use before generatePrologue().
-++    static const uint32_t EntryTempMask = Registers::TempMask & ~(1 << OsrFrameReg.code());
-++
-+     // This function can be used the normal way to check the argument types,
-+     // before entering the function and bailout when arguments don't match.
-+     // For debug purpose, this is can also be used to force/check that the
-+--- js/src/jit/none/MacroAssembler-none.h
-++++ js/src/jit/none/MacroAssembler-none.h
-+@@ -131,6 +131,12 @@ class Assembler : public AssemblerShared
-+     static void ToggleCall(CodeLocationLabel, bool) { MOZ_CRASH(); }
-+ 
-+     static uintptr_t GetPointer(uint8_t*) { MOZ_CRASH(); }
-++
-++    void verifyHeapAccessDisassembly(uint32_t begin, uint32_t end,
-++                                     const Disassembler::HeapAccess &heapAccess)
-++    {
-++        MOZ_CRASH();
-++    }
-+ };
-+ 
-+ class Operand
diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index e409c0ed9177..87bc3a4800d7 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,182 +1,3 @@
---- build/premake/premake4.lua
-+++ build/premake/premake4.lua
-@@ -88,6 +88,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		else
- 			print("WARNING: Cannot determine architecture from GCC, assuming x86")
- 		end
-@@ -823,6 +825,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/x86_x64");
- 	elseif arch == "arm" then
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
- 	end
---- build/premake/premake5.lua
-+++ build/premake/premake5.lua
-@@ -81,6 +81,8 @@ else
- 			arch = "arm"
- 		elseif string.find(machine, "aarch64") == 1 then
- 			arch = "aarch64"
-+		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
-+			arch = "ppc64"
- 		else
- 			print("WARNING: Cannot determine architecture from GCC, assuming x86")
- 		end
-@@ -823,6 +825,8 @@ function setup_all_libs ()
- 		table.insert(source_dirs, "lib/sysdep/arch/x86_x64");
- 	elseif arch == "arm" then
- 		table.insert(source_dirs, "lib/sysdep/arch/arm");
-+	elseif arch == "ppc64" then
-+		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
- 	elseif arch == "aarch64" then
- 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
- 	end
---- libraries/source/nvtt/src/src/nvcore/poshlib/posh.h
-+++ libraries/source/nvtt/src/src/nvcore/poshlib/posh.h
-@@ -663,7 +663,7 @@ Metrowerks:
- ** the MIPS series, so we have to be careful about those.
- ** ----------------------------------------------------------------------------
- */
--#if defined POSH_CPU_X86 || defined POSH_CPU_AXP || defined POSH_CPU_STRONGARM || defined POSH_CPU_AARCH64 || defined POSH_OS_WIN32 || defined POSH_OS_WINCE || defined __MIPSEL__
-+#if defined POSH_CPU_X86 || defined POSH_CPU_AXP || defined POSH_CPU_STRONGARM || defined POSH_CPU_AARCH64 || defined POSH_OS_WIN32 || defined POSH_OS_WINCE || defined __MIPSEL__ || __LITTLE_ENDIAN__
- #  define POSH_ENDIAN_STRING "little"
- #  define POSH_LITTLE_ENDIAN 1
- #else
---- libraries/source/nvtt/src/src/nvmath/Plane.h
-+++ libraries/source/nvtt/src/src/nvmath/Plane.h
-@@ -6,6 +6,10 @@
- #include <nvmath/nvmath.h>
- #include <nvmath/Vector.h>
- 
-+#if NV_USE_ALTIVEC
-+#undef vector
-+#endif
-+
- namespace nv
- {
- 	class Matrix;
---- libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-+++ libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
-@@ -1,6 +1,7 @@
- /* -----------------------------------------------------------------------------
- 
- 	Copyright (c) 2006 Simon Brown                          si@sjbrown.co.uk
-+	Copyright (c) 2016 Raptor Engineering, LLC
- 
- 	Permission is hereby granted, free of charge, to any person obtaining
- 	a copy of this software and associated documentation files (the 
-@@ -31,7 +32,7 @@
- 
- namespace squish {
- 
--#define VEC4_CONST( X ) Vec4( ( vector float )( X ) )
-+#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
- 
- class Vec4
- {
-@@ -96,7 +97,7 @@ public:
- 	
- 	Vec4& operator*=( Arg v )
- 	{
--		m_v = vec_madd( m_v, v.m_v, ( vector float )( -0.0f ) );
-+		m_v = vec_madd( m_v, v.m_v, vec_splats( -0.0f ) );
- 		return *this;
- 	}
- 	
-@@ -112,7 +113,7 @@ public:
- 	
- 	friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right  )
- 	{
--		return Vec4( vec_madd( left.m_v, right.m_v, ( vector float )( -0.0f ) ) );
-+		return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
- 	}
- 	
- 	//! Returns a*b + c
-@@ -133,7 +134,7 @@ public:
- 		vector float estimate = vec_re( v.m_v );
- 		
- 		// one round of Newton-Rhaphson refinement
--		vector float diff = vec_nmsub( estimate, v.m_v, ( vector float )( 1.0f ) );
-+		vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
- 		return Vec4( vec_madd( diff, estimate, estimate ) );
- 	}
- 	
---- source/graphics/TextureConverter.cpp
-+++ source/graphics/TextureConverter.cpp
-@@ -45,6 +45,10 @@ struct BufferOutputHandler : public nvtt::OutputHandler
- 	{
- 	}
- 
-+	virtual void endImage()
-+	{
-+	}
-+
- 	virtual bool writeData(const void* data, int size)
- 	{
- 		size_t off = buffer.size();
---- source/lib/alignment.h
-+++ source/lib/alignment.h
-@@ -80,7 +80,18 @@ static const size_t cacheLineSize = 64;	// (L2)
- // MMU pages
- //
- 
-+#ifdef __PPC64__
-+// NOTE: ppc64 can operate in either 4k or 64k page size mode
-+// If the define page size is larger than the active page size,
-+// the allocator functions normally.  If the defined page size
-+// is less than the active page size, the allocator fails tests.
-+//
-+// Define the page size to the maximum known architectural page
-+// size on ppc64 systems.
-+static const size_t g_PageSize = 64 * 1024;	// 64 KB
-+#else
- static const size_t g_PageSize = 4 * 1024;	// 4 KB
-+#endif
- static const size_t g_LargePageSize = 2 * 1024 * 1024;	// 2 MB
- 
- 
---- source/lib/byte_order.h
-+++ source/lib/byte_order.h
-@@ -33,7 +33,7 @@
- #ifndef BYTE_ORDER
- # define LITTLE_ENDIAN 0x4321
- # define BIG_ENDIAN    0x1234
--# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || defined(__LITTLE_ENDIAN__)
-+# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_PPC64 || ARCH_MIPS || defined(__LITTLE_ENDIAN__)
- #  define BYTE_ORDER LITTLE_ENDIAN
- # else
- #  define BYTE_ORDER BIG_ENDIAN
---- source/lib/sysdep/arch.h
-+++ source/lib/sysdep/arch.h
-@@ -64,6 +64,12 @@
- #else
- # define ARCH_AARCH64 0
- #endif
-+// .. PowerPC64 (PPC64)
-+#if defined(__PPC64__)
-+# define ARCH_PPC64 1
-+#else
-+# define ARCH_PPC64 0
-+#endif
- // .. MIPS
- #if defined(__MIPS__) || defined(__mips__) || defined(__mips)
- # define ARCH_MIPS 1
-@@ -72,7 +78,7 @@
- #endif
- 
- // ensure exactly one architecture has been detected
--#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS) != 1
-+#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_PPC64+ARCH_MIPS) != 1
- # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
- #endif
- 
 --- /dev/null
 +++ source/lib/sysdep/arch/ppc64/ppc64.cpp
 @@ -0,0 +1,50 @@
@@ -230,13 +51,43 @@
 +{
 +	return "IBM POWER"; // TODO
 +}
---- source/ps/GameSetup/HWDetect.cpp
-+++ source/ps/GameSetup/HWDetect.cpp
-@@ -247,6 +247,7 @@ void RunHardwareDetection()
- 	scriptInterface.SetProperty(settings, "arch_amd64", ARCH_AMD64);
+--- source/lib/byte_order.h.orig	2021-02-28 16:59:34.041933978 +0100
++++ source/lib/byte_order.h	2021-02-28 16:59:59.311582587 +0100
+@@ -33,7 +33,7 @@
+ #ifndef BYTE_ORDER
+ # define LITTLE_ENDIAN 0x4321
+ # define BIG_ENDIAN    0x1234
+-# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || defined(__LITTLE_ENDIAN__)
++# if ARCH_IA32 || ARCH_IA64 || ARCH_AMD64 || ARCH_ALPHA || ARCH_ARM || ARCH_AARCH64 || ARCH_MIPS || ARCH_E2K || ARCH_PPC64 || defined(__LITTLE_ENDIAN__)
+ #  define BYTE_ORDER LITTLE_ENDIAN
+ # else
+ #  define BYTE_ORDER BIG_ENDIAN
+--- source/ps/GameSetup/HWDetect.cpp.orig	2021-02-28 18:09:30.331118437 +0100
++++ source/ps/GameSetup/HWDetect.cpp	2021-02-28 18:09:52.209822367 +0100
+@@ -124,6 +124,7 @@
  	scriptInterface.SetProperty(settings, "arch_arm", ARCH_ARM);
  	scriptInterface.SetProperty(settings, "arch_aarch64", ARCH_AARCH64);
+ 	scriptInterface.SetProperty(settings, "arch_e2k", ARCH_E2K);
 +	scriptInterface.SetProperty(settings, "arch_ppc64", ARCH_PPC64);
  
  #ifdef NDEBUG
  	scriptInterface.SetProperty(settings, "build_debug", 0);
+--- source/lib/sysdep/arch.h.orig	2021-02-28 18:45:28.761727174 +0100
++++ source/lib/sysdep/arch.h	2021-02-28 18:46:03.270251202 +0100
+@@ -76,9 +76,15 @@
+ #else
+ # define ARCH_E2K 0
+ #endif
++// .. PowerPC64 (PPC64)
++#if defined(__PPC64__)
++# define ARCH_PPC64 1
++#else
++# define ARCH_PPC64 0
++#endif
+ 
+ // ensure exactly one architecture has been detected
+-#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K) != 1
++#if (ARCH_IA32+ARCH_IA64+ARCH_AMD64+ARCH_ALPHA+ARCH_ARM+ARCH_AARCH64+ARCH_MIPS+ARCH_E2K+ARCH_PPC64) != 1
+ # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
+ #endif
+ 
diff --git a/srcpkgs/0ad/patches/remove-macos-include.patch b/srcpkgs/0ad/patches/remove-macos-include.patch
new file mode 100644
index 000000000000..9e6cc6189c8d
--- /dev/null
+++ b/srcpkgs/0ad/patches/remove-macos-include.patch
@@ -0,0 +1,11 @@
+--- source/ps/tests/stub_impl_hack.cpp.orig	2021-03-01 11:33:10.873986567 +0100
++++ source/ps/tests/stub_impl_hack.cpp	2021-03-01 11:35:37.991089218 +0100
+@@ -13,7 +13,7 @@
+ #include <cxxtest/TestMain.h>
+ 
+ bool suite_TestDummy_init = false;
+-#include "/Users/wfg/Jenkins/workspace/macOS-all-bundles/source/ps/tests/stub_impl_hack.h"
++#include "stub_impl_hack.h"
+ 
+ static TestDummy suite_TestDummy;
+ 
diff --git a/srcpkgs/0ad/patches/template-misuse.patch b/srcpkgs/0ad/patches/template-misuse.patch
deleted file mode 100644
index 7ae376ff1fed..000000000000
--- a/srcpkgs/0ad/patches/template-misuse.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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_
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 88314906c9aa..b161be5615ee 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,20 +1,20 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.23b
-revision=5
+version=0.0.24
+revision=1
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
-wrksrc="${pkgname}-${version}-alpha"
-hostmakedepends="pkg-config perl cmake python tar"
+create_wrksrc=yes
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar"
 makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
  libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel"
 depends="${pkgname}-data"
 short_desc="Historically-based real-time strategy game"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=01bff7641ee08cac896c54d518d7e4b01752513105558f212e3199d747512a37
+checksum=00aee2d2f11e48b169be41ddad8090e49f8173c09242fc2fa4a0d44e4763cc53
 nocross="uses bundled third-party libraries that do not cross-compile"
 
 CXXFLAGS="-fpermissive"
@@ -22,8 +22,13 @@ CXXFLAGS="-fpermissive"
 LDFLAGS="-fuse-ld=bfd"
 export WX_CONFIG="wx-config-gtk3"
 
+do_extract() {
+	bsdtar xJf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}-alpha-unix-build.tar.xz -C ${wrksrc}
+}
+
 do_configure() {
 	cd ${wrksrc}/build/workspaces
+	./clean-workspaces.sh
 	./update-workspaces.sh --bindir=/usr/bin --libdir=/usr/lib/0ad \
 	--datadir=/usr/share/${pkgname}/data
 }

From ce6c17ecb0fea7986d7e66afe2f6566e37fe6836 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 1 Mar 2021 12:30:07 +0100
Subject: [PATCH 2405/3458] 0ad-data: update to 0.0.24.

---
 srcpkgs/0ad-data/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 24a87a74efe9..0a4c8ab01081 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,14 +1,14 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.23b
-revision=2
-wrksrc="0ad-${version}-alpha"
+version=0.0.24
+revision=1
+create_wrksrc=yes
 short_desc="Historically-based real-time strategy game (data files)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=e11b4ade7ede954cbbdc1fe6e2e4b25ac6b8d5a644133b640ffc9b099338a713
+checksum=929a55a6aa63c143b7fd20553375878a2e732353dbbcc757fa876b4181fdd75a
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -16,6 +16,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) broken="no base game available";;
 esac
 
+do_extract() {
+	bsdtar xJf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/0ad-${version}-alpha-unix-data.tar.xz -C ${wrksrc}
+}
+
 do_install() {
 	vmkdir usr/share/0ad/data
 	vmkdir usr/share/0ad/data/tools

From e8213f2ea8eb6a2b727eaebbc5ac0c88cf9f70a8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 1 Mar 2021 12:53:08 +0100
Subject: [PATCH 2406/3458] 0ad: add clang to hostmakedepends

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

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index b161be5615ee..e695ddff7976 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -4,7 +4,7 @@ version=0.0.24
 revision=1
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 create_wrksrc=yes
-hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar"
+hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
 makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
  libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
  nspr-devel wxWidgets-gtk3-devel fmt-devel"

From 0248d7f9dc5bc1e1ceeeaced59d6d5397123d0e1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 1 Mar 2021 13:45:38 +0100
Subject: [PATCH 2407/3458] 0ad: add libexecinfo for musl

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

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index e695ddff7976..5cc4514ba041 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -22,6 +22,11 @@ CXXFLAGS="-fpermissive"
 LDFLAGS="-fuse-ld=bfd"
 export WX_CONFIG="wx-config-gtk3"
 
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+fi
+
+
 do_extract() {
 	bsdtar xJf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}-alpha-unix-build.tar.xz -C ${wrksrc}
 }

From 7fd7d4b5915ec284387ac043e5743184c74ace2e Mon Sep 17 00:00:00 2001
From: TC <git@titouan.co>
Date: Mon, 1 Mar 2021 13:13:02 +0100
Subject: [PATCH 2408/3458] bat: update to 0.18.0.

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

diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 02c00989a3e8..351f359cd1a6 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,6 +1,6 @@
 # Template file for 'bat'
 pkgname=bat
-version=0.17.1
+version=0.18.0
 revision=1
 build_style=cargo
 hostmakedepends="cmake llvm clang"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/bat"
 distfiles="https://github.com/sharkdp/bat/archive/v${version}.tar.gz"
-checksum=16d39414e8a3b80d890cfdbca6c0e6ff280058397f4a3066c37e0998985d87c4
+checksum=49d1b95250050df47753c213b5e48953a029c9e74753cef371051b14c9d629b8
 
 pre_build() {
 	export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"

From 91e77e4b01e263e88251aa9a560446d53fcef2be Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 1 Mar 2021 14:02:06 +0100
Subject: [PATCH 2409/3458] libvirt: update to 7.1.0.

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

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 1b4f98fce20e..60d9f26804e5 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.0.0
+version=7.1.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=ca3833844d08c22867f1d1a46edc36bda7d6fe1a4f267e7d77100b79fc9ddd89
+checksum=870f180d80256411c5afc39bc5aac4f8acca04a4e0725c576ad24053dc64a06c
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"

From 560ac177a63aee4a0061c7f5f0fc4bccee095550 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 1 Mar 2021 14:03:30 +0100
Subject: [PATCH 2410/3458] 0ad: broken on musl for now

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

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 5cc4514ba041..19609b7dda82 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -24,6 +24,7 @@ export WX_CONFIG="wx-config-gtk3"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
+	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/34866/steps/shell_3/logs/stdio"
 fi
 
 

From 045c7385872ad21a82aaf6fa8cf9f7e66fe8af0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 07:45:14 -0500
Subject: [PATCH 2411/3458] pekwm: update to 0.1.18.

---
 srcpkgs/pekwm/patches/sysconfdir.patch | 29 +++++++++++++++++++
 srcpkgs/pekwm/template                 | 40 +++++++-------------------
 srcpkgs/pekwm/update                   |  1 +
 3 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 srcpkgs/pekwm/patches/sysconfdir.patch
 create mode 100644 srcpkgs/pekwm/update

diff --git a/srcpkgs/pekwm/patches/sysconfdir.patch b/srcpkgs/pekwm/patches/sysconfdir.patch
new file mode 100644
index 000000000000..91a6da3d8e50
--- /dev/null
+++ b/srcpkgs/pekwm/patches/sysconfdir.patch
@@ -0,0 +1,29 @@
+--- CMakeLists.txt	2021-03-01 07:37:20.447294425 -0500
++++ CMakeLists.txt	2021-03-01 07:39:40.222030571 -0500
+@@ -10,6 +10,9 @@
+ set(pekwm_VERSION_PATCH 18)
+ set(pekwm_VERSION "${pekwm_VERSION_MAJOR}.${pekwm_VERSION_MINOR}.${pekwm_VERSION_PATCH}")
+ 
++set(PEKWM_CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/pekwm"
++  CACHE STRING "Path to pekwm system configuration files")
++
+ # Check for C++11
+ check_cxx_compiler_flag(-std=c++11 HAS_CXX11)
+ if (HAS_CXX11)
+@@ -94,7 +97,7 @@
+ add_definitions(-DVERSION="${pekwm_VERSION}"
+   -DFEATURES="${pekwm_FEATURES}"
+   -DDATADIR="${CMAKE_INSTALL_PREFIX}/share"
+-  -DSYSCONFDIR="${CMAKE_INSTALL_PREFIX}/etc/pekwm")
++  -DSYSCONFDIR="${PEKWM_CONF_DIR}")
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
+ 
+ # Subdirectories
+--- data/CMakeLists.txt.orig	2021-03-01 07:39:48.323015276 -0500
++++ data/CMakeLists.txt	2021-03-01 07:40:19.475956467 -0500
+@@ -16,4 +16,4 @@
+   mouse_sloppy
+   start
+   vars
+-  DESTINATION etc/pekwm/)
++  DESTINATION "${PEKWM_CONF_DIR}")
diff --git a/srcpkgs/pekwm/template b/srcpkgs/pekwm/template
index 19fdb952d033..367691f8cb7d 100644
--- a/srcpkgs/pekwm/template
+++ b/srcpkgs/pekwm/template
@@ -1,35 +1,17 @@
 # Template file for 'pekwm'
 pkgname=pekwm
-version=0.1.17
-revision=4
-build_style=gnu-configure
-configure_args="--with-pkg-exec-prefix=/usr
- ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
- ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
- ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
- ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes"
+version=0.1.18
+revision=1
+wrksrc="${pkgname}-release-${version}"
+build_style=cmake
+configure_args="-DPEKWM_CONF_DIR=/etc/pekwm"
 hostmakedepends="pkg-config"
-makedepends="libjpeg-turbo-devel libpng-devel libXinerama-devel
- libSM-devel libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel"
+makedepends="libjpeg-turbo-devel libpng-devel libXpm-devel
+ libXft-devel fontconfig-devel libXinerama-devel libXrandr-devel"
 short_desc="Window manager based on aewm++"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://www.pekwm.org/projects/pekwm"
-distfiles="${DEBIAN_SITE}/main/p/pekwm/pekwm_${version}.orig.tar.bz2"
-checksum=8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00
-
-conf_files="
-	/etc/pekwm/vars
-	/etc/pekwm/mouse
-	/etc/pekwm/menu
-	/etc/pekwm/start
-	/etc/pekwm/keys
-	/etc/pekwm/autoproperties_typerules
-	/etc/pekwm/config
-	/etc/pekwm/autoproperties
-	/etc/pekwm/mouse_system
-	/etc/pekwm/mouse_sloppy
-	/etc/pekwm/mouse_click
-	/etc/pekwm/config_system"
-
-CXXFLAGS="-Wno-narrowing"
+homepage="https://www.pekwm.se/"
+distfiles="https://github.com/pekdon/pekwm/archive/release-${version}.tar.gz"
+checksum=e04e14ab7b212ec7c3a36e4c24b6228383df4ca3768f9fea7ba22dcd107d5d5a
+conf_files="/etc/pekwm/*"
diff --git a/srcpkgs/pekwm/update b/srcpkgs/pekwm/update
new file mode 100644
index 000000000000..75b937ad4877
--- /dev/null
+++ b/srcpkgs/pekwm/update
@@ -0,0 +1 @@
+pattern="release-\K[0-9.]+(?=.tar.gz)"

From f726058895d8a5e45c994e1a4a457673f3cc0d19 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 1 Mar 2021 14:39:41 +0100
Subject: [PATCH 2412/3458] logswan: update to 2.1.10.

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

diff --git a/srcpkgs/logswan/template b/srcpkgs/logswan/template
index e0fd8c8c8deb..e232b5b8fef9 100644
--- a/srcpkgs/logswan/template
+++ b/srcpkgs/logswan/template
@@ -1,6 +1,6 @@
 # Template file for 'logswan'
 pkgname=logswan
-version=2.1.8
+version=2.1.10
 revision=1
 build_style=cmake
 makedepends="jansson-devel libmaxminddb-devel"
@@ -10,7 +10,7 @@ license="BSD-2-clause"
 homepage="https://www.logswan.org/"
 changelog="https://github.com/fcambus/logswan/raw/master/ChangeLog"
 distfiles="https://github.com/fcambus/logswan/archive/${version}.tar.gz"
-checksum=b3201d3f8a9863d51a0c3caec9e89c74dab8de7a604a5761454df64c30908ef8
+checksum=561027c1aa5ddc87dac43df9fa74b2009ba6b75c5512f83e2c48105e4624e3cc
 
 post_install() {
 	vlicense LICENSE

From 792ed40d3c2f4a052ddd444d4ada254c2a3eadc0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 1 Mar 2021 14:41:15 +0100
Subject: [PATCH 2413/3458] openradtool: update to 0.11.13.

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

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index fc46c5bfc6fe..625ccd3d9069 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.11.12
+version=0.11.13
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=6ce797dd238374de7444f7aabbfc8b31259477c8bfe0616c48baf6e96f5ca663
+checksum=d0b0e670e063e8b39161d0e25e528cd1f9a87067c88a67bc4833d133bc91143c
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From fbdd74bbc88db45ae6aea7130e7e035c7a5dfe87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 14:06:17 +0100
Subject: [PATCH 2414/3458] pcb: update to 4.3.0

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

diff --git a/srcpkgs/pcb/template b/srcpkgs/pcb/template
index 56b6d6e3a94f..d9dbb9a8fe75 100644
--- a/srcpkgs/pcb/template
+++ b/srcpkgs/pcb/template
@@ -1,8 +1,8 @@
 # Template file for 'pcb'
 pkgname=pcb
 reverts=20140316_4
-version=4.2.2
-revision=2
+version=4.3.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-update-desktop-database --disable-update-mime-database"
 hostmakedepends="flex geda gerbv intltool netpbm pkg-config
@@ -15,5 +15,5 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://pcb.geda-project.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1ceeaf1bdbe0508b9b140ca421eb600836579114c04dee939341c5d594f36e5d
+checksum=ae852f46af84aba7f51d813fb916fc7fcdbeea43f7134f150507024e1743fb5e
 replaces="pcb-data>=0"

From 78024d03188e6f24dd6ebee367d1ab33300c60c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Mar 2021 10:40:53 +0100
Subject: [PATCH 2415/3458] librepcb: cleanup makedepends

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

diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785b..68f1ba250f86 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="-r librepcb.pro"
 hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel qt5-svg-devel zlib-devel"
 short_desc="Powerful, innovative and intuitive EDA tool for everyone"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From d70f1f0ba35916c9623952a78f4b562672cfe332 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Mar 2021 15:18:51 +0100
Subject: [PATCH 2416/3458] bat: use the first found file for completions

somehow it is possible to end up with 2 bat-$hash dir that contain the completions
---
 srcpkgs/bat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 351f359cd1a6..05680e52a9dd 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -22,11 +22,11 @@ post_install() {
 	vlicense LICENSE-MIT
 	vdoc README.md
 	# The manual page is hidden somewhere deep in the build tree
-	manpage=$(find ${wrksrc}/target -name bat.1)
+	manpage=$(find ${wrksrc}/target -name bat.1 | head -n1)
 	vman ${manpage}
 	# Completions are also hidden somewhere deep in the build tree
-	fish_completion=$(find ${wrksrc}/target -name bat.fish)
+	fish_completion=$(find ${wrksrc}/target -name bat.fish | head -n1)
 	vcompletion ${fish_completion} fish
-	zsh_completion=$(find ${wrksrc}/target -name bat.zsh)
+	zsh_completion=$(find ${wrksrc}/target -name bat.zsh | head -n1)
 	vcompletion ${zsh_completion} zsh
 }

From abe3355eddbf6975dbea581eed47d966699d18be 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, 23 Feb 2021 21:36:05 +0700
Subject: [PATCH 2417/3458] guake: hostmakedepends+=python3-pbr

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

diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template
index 8f0fbe4d2be0..9fbc1895da95 100644
--- a/srcpkgs/guake/template
+++ b/srcpkgs/guake/template
@@ -3,7 +3,7 @@ pkgname=guake
 version=3.7.0
 revision=1
 build_style=python3-module
-hostmakedepends="gettext python3-setuptools"
+hostmakedepends="gettext python3-setuptools python3-pbr"
 makedepends="python3-devel python3-pbr"
 depends="desktop-file-utils libkeybinder3 libnotify python3-dbus python3-gobject
  python3-pbr vte3 libwnck python3-setuptools"

From 0f6caa5f3b5610681658c1dc1734d07ccbc6f0af 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, 23 Feb 2021 20:53:43 +0700
Subject: [PATCH 2418/3458] artyfx: respect our flags, fix build for arm

---
 .../artyfx/patches/fix-avtk-cmake-sse.patch   |  4 +--
 .../artyfx/patches/respect-our-cflags.patch   | 27 +++++++++++++++++++
 srcpkgs/artyfx/template                       | 16 ++++++++++-
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/artyfx/patches/respect-our-cflags.patch

diff --git a/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch b/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
index 76a340290b34..1a832155a566 100644
--- a/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
+++ b/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
@@ -6,8 +6,8 @@
  
 -SET(CMAKE_C_FLAGS   "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
 -SET(CMAKE_CXX_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address
-+SET(CMAKE_C_FLAGS   "-fPIC -g") # -fsanitize=address
-+SET(CMAKE_CXX_FLAGS "-fPIC -g") # -fsanitize=address
++SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC -g") # -fsanitize=address
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g") # -fsanitize=address
 +
 +IF(BUILD_SSE)
 +	SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -msse -msse2 -mfpmath=sse")
diff --git a/srcpkgs/artyfx/patches/respect-our-cflags.patch b/srcpkgs/artyfx/patches/respect-our-cflags.patch
new file mode 100644
index 000000000000..ee9155c7729e
--- /dev/null
+++ b/srcpkgs/artyfx/patches/respect-our-cflags.patch
@@ -0,0 +1,27 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -24,17 +24,17 @@ pkg_check_modules(SND sndfile REQUIRED)
+ include_directories( ${SND_INCLUDE_DIRS}  )
+ #target_link_libraries( avtkDemo ${CAIRO_LIBRARIES}  )
+ 
+-SET(CMAKE_SHARED_LINKER_FLAGS "-fPIC -shared -L./src/avtk -Wl,--no-undefined")
+-SET(CMAKE_C_FLAGS "-g -Wall -O1 -Wno-unused-variable")
+-SET(CMAKE_CXX_FLAGS "-g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
++SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -shared -L./src/avtk -Wl,--no-undefined")
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O1 -Wno-unused-variable")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -O1 -Wno-unused-variable -ftree-vectorize")
+ 
+ 
+ # DSP sources
+ FILE(GLOB sources src/dsp/*.cxx src/dsp/rr/*.cxx  src/dsp/eq/*.cc )
+ 
+ IF(BUILD_SSE)
+-  SET(CMAKE_C_FLAGS "-msse2 -mfpmath=sse")
+-  SET(CMAKE_CXX_FLAGS "-msse2 -mfpmath=sse")
++	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
++	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse")
+ ENDIF()
+ 
+ IF(BUILD_GUI)
diff --git a/srcpkgs/artyfx/template b/srcpkgs/artyfx/template
index 49248c67ce69..f06781b63736 100644
--- a/srcpkgs/artyfx/template
+++ b/srcpkgs/artyfx/template
@@ -1,7 +1,7 @@
 # Template file for 'artyfx'
 pkgname=artyfx
 version=1.3
-revision=1
+revision=2
 wrksrc=openAV-ArtyFX-release-$version
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -13,6 +13,20 @@ homepage="http://openavproductions.com/artyfx/"
 distfiles="https://github.com/openAVproductions/openAV-ArtyFX/archive/release-$version.tar.gz"
 checksum=a2a8d02b47bea44d0053cd4f8c6411f68a6fe9b9e4348a4139cd9bfd70105c00
 
+case "$XBPS_TARGET_MACHINE" in
+	armv7*)
+		build_options="neon"
+		build_options_default="neon"
+		if [ "$build_option_neon" ]; then
+			CXXFLAGS="-mfpu=neon"
+		else
+			CXXFLAGS="-DPFFFT_SIMD_DISABLE=1"
+		fi
+		;;
+	armv*)
+		CXXFLAGS="-DPFFFT_SIMD_DISABLE=1" ;;
+esac
+
 case $XBPS_TARGET_MACHINE in
 	x86_64*|i686*);;
 	*) configure_args+=" -DBUILD_SSE=OFF";;

From 4593aac662f861b93d29b0a13503c7ae6d539611 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 1 Mar 2021 16:34:09 +0100
Subject: [PATCH 2419/3458] libvirt-python3: update to 7.1.0.

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

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index e75afe427d7f..7988fa1482fc 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.0.0
+version=7.1.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=7e1663da2587e87106fc226160b33ae2160989c32176ad17d876315d5c1c36b5
+checksum=faafd31e407f9cb750a73349c007651ca8954ebd455e55b0a20e96de81c50037

From 9127e9d138ff0c5cd44dc6bc8648aad0fd6c2a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 15:27:02 +0100
Subject: [PATCH 2420/3458] libixion: update to 0.16.1

---
 common/shlibs                            |  2 +-
 srcpkgs/libixion/patches/nullptr_t.patch | 20 ++++++++++----------
 srcpkgs/libixion/template                |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 858957c29f75..ffe94ecf481a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2546,7 +2546,7 @@ libCbc.so.3 CoinMP-1.8.3_1
 libOsiCommonTests.so.1 CoinMP-1.8.3_1
 libCbcSolver.so.3 CoinMP-1.8.3_1
 libmwaw-0.3.so.3 libmwaw-0.3.7_1
-libixion-0.15.so.0 libixion-0.15.0_2
+libixion-0.16.so.0 libixion-0.16.1_1
 liborcus-parser-0.15.so.0 liborcus-0.15.3_1
 liborcus-mso-0.15.so.0 liborcus-0.15.3_1
 liborcus-0.15.so.0 liborcus-0.15.3_1
diff --git a/srcpkgs/libixion/patches/nullptr_t.patch b/srcpkgs/libixion/patches/nullptr_t.patch
index 585a6c2b6526..e030577768ab 100644
--- a/srcpkgs/libixion/patches/nullptr_t.patch
+++ b/srcpkgs/libixion/patches/nullptr_t.patch
@@ -1,11 +1,11 @@
---- include/ixion/model_context.hpp	2019-03-09 05:05:04.000000000 +0100
-+++ include/ixion/model_context.hpp	2020-01-29 21:50:49.831725062 +0100
-@@ -61,7 +61,7 @@
-         } value;
+--- src/libixion/model_context.cpp	2020-08-28 23:23:48.000000000 +0200
++++ src/libixion/model_context.cpp	2021-03-01 16:14:44.955570528 +0100
+@@ -17,7 +17,7 @@
  
-         /** Initializes the cell to be empty. */
--        input_cell(nullptr_t);
-+        input_cell(std::nullptr_t);
-         /** Boolean cell value. */
-         input_cell(bool b);
-         /** The char array must be null-terminated. */
+ namespace ixion {
+ 
+-model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {}
++model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {}
+ model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean)
+ {
+     value.boolean = b;
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 63604118bbf7..2d709b3f88b6 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
 # Template file for 'libixion'
 pkgname=libixion
-version=0.15.0
-revision=3
+version=0.16.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0"
 homepage="https://gitlab.com/ixion/ixion/"
 distfiles="http://kohei.us/files/ixion/src/${pkgname}-${version}.tar.xz"
-checksum=b1f60af61be875e3bfa7ad18203a6c8ccdeb9922a531e196029fc42fbfa0b9e6
+checksum=426c643b3c346d546027c0226619abb2e59848e94470b9b5aa6365e26125089f
 replaces="libixion11>=0"
 
 libixion-devel_package() {

From c10194afc9cc8350660449ed050389216ac0af97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 15:29:26 +0100
Subject: [PATCH 2421/3458] liborcus: update to 0.16.1

---
 common/shlibs             | 8 ++++----
 srcpkgs/liborcus/template | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ffe94ecf481a..b294faeb9062 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2547,10 +2547,10 @@ libOsiCommonTests.so.1 CoinMP-1.8.3_1
 libCbcSolver.so.3 CoinMP-1.8.3_1
 libmwaw-0.3.so.3 libmwaw-0.3.7_1
 libixion-0.16.so.0 libixion-0.16.1_1
-liborcus-parser-0.15.so.0 liborcus-0.15.3_1
-liborcus-mso-0.15.so.0 liborcus-0.15.3_1
-liborcus-0.15.so.0 liborcus-0.15.3_1
-liborcus-spreadsheet-model-0.15.so.0 liborcus-0.15.3_1
+liborcus-parser-0.16.so.0 liborcus-0.16.1_1
+liborcus-mso-0.16.so.0 liborcus-0.16.1_1
+liborcus-0.16.so.0 liborcus-0.16.1_1
+liborcus-spreadsheet-model-0.16.so.0 liborcus-0.16.1_1
 libnumbertext-1.0.so.0 libnumbertext-1.0.4_1
 libGeneratedSaxParser.so opencollada-0.0.20160223_1
 libMathMLSolver.so opencollada-0.0.20160223_1
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index df66c07d53de..6d083ba48ff2 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
 # Template file for 'liborcus'
 pkgname=liborcus
-version=0.15.4
-revision=2
+version=0.16.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3"
 makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-2.0"
 homepage="https://gitlab.com/orcus/orcus"
 distfiles="http://kohei.us/files/orcus/src/liborcus-${version}.tar.xz"
-checksum=b02173c1787373fa728fdaad1b9658184dbcefefcc23c3afcf5400571282e512
+checksum=a4b26b320d00bdfc769c3a03ed22bd5ad7e54a93dc6b1d00cd949f8f3519faae
 replaces="liborcus11>=0"
 
 pre_configure() {

From 8c8ad50773839b5db8e93dbfd23a17f144336d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 15:48:44 +0100
Subject: [PATCH 2422/3458] neon: update to 0.31.2

---
 srcpkgs/neon/patches/libressl.patch | 22 ----------------------
 srcpkgs/neon/template               | 20 +++++++++++++-------
 2 files changed, 13 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/neon/patches/libressl.patch

diff --git a/srcpkgs/neon/patches/libressl.patch b/srcpkgs/neon/patches/libressl.patch
deleted file mode 100644
index 8619476430a6..000000000000
--- a/srcpkgs/neon/patches/libressl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/ne_openssl.c.orig	2020-04-02 09:38:00.420981981 +0200
-+++ src/ne_openssl.c	2020-04-02 09:38:33.876330855 +0200
-@@ -578,7 +578,7 @@ ne_ssl_context *ne_ssl_context_create(in
-         /* enable workarounds for buggy SSL server implementations */
-         SSL_CTX_set_options(ctx->ctx, SSL_OP_ALL);
-         SSL_CTX_set_verify(ctx->ctx, SSL_VERIFY_PEER, verify_callback);
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10101000L
-         SSL_CTX_set_post_handshake_auth(ctx->ctx, 1);
- #endif
-     } else if (mode == NE_SSL_CTX_SERVER) {
---- src/ne_socket.c.orig	2020-04-02 09:39:23.413847326 +0200
-+++ src/ne_socket.c	2020-04-02 09:45:41.358787728 +0200
-@@ -610,7 +610,7 @@ static int error_ossl(ne_socket *sock, i
- /* OpenSSL I/O function implementations. */
- static int readable_ossl(ne_socket *sock, int secs)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10101000L
-+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10101000L
-     /* Sufficient for TLSv1.2 and earlier. */
-     if (SSL_pending(sock->ssl))
- 	return 0;
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef693532..125a1e158b9b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,20 +1,26 @@
 # Template file for 'neon'
 pkgname=neon
-version=0.31.0
-revision=3
+version=0.31.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
-hostmakedepends="pkg-config"
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static
+ --disable-nls"
+make_build_args="all docs"
+make_install_args="install"
+hostmakedepends="automake libtool pkg-config xmlto"
 makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://www.webdav.org/neon/"
-distfiles="http://download.openpkg.org/components/cache/${pkgname}/${pkgname}-${version}.tar.gz"
-distfiles="http://www.webdav.org/neon/${pkgname}-${version}.tar.gz"
-checksum=80556f10830431476d1394c1f0af811f96109c4c4d119f0a9569b28c7526bda5
+distfiles="https://github.com/notroj/neon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=c6513d20c0affca6f4b45e2414a86cce951709cf4448b6b64ccdf3579fda0ce5
+
+pre_configure() {
+	./autogen.sh
+}
 
 neon-devel_package() {
 	depends="${makedepends} neon>=${version}_${revision}"

From f7dbcdaca42f1170854e972d4098db38bf8cb056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 1 Mar 2021 16:25:31 +0100
Subject: [PATCH 2423/3458] libreoffice: update to 7.1.0.3

---
 srcpkgs/libreoffice/template | 38 ++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 244e46935833..dbfeda76b6a8 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,6 +1,6 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=7.0.3.1
+version=7.1.0.3
 revision=1
 build_style=meta
 make_build_args="build-nocheck"
@@ -68,10 +68,11 @@ distfiles="
  ${_addurl}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
  ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
  ${_addurl}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
+ ${_addurl}/box2d-2.3.1.tar.gz
  ${_addurl}/libstaroffice-0.0.7.tar.xz
  ${_addurl}/libzmf-0.0.2.tar.xz
- ${_addurl}/pdfium-4137.tar.bz2
- ${_addurl}/poppler-0.82.0.tar.xz
+ ${_addurl}/pdfium-4306.tar.bz2
+ ${_addurl}/poppler-21.01.0.tar.xz
  ${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
  ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
  ${_exturl}/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
@@ -92,7 +93,7 @@ distfiles="
  ${_addurl}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
  ${_addurl}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- ${_addurl}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz
+ ${_addurl}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
  ${_addurl}/ltm-1.0.zip
  ${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  ${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
@@ -110,16 +111,16 @@ distfiles="
  ${_addurl}/libre-hebrew-1.0.tar.gz
  ${_addurl}/alef-1.001.tar.gz
  ${_addurl}/ttf-kacst_2.01+mry.tar.gz
- ${_exturl}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
+ ${_exturl}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
  ${_addurl}/lxml-4.1.1.tgz
  ${_addurl}/Amiri-0.111.zip
  ${_addurl}/ReemKufi-0.7.zip
  ${_addurl}/Scheherazade-2.100.zip
 "
-checksum="6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d
- 959001bc692a67fd65296a0f33179a33414c0754182908396756849da1fee034
- eb1ce39cb90b7c04f69af6f47c75cb65526634315d12230e638e3a561b9b9293
- 442a2a1931549edbdbc6ab8f9fbc6b8e7088fde4d5806cda82263080d3617168
+checksum="9ed0833f349da3f7b27f54fa24da388dc6a84079935322b305a7a2171e48f3e6
+ 2d260ec3b24d577719706f56f83a3aa8839ee9c95d4b30b40ec2d7fc6a323afc
+ 698ae21765ae1e2df8bbc3b448fe88437055402708f6afe3ed6f746491887acf
+ b17e0d7c61de80526d22c11c63596c4d56aaa2b1ad0f14d29e0abdd8b3efcc54
  1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
  983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
@@ -128,10 +129,11 @@ checksum="6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d
  1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
  233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
  48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
+ 58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c
  f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
  27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
- 9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6
- 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df
+ eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8
+ 016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3
  d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
  f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
  d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
@@ -152,7 +154,7 @@ checksum="6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d
  7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
  a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
  085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
- 3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760
+ f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301
  083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
  c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
  4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
@@ -170,7 +172,7 @@ checksum="6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d
  f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
  b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
  dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
- 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
+ f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
  940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
  1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
  f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f
@@ -188,10 +190,11 @@ skip_extraction="
  ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
  b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
  Firebird-3.0.0.32483-0.tar.bz2
+ box2d-2.3.1.tar.gz
  libstaroffice-0.0.7.tar.xz
  libzmf-0.0.2.tar.xz
- pdfium-4137.tar.bz2
- poppler-0.82.0.tar.xz
+ pdfium-4306.tar.bz2
+ poppler-21.01.0.tar.xz
  bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
  8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
  odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
@@ -212,7 +215,7 @@ skip_extraction="
  ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
  7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
  39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz
+ skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
  ltm-1.0.zip
  368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
@@ -230,7 +233,7 @@ skip_extraction="
  libre-hebrew-1.0.tar.gz
  alef-1.001.tar.gz
  ttf-kacst_2.01+mry.tar.gz
- 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
+ f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
  lxml-4.1.1.tgz
  Amiri-0.111.zip
  ReemKufi-0.7.zip
@@ -498,6 +501,7 @@ do_configure() {
 	fi
 	opts+=" --with-tls=nss"
 	# fails to build with system poppler
+	opts+=" --without-system-box2d"
 	opts+=" --without-system-poppler"
 	opts+=" --without-system-libzmf"
 	opts+=" --without-system-libstaroffice"

From 4539414535892216d767cdba917a96f72e1a408c Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:03:56 +0100
Subject: [PATCH 2424/3458] firefox: update to 86.0.

---
 srcpkgs/firefox/files/firefox-wayland         |  2 +-
 .../firefox/patches/ff85-ppc64-xptcall.patch  | 63 -------------------
 srcpkgs/firefox/template                      |  6 +-
 3 files changed, 4 insertions(+), 67 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch

diff --git a/srcpkgs/firefox/files/firefox-wayland b/srcpkgs/firefox/files/firefox-wayland
index 495f901320c4..e07fd87b235a 100644
--- a/srcpkgs/firefox/files/firefox-wayland
+++ b/srcpkgs/firefox/files/firefox-wayland
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec env MOZ_ENABLE_WAYLAND= /usr/lib/firefox/firefox "$@"
+exec env MOZ_ENABLE_WAYLAND=1 /usr/lib/firefox/firefox "$@"
diff --git a/srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch b/srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch
deleted file mode 100644
index b270d836f2f4..000000000000
--- a/srcpkgs/firefox/patches/ff85-ppc64-xptcall.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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 0af96b675059..299eb9d8650a 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.1
+version=86.0
 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=e98f586aa4d58e7418da41a2d19cd30030d072f86edd24a3fd6f769284287cee
+checksum=c3ac474a2cf6a8e31a962f57c7357dbe67b5088b6aceea9980f25ce7a99b58dd
 
 lib32disabled=yes
 
@@ -133,7 +133,7 @@ do_build() {
 		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"/' \
+		vsed -i 's/debug_info = "2"/debug_info = "0"/' \
 		build/moz.configure/toolchain.configure
 	fi
 

From 1177831022066d0e7c5704eb89f2f258aad1eb8a Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:06:28 +0100
Subject: [PATCH 2425/3458] firefox-i18n: update to 86.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 9b6aa78334cb..065ddf05a58c 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.1
+version=86.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-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"
+checksum="4498a9b32f297b0af4e13d66f905a3a60bc620343fec1bd6ef36b17f33c2db20
+ df2e0588b606d1888bf049e0645308b39596941846159d4ee670971ff4e02a91
+ f44e19cdc20892b75657c4cc7c2f5fa4bcbd4b677a61a877a71d31e8ee282e20
+ 1119422575d8f909d0b49896abe9d027d616122e7d36e4e1acbdcefbd2cf9e04
+ 39b49afc57e9f3af3a0a0d1f0528cbb95f0ac86bfa032864ccc5f45eb2ea9a74
+ 459b3721a77e73049314e2a516e37ce8d9a24f7251090b48c2737ade657b5435
+ fc0c7082f4c40035f434f85f034791c818a9c954f9d3f5d3880322f742a9cbf9
+ 220177f7fb204be27c42aa6a94c553cdfc3a9896cb4cecda2c8de812f1b5f78d
+ d66f4c4182795d6bcc344980ee742947940386e7cf15938fa95d8929295f2e43
+ e8f5c2b6fa0f3947402c0464cd2e04b151b202f8f53516bea465a0a947292b73
+ f98a1460156d33a94852820bf25423cd9b125a51d52e537074342d5c7bfd02b5
+ b6c6d84e31ccac54fb599499adc58702d7fed8794de5afd62050e45f9be59019
+ 124c6eddc99f25bfb153f2bc50aad032b948132149d8fab42395d97400e5ca8e
+ e087e70400243d54a6a21b7e46d886624f5cdbf43c1ac8aee99d70217ae07a73
+ 4d09a32ea45178a993e6493d387d4adf529c417abc438a9e5b6d78069737816c
+ 5f90093e3804ef7105e55eb2586f3be3f4b9947d5a6b6216239e379cc3989bd8
+ eb9207a8a89761292b76268e93696e36c4852efe9c524c37899e1c97c29b13a4
+ f9fda38474a5e6bad491e7239be7402e182ba76d7883bbd5da528d329340892a
+ 5cc738642c3d862865a60dd08e77276e64db57d85b3bcdd0dc9ff4c51f7455b9
+ 346574e0c3595f9533ccb392acb21043a2151b0d2d592e0eef94036bdcc1fb1c
+ cd01dfb6889dc1344b141e1b5339274ca0c125ccf1003f622c42e8e01435f3e5
+ a2128bbb70850f829be5eb91787bc38fdb81657da813ae9f78e4a66e2f1ea09f
+ 018774866a592084cbbd1002de62dd5aa85fd5882c005eaf351b39fe6787ac0c
+ 5064d31a8702b0f047a94231586b2a43bedc3576af76ec52b8c80f589a9bf716
+ dabff4ee5b9ac2ebea515a1ce9efaac550faadaf743901fe9e1d1791bff04a96
+ de266721877446c73ececb31b4a6a08610a3acbb270a79c3102f6cce0f8aadd4
+ 0b1cf27ef3dbd39cd29ade2982f7571ed90b366888c31b9e8121a31a72faeb67
+ 637249ffffd7b0cd9775647433596a78447a03d494c44638103dfd125c937a8d
+ bc88a27e1c6c5c5ca1d742a57d61cb7d1c778aedd66331cdae28d0cd1eb5f3ad
+ 2799aa361fcfa55b96121803665477c23a4e2c2697f1b6fe76c26156d7fc3f00
+ 861081f4e7e304be5bed42ae17f752ebc60c74d99c41f91ba3f7b853681b8081
+ 29dd96e859b4cdd829b620046eead60e8f2ba557edc54cf9b91b2303af652d42
+ c8f4a5707e3a4b6f31eaab5af04cb8aeecfeb13925b943204f2222a88e404635
+ 09c9a6ab89d5e4690fc159e95434db0355279701b433cae3265ae13cd31adfdb
+ d278dd7d8955a03643d3e61784a3cff89a634ca1be95939e6a78a5ce84e0f673
+ 30ac5918d113949f82a76031e12782d125b84ceb253fcf4a5ca0ee7900cca6f9
+ 14f78193ae544f8f5edae750fdb786f8e9f164f4aa542afb1216fd9177729069
+ 383f89b70bdfbdd05f48f2811428d2333e41d8e768ce0ba25153069919ce603b
+ 583a152bdb7200264f78f82f02e8e0cac639d09ca5c00b560baffde85f036584
+ 58ae3dc971a2ca05bdb311416fc03b773e140cc0ab4184d67dc7762c3fce3b91
+ 6af6803a6a454a65568a012f6af04f67296e5427759e917293d0d9ae29a9b638
+ 652a51387fa8c1079c2990babd1a7630ee6974ceac9efa5eaeada55d433b3440
+ db3bdaa10609eac2d5cc48cada51e29798f10752e3234a2267ef0593934c0d3b
+ f7d8d8a57d43a22d33f2148b7d613d25009fed4129c6da4fb345ed7bfddbff09
+ 25591586386e933d096b9ce7f2b63d84ffa181cb686f360b2f1076467470997b
+ e6e2b731e834d67ade7a0e5838a823d604569b0956064c17a340f07fe8d55508
+ 6eac5398c500b3b84002edbcaf86a94aa0f7e496d76a960454030484377490c3
+ 39478180c1206902340b7f75fc056f847d457d1850778b89c11cd0eca9cbb8b4
+ 2a49cf4a0b034fc57838d61bb21208d29111b9c6267adcdc6fdf379ce9e1a258
+ 962b212d7ee5ff5d69c07ebfa6fcbdcbe6536b62ea609778cb6d67b17e3482ab
+ f521141f8fb2a2be34a89afea3dcf236802a5653e51b3fbc7c3922222e5fe8b4
+ 9aeb318f9d29ac16e89dc4c5a924038bd438fba2a2330dc0f0db5763fe895b63
+ 0f6c748c9597d9e446f09f14791060fc102a0fecaf85617de93f0c0a5b7aac8b
+ ed9d55372a3161b1b9f3664ea0522dd4bf881c0736ea70392bff5169a14e32e2
+ 146b005ec9b7f76aaffa63d851fe559e70211425688f46dcd9d9f8867d116c5c
+ 27973b686e015ce276f8d00f20f52983cf75a38ff22e7ccf3f6a1c128a1657df
+ ce816f11395d52ceca5984f57be2f285c83a54e67e287e7a67ed68b4d33a97a3
+ 91d269eafe443bf728cdb7abfe2c9246de3e0c7d0181003ed7dc9f861c29519e
+ 0b4578608b460c3aa2a438e1905b06637cc1c2ab815441a26593bbad78cdffe0
+ 8394f2f135c190620d6b48875f153d3732d760703bed86b12895e4f396e04c2e
+ 914890f2ef7de3c181ba10b598b3c2f1a7d3a30a178f8927077152b2db0d00d8
+ 63c256759521e0666a64a619b4a36b5b74f8f5785da448a7302af932b73a2193
+ 3cf325d719e1d191c4d41153d6cb4a51bc81ec3953f2ea24aa6991bf86808feb
+ 34910b601e0c703171627a3605743adc73dad205d90440c30ad583d4f51364e6
+ e88df62987374efacaae6572afa9b05cbdd0bbea01fa3e41fbffeb6f1ddf607e
+ 262acca13f75ef5a5a556899f33f32cfbcdd59db517e2047c9507f308f8bbebd
+ 9f7e4c2fbc0f05e8fb1d89f760b82231f8d56f936e480111b74d13f33bd7273f
+ 8dd34bbc24c23f8a54306c078ec4c153c2201f1d8161c5c16a3614b8e852c704
+ 9aa1d6eb37c1b6d695d205b24101bf3f6000d97e7f11f62a256a682cee52cb92
+ 73bcadd4b05520b53b2f3d4abb0574e3e1a63a70d14dbebf1184de00deb965da
+ 4df484a630fde042cf4e9425e50cd396d2b519f39725d6dcaaa0f2f990e59c97
+ fcf0becc62757bfb4839930e3c9203f37183c4c3f380dce2aff62d7bf0e4df36
+ ed1d48d7d01c9de098b6857e1237f0d72b7377aa07b714a1dec0369c9db1c67e
+ 5aac237598b1f64faaad7465bb9d488c7f6eeb5e674bf66229f8aa467993ee10
+ fbac1caaf85d631f43d4d5d564be98159fa651a1b355548cc55d6456486b0d2c
+ 6e34ba6011df7630f83b00344082f3e28dda320644cebc0e1894bf5f84494f36
+ 574f3773f7e9adc324e75ece3e681529b177e12a757b927973cd6fe6a93f64ad
+ 202b1dc1945e80f14ab2cbf2d74a48a987d08f4d7374bf616948ff725baaac27
+ 8083ca7eaaa2d0f36432e703ea3525a82f9a9d2f743349794343fd6026441dae
+ 4787f2a77a6e27bf6feee438b0c5fdec2d6f6c5646b0d90954fc7e956f005887
+ c068a91ea1c14352ad5f43bf8d3a22c739e3eba8d88176df83a40bed95bb4571
+ 52a541d3f78cb2d27568bd2052d967eeaaddecaabaf07f2651fe03644df22397
+ e21fa229864b29ef0f9a63811cddee8cf97e9190413d4b6dd75c89ee89c56f93
+ ebedfd9b900f29bc6e7f8a5fb8e18d20eda8970f7ff5aa9cb32c39c1646de488
+ 71a66412b7b775cd3a79c46013ba402cb814443827c7733ba2c4289150eeb43a
+ e475cd51e14154406824e076a723e8b418da7e2ff012f791659ef038d67fc234
+ e771e0bef3f86399882686c0beab17592e2518d5055f3a3608023bf63b7b314a
+ 841a8ef41042365efb615446712c17df19c25cf7079c4a657ce213a685caa04c
+ 519409b1d145262269083ef78418718e53c069ef07091b8382c0cfa9386ebe72
+ 5157f35f71dcd519847e7d750542d0d075d2bef3ae1f107d377dad4a0cf80e0f
+ f0e0942619b5632dfc6173822521833a044e96ac0c0a00719e27d9b0c119058e
+ db138b99b69f28edcb2012a11c2bd90cd9af037e33ee26cbe7e84b5f4ebe40ee
+ 668d6a1d771bf109bf77eaabc85602fb6d8f79f42ef6780c155f6842d0d3e90a
+ 94da49b200bfbe51d72d15cdd41ecef369bf9b9e8f9d0e77741b2976f730041e
+ 6076fac25482502ca6d4281ab3b9b03966282a57aa43c71a8ad6fdd9c007be23
+ ceb4d4aa1fdd96c95f9d615b5c7f6140bb254fcf7edd253050760a6f15ac10a2"

From b1e52eb36779ed15046cce6d720a967e90cc514e Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 19:57:51 +0100
Subject: [PATCH 2426/3458] cbindgen: update to 0.18.0.

---
 srcpkgs/cbindgen/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbindgen/template b/srcpkgs/cbindgen/template
index 80c82efce5ea..3c9d15bbce0d 100644
--- a/srcpkgs/cbindgen/template
+++ b/srcpkgs/cbindgen/template
@@ -1,6 +1,6 @@
 # Template file for 'cbindgen'
 pkgname=cbindgen
-version=0.16.0
+version=0.18.0
 revision=1
 build_style=cargo
 short_desc="Tool to generate C bindings for Rust code"
@@ -8,4 +8,8 @@ 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=c7b545f27f19da06983d38e149b76c446a13b9df744d22b2a1b3adb79dabf0ab
+checksum=956fb1ca77daabf89451a1ea42658b74ad35477fed24ad859d8612708f9c4336
+
+do_check() {
+	: # test are only expected to work with rust nightly
+}

From ddc793cf03cb294fb41687ee2bf78123e37248f9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 28 Feb 2021 22:34:01 +0400
Subject: [PATCH 2427/3458] libwacom: update to 1.9.

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

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 5413fedd51e0..c8ab37bbf718 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -1,19 +1,24 @@
 # Template file for 'libwacom'
 pkgname=libwacom
-version=1.6
+version=1.9
 revision=1
 build_style=meson
 build_helper="qemu"
 configure_args="-Ddocumentation=disabled -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel libgudev-devel librsvg-devel libxml2-devel"
+checkdepends="python3-pytest python3-libevdev python3-pyudev"
 short_desc="Library to identify wacom tablets"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://github.com/linuxwacom/libwacom"
 changelog="https://raw.githubusercontent.com/linuxwacom/libwacom/master/NEWS"
 distfiles="https://github.com/linuxwacom/libwacom/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.bz2"
-checksum=701cb23ee3f2ad4eb5183ef1421dfff3e5b7622e5d3bb6fcd599190a7d77aea8
+checksum=68b14d4e3b75fed9f590bf6eaea361a72dc23e933b7725094c779477acf665c7
+
+if [ -z "${XBPS_CHECK_PKGS}" ]; then
+	configure_args+=" -Dtests=disabled"
+fi
 
 post_install() {
 	vlicense COPYING

From 76842c1832a8b1563cfdaa4692a380f7f2c6eb4c Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Mon, 1 Mar 2021 11:25:44 +0100
Subject: [PATCH 2428/3458] geckodriver: update to 0.29.0.

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

diff --git a/srcpkgs/geckodriver/template b/srcpkgs/geckodriver/template
index 685bfc35cdbe..ca028e38b064 100644
--- a/srcpkgs/geckodriver/template
+++ b/srcpkgs/geckodriver/template
@@ -1,8 +1,8 @@
 # Template file for 'geckodriver'
 pkgname=geckodriver
-version=0.28.0
-revision=2
-_hg_commit="c00d2b6acd3fb1b197b25662fba0a96c11669b66"
+version=0.29.0
+revision=1
+_hg_commit="cf6956a5ec8e"
 create_wrksrc=yes
 build_wrksrc=${pkgname}
 build_style=cargo
@@ -14,10 +14,10 @@ distfiles="https://hg.mozilla.org/mozilla-central/archive/${_hg_commit}.zip/test
  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="278b0f57b4659c82a22be260e754a38d0e61fc28cb76bf8a4b672020456c2f08
- eddf228980cd00a357f549435e5225a7d291305583c1d5010b0930039f6ddfb7
- 1049fa9f18ffc7bb03da0523d782c6f52f12bdee8b5ee3d705ee618a1e95011e
- e2b6ba6af118d2fde12cdc05dfd0feca0d1d583f8bd083255dd48544fd416ca9"
+checksum="5095be872b66c3b0dfc9d3d82bf0a62613b0f9783731d9ea0def6d6019d24b14
+ d5297cd054ca19ea23f9e6722b9ada89e0d73941efc374fdbfc613bf18fda544
+ 921ed447ece7058652429dfb79a9db4bf0c467163761cbfc3d9daba00b77b662
+ 048970448a118b1569b9e70192c0214a86363e0c25094819d4cf6b99ee54eef0"
 skip_extraction="Cargo.lock"
 
 post_extract() {

From 3ab431dff110f2b6fca5423d73e7a857d1da505a Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Mon, 1 Mar 2021 11:40:29 +0100
Subject: [PATCH 2429/3458] synapse: update to 1.28.0.

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index f25d1f9f5838..e9ffab6b7075 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.27.0
+version=1.28.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=d87ba2187210eff0571106315421a81b9bf5c5101deb5e6f849921ad28ff3f5a
+checksum=509c5241ae6621b397d769cc9665a8f86983b2e8f17d63795721601600d8132c
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From ed21f0748f8e50473466211894984a9c861906b6 Mon Sep 17 00:00:00 2001
From: jackloomen <79494508+jackloomen@users.noreply.github.com>
Date: Mon, 1 Mar 2021 06:06:23 +0000
Subject: [PATCH 2430/3458] socat: update to 1.7.4.1.

important new feature added: VSOCK support
---
 srcpkgs/socat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff847..6c3d342b9e23 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,7 +1,7 @@
 # Template file for 'socat'
 pkgname=socat
-version=1.7.3.4
-revision=2
+version=1.7.4.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
@@ -11,7 +11,7 @@ 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"
-checksum=972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc
+checksum=3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;

From 49b55215547d1693e3b90b444abb9630bbb0bcbd Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 1 Mar 2021 11:02:29 +0100
Subject: [PATCH 2431/3458] dlayer: update to 0.2.5.

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

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index e754ee8e6765..0b1918513ccd 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,6 +1,6 @@
 # Template file for 'dlayer'
 pkgname=dlayer
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
@@ -10,7 +10,7 @@ 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=3a31c0839ae92164fe77e1047c18b564c9eda9ffa4d17c87562abd50ff5ac147
+checksum=38b445cb198b2f9dec7618eca95fd5f20b16afd152f96ee1b932c4b7be0994ce
 
 post_install() {
 	vlicense LICENSE

From 7c58ffba3416a43ca02edeec260204ec0d18a3b0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 1 Mar 2021 11:11:29 +0100
Subject: [PATCH 2432/3458] chessx: update to 1.5.6.

Removed upstream patches as they are already present in v1.5.6.
---
 ...001-remove-unmaintained-translations.patch | 33 ------------
 ...slations-into-separate-resource-file.patch | 50 -------------------
 srcpkgs/chessx/template                       |  4 +-
 3 files changed, 2 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/chessx/patches/0001-remove-unmaintained-translations.patch
 delete 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
deleted file mode 100644
index 32e495def39a..000000000000
--- a/srcpkgs/chessx/patches/0001-remove-unmaintained-translations.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 7e484dad822c..000000000000
--- a/srcpkgs/chessx/patches/0002-extract-translations-into-separate-resource-file.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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 da4b1e394749..774af4b4818a 100644
--- a/srcpkgs/chessx/template
+++ b/srcpkgs/chessx/template
@@ -1,6 +1,6 @@
 # Template file for 'chessx'
 pkgname=chessx
-version=1.5.4
+version=1.5.6
 revision=1
 build_style=qmake
 hostmakedepends="qt5-tools"
@@ -10,7 +10,7 @@ maintainer="cipr3s <cipr3s@gmx.com>"
 license="GPL-2.0-only"
 homepage="https://chessx.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz"
-checksum=e2dbacff2a6c055cfbe4ce0344331f77262867e228a5fe2895e6c242772065a8
+checksum=d09a4b534a909c5f1a398c64065049a2fdf30497bc81ccbdf0d940412364d205
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-multimedia-devel qt5-speech-devel qt5-svg-devel"

From 3ebf11c3523089e70cb2851597d5374861022c56 Mon Sep 17 00:00:00 2001
From: Evan Deaubl <evan@deaubl.name>
Date: Thu, 25 Feb 2021 15:02:16 -0700
Subject: [PATCH 2433/3458] git-annex: update to 8.20210223.

---
 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 2cb308fc66cd..3d4df760667b 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.20210127
+version=8.20210223
 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=636f439420f28a92a8250b9f8b422567e439315f3f2d23cb0bea3b0a0e5755c3
+checksum=62a09f98c96dd2a66605aaf6b7f00573a33997f3ef568ffb0d2dc17609719d1f
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From d7727121b9eaf79cd1e88f85b5437f713791503d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Mar 2021 18:45:13 +0300
Subject: [PATCH 2434/3458] element-desktop: update to 1.7.22

Fix a low severity issue CVE-2021-21320
---
 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 a33a6153c902..aecc89faee79 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.21
+version=1.7.22
 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="84e9df1a4a05c901136d0ca1d3d4ec426e7b878d8cdf448daf941c29c94b339d
- 3771d62952b0db81d74fb8c2a0e19afa90b63a559dc2dc15eca3c3da1ba34b86"
+checksum="890e4028721101d9a3ea4f2fbe892230e0fd2e2995dcc3e0cc560565aec783e1
+ d8119916d7a1cc20541f3f236ee19f2117049d328c286c54ac58fbd0fd72db1a"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 0104c136e16a52aa9b431b17b105fed4cedd6a26 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 1 Mar 2021 10:58:03 +0100
Subject: [PATCH 2435/3458] moserial: update to 3.0.16.

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

diff --git a/srcpkgs/moserial/template b/srcpkgs/moserial/template
index aaf829fafdd8..41871996f817 100644
--- a/srcpkgs/moserial/template
+++ b/srcpkgs/moserial/template
@@ -1,6 +1,6 @@
 # Template file for 'moserial'
 pkgname=moserial
-version=3.0.15
+version=3.0.16
 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=cf1342eb4192178c90a42a63e9f9cc580394238ee790192273173f981bb7e8d5
+checksum=1e676d8e240ca9e37b3a2b413b7e59c751868a41c9f8a9248984e1dbe15e6d74

From 730b6545968a0a0d636cd3d1273d78ff46f8f55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:14:33 -0300
Subject: [PATCH 2436/3458] dnote-cli: remove package.

Package hasn't been maintained for a long time, upstream is at version
0.12.0. Even upstream's move to Go modules didn't lead to an update.
---
 srcpkgs/dnote-cli/template        | 31 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 srcpkgs/dnote-cli/template

diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
deleted file mode 100644
index 309bee7649b7..000000000000
--- a/srcpkgs/dnote-cli/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'dnote-cli'
-pkgname=dnote-cli
-version=0.6.2
-revision=1
-wrksrc="cli-${version}"
-build_style=go
-go_import_path=github.com/dnote-io/cli
-go_build_tags="fts5"
-hostmakedepends="git dep"
-short_desc="Capture what you learn as you code without leaving the command line"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="MIT"
-homepage="https://dnote.io/"
-distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
-
-pre_build() {
-	cd $GOSRCPATH
-	dep ensure
-}
-
-post_install() {
-	vlicense LICENSE
-
-	# Rename the bianry form cli to dnote
-	mv ${DESTDIR}/usr/bin/{cli,dnote}
-}
-
-do_check() {
-	./scripts/test.sh
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c17637f391ab..256e5e699548 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,6 +35,7 @@ replaces="
  dleyna-core<=0.6.0_2
  dleyna-renderer<=0.6.0_2
  dleyna-server<=0.6.0_2
+ dnote-cli<=0.6.2_1
  docker2aci<=0.17.2_4
  ebtables<=2.0.10.4_8
  eclipse-ecj<=4.9_3

From 1c24af27496955856bc89428e32e35cb5c94fce7 Mon Sep 17 00:00:00 2001
From: Neel <neel@chot.ai>
Date: Sat, 27 Feb 2021 19:30:49 +0000
Subject: [PATCH 2437/3458] base-files: initialise empty etc/modules-load.d
 folder

---
 srcpkgs/base-files/INSTALL  | 4 ++--
 srcpkgs/base-files/template | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/base-files/INSTALL b/srcpkgs/base-files/INSTALL
index 1be113b93cc2..85a7f92cd4ee 100644
--- a/srcpkgs/base-files/INSTALL
+++ b/srcpkgs/base-files/INSTALL
@@ -2,8 +2,8 @@ make_system_dirs() {
 	#
 	# Install FHS system directories.
 	#
-	for d in boot etc etc/modprobe.d etc/skel \
-		home dev proc usr mnt opt sys media var run/lock; do
+	for d in boot etc etc/modprobe.d etc/modules-load.d \
+		etc/skel home dev proc usr mnt opt sys media var run/lock; do
 		[ ! -d ${d} ] && install -d ${d}
 	done
 
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index c143cf024a1d..0683d19209c4 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=9
+revision=10
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From d2ac9e475df8f796259bb84bf97c3768a2e1cf23 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 1 Mar 2021 12:46:42 +0100
Subject: [PATCH 2438/3458] ugrep: update to 3.1.9.

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

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 03366a1b73f3..3829fdc1561f 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,7 +1,7 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.7
-revision=2
+version=3.1.9
+revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
 makedepends="bzip2-devel liblz4-devel liblzma-devel pcre2-devel zlib-devel"
@@ -10,7 +10,7 @@ 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=1b9fed98ea97992c98c9ca0d409da0c1f89bf54fd410ddbfdee1c57e01d4a85a
+checksum=c2a94fbacf8cf0f7d35e73fabbe4a6afc20feff8c340c9ced7a22343a8d7a569
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From a2daec0d748affe33e5aa1303b3abf7d9f7f74c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 1 Mar 2021 12:46:48 +0100
Subject: [PATCH 2439/3458] python3-pyinfra: update to 1.3.7.

---
 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 2ff205a56913..edb1120fdd31 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.6
+version=1.3.7
 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=3c453222a1f35b82fde7628de341616eb4312d0b12346ad5bde034556989d0e3
+checksum=5ea2765026fd33275262aa6b96cec11391f4fa1d5d47359d9837694220c970a8
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 62b371303980f2626290487454f42dda9d3c1a66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:18:44 -0500
Subject: [PATCH 2440/3458] xpra: update to 4.1.

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

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 8102e1377c6a..a3763f74eb43 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,12 +1,12 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.0.6
+version=4.1
 revision=1
 build_style=python3-module
-hostmakedepends="pkg-config python3-Cython"
+hostmakedepends="pkg-config python3-Cython pandoc"
 makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel
  libvpx-devel libwebp-devel libxkbfile-devel python3-gobject-devel x264-devel
- gtk+3-devel"
+ gtk+3-devel pam-devel"
 depends="cups python3-gobject python3-Pillow python3-cups python3-dbus
  python3-lz4 python3-paramiko python3-rencode xauth xf86-video-dummy
  xorg-server-xvfb"
@@ -14,9 +14,9 @@ short_desc="Persistent remote display server and client for X11 clients"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
-changelog="https://xpra.org/svn/Xpra/tags/v4.0.x/src/NEWS"
-distfiles="https://xpra.org/src/${pkgname}-${version}.tar.xz"
-checksum=9c672f6d914661dda743be4b2f860dfb17166fb52c562037380aa972b4f089e8
+changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
+distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
+checksum=a8413b34015b7c55f1226776f87bd1a01c427c3a25b4ebf4eb8b79c64b52cc8a
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From f29135fffbb43a338b5d60e95021766b75c205ea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:20:27 -0500
Subject: [PATCH 2441/3458] protobuf26: update to 3.15.3.

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

diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf26/template
index 233284af7219..0d16df82095c 100644
--- a/srcpkgs/protobuf26/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf26'
 pkgname=protobuf26
-version=3.15.1
+version=3.15.3
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=f18a40816260a9a3190a94efb0fc26270b244a2436681602f0a944739095d632
+checksum=b10bf4e2d1a7586f54e64a5d9e7837e5188fc75ae69e36f215eb01def4f9721b
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"

From 0ff5d2e3501d8a92dbc0929ca0eb1613ae40ab46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:20:47 -0500
Subject: [PATCH 2442/3458] python3-protobuf: update to 3.15.3.

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

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index 215067f93725..387a57b82b54 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.15.1
+version=3.15.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=824dbae3390fcc3ea1bf96748e6da951a601802894cf7e1465e72b4732538cab
+checksum=f3348af83391cdb842030e774d9bb01565ed4c62c93554cd1c69723411ec5e9d
 
 build_options="cppext"
 build_options_default="cppext"

From df87d35b9fc1821a60f9fa8fd176b859b5970d66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:21:23 -0500
Subject: [PATCH 2443/3458] python3-tifffile: update to 2021.2.26.

---
 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 b7a4b5258ab6..e49ac544e0e6 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.2.1
+version=2021.2.26
 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=9ca215bbe6640b64d1c1f9d2762310f1e3e496630b00c51b7e0e9f9b4a993537
+checksum=a68e523f92ebaaa8e5503a9c2e165837e1d5faecc0379ecafc7881122f4fda1f
 
 post_install() {
 	vlicense LICENSE

From 95e42b3f5a0d30c45834e8f5e30ea81a78442699 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:22:54 -0500
Subject: [PATCH 2444/3458] python3-ipython: update to 7.21.0.

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

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 21b801f02675..453b863e0fa5 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.20.0
+version=7.21.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
@@ -12,11 +12,11 @@ checkdepends="$depends python3-pytest python3-nose python3-matplotlib
  python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
  python3-jupyter_nbformat python3-Pygments python3-Pillow"
 short_desc="Enhanced interactive Python3 shell"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://ipython.org/"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=1923af00820a8cf58e91d56b89efc59780a6e81363b94464a0f17c039dffff9e
+checksum=04323f72d5b85b606330b6d7e2dc8d2683ad46c3905e955aa96ecc7a99388e70
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From c6bab5d0b7e1650ae415d3f59899bdb27afb005e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:28:32 -0500
Subject: [PATCH 2445/3458] python3-aiohttp-sse-client: update to 0.2.1.

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

diff --git a/srcpkgs/python3-aiohttp-sse-client/template b/srcpkgs/python3-aiohttp-sse-client/template
index 45ff6693e2a4..1c876b6703fc 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=2
+version=0.2.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://github.com/rtfol/aiohttp-sse-client"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7fe8f9af35cf9a97249562e81a35c2f86544ce388928223205021ab00c30edca
+checksum=f593a5ce3acb617c4b966c04d8e4408da4506a1e4730073526b648f51ba9edc9
 
 post_patch() {
 	# Package does not *need* pytest-runner to build, and Void doesn't have it

From 0b34bd93d0f8ed4424196c4be53311053dd014ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:29:39 -0500
Subject: [PATCH 2446/3458] grpc: update to 1.36.0.

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

diff --git a/common/shlibs b/common/shlibs
index b294faeb9062..7fe55e384b00 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3569,18 +3569,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.14 grpc-1.34.0_1
-libgpr.so.14 grpc-1.34.0_1
+libaddress_sorting.so.15 grpc-1.36.0_1
+libgpr.so.15 grpc-1.36.0_1
 libgrpc++.so.1 grpc-1.19.1_1
 libgrpc++_alts.so.1 grpc-1.32.0_1
 libgrpc++_error_details.so.1 grpc-1.19.1_1
 libgrpc++_reflection.so.1 grpc-1.19.1_1
 libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.14 grpc-1.34.0_1
+libgrpc.so.15 grpc-1.36.0_1
 libgrpc_plugin_support.so.1 grpc-1.32.0_1
-libgrpc_unsecure.so.14 grpc-1.34.0_1
+libgrpc_unsecure.so.15 grpc-1.36.0_1
 libgrpcpp_channelz.so.1 grpc-1.19.1_1
-libupb.so.14 grpc-1.34.0_1
+libupb.so.15 grpc-1.36.0_1
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 3145eb533b1b..e915c4322b8d 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,8 +1,8 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.35.0
-revision=2
-_abseilver=0f3bb466b868b523cf1dc9b2aaaed65c77b28862
+version=1.36.0
+revision=1
+_abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
  -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
@@ -18,8 +18,8 @@ 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="27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958
- 3d74cdc98b42fd4257d91f652575206de195e2c824fcd8d6e6d227f85cb143ef"
+checksum="1a5127c81487f4e3e57973bb332f04b9159f94d860c207e096d8a587d371edbd
+ 62c27e7a633e965a2f40ff16b487c3b778eae440bab64cad83b34ef1cbe3aa93"
 
 if [ "$CROSS_BUILD" ]; then
 	# need host grpc_cpp_plugin

From d6e7aa0087dd38c992ec63b50162608e0efc0570 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:29:56 -0500
Subject: [PATCH 2447/3458] sysdig: revbump for grpc

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

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68299848713b..f7938db8c2e3 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

From b0c3e78b165b8784795f0a9084394902985d121b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:32:05 -0500
Subject: [PATCH 2448/3458] python3-grpcio: update to 1.36.0.

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

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index eb7f99b77bd0..f286217b2466 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.35.0
-revision=2
+version=1.36.0
+revision=1
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -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=7bd0ebbb14dde78bf66a1162efd29d3393e4e943952e2f339757aa48a184645c
+checksum=70b11805bc9385fcd24e15bcdc5bd8bed463026cd2227d9fdd1ebda612ba0cd9
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d848c409a3c98cc0e5409f9d2500059cb0fb4b97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:33:18 -0500
Subject: [PATCH 2449/3458] python3-grpcio-tools: update to 1.36.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 8d04abb9ac3b..c2169c719e87 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.35.0
+version=1.36.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=9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf
+checksum=7f15ca23d3371134dbba784cc29c4115e7e61e5dc8e9b4eb02f2b152ec43adf6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 131377d5bcfb8cd372f04675f0e96b4aad910d5b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:34:58 -0500
Subject: [PATCH 2450/3458] Solaar: update to 1.0.5.

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

diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template
index f45d77630972..718e672cb21b 100644
--- a/srcpkgs/Solaar/template
+++ b/srcpkgs/Solaar/template
@@ -1,13 +1,15 @@
 # Template file for 'Solaar'
 pkgname=Solaar
-version=1.0.4
+version=1.0.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-pyudev"
+depends="python3-pyudev python3-psutil python3-yaml python3-xlib"
 short_desc="Linux device manager for a wide range of Logitech devices"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://pwr-solaar.github.io/Solaar/"
 distfiles="https://github.com/pwr-Solaar/Solaar/archive/${version}.tar.gz"
-checksum=ab383aa832a57ca3de10f754488272c65ef1cfe9fbdfb66874dac183cc039b7e
+checksum=6514f278da3f3a96dda6f254b786a2b106e1a5c20e0c20e61c8273b3e5c33973
+# Package provides no tests
+make_check=no

From 674b14aa51231027d16ac00b2fbedaed32022531 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:35:41 -0500
Subject: [PATCH 2451/3458] python3-hypothesis: update to 6.3.4.

---
 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 250e0c0d5706..fb95bef37cff 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.3.0
+version=6.3.4
 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=890f6c5b375dca597a76b4d6653ab70d0b2a154c2890d28a63a2878b0188607c
+checksum=fc1af533c251e7668922ecf0d38c90b7eb5f9b1bcc5ecb28d9e99b04a6fa398e
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 11d335c2e9986d0aabdbc6e343ad90a97d07f670 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:36:39 -0500
Subject: [PATCH 2452/3458] python3-aiohttp: update to 3.7.4.

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

diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template
index bc5e18b1fe07..d8b4761c8b9b 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiohttp'
 pkgname=python3-aiohttp
-version=3.7.3
-revision=2
+version=3.7.4
+revision=1
 wrksrc="aiohttp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://aiohttp.readthedocs.io/"
 distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz"
-checksum=9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4
+checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de
 
 post_patch() {
 	# use system http-parser

From 4fbc39739f5c7e4d7f956ecb8942762f7f5ca72c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 1 Mar 2021 14:36:44 -0500
Subject: [PATCH 2453/3458] python3-setuptools: update to 54.0.0.

---
 srcpkgs/python3-setuptools/template | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 6bdad45add7f..c77068ebc397 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,33 +1,27 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=53.0.0
+version=54.0.0
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
 depends="python3"
-checkdepends="python3-pytest-fixture-config python3-jaraco
- python3-mock python3-wheel python3-pip"
 short_desc="Easily build and distribute Python3 packages"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 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=1b18ef17d74ba97ac9c0e4b4265f123f07a8ae85d9cd093949fa056d3eeeead5
+checksum=34efee89c4c879204f5739ec6d9d3635195b0b7d2b51e25c9261a327367ec5ff
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
+# Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;
+# singledispatch backports functools.singledispatch and is not worth packaging
+make_check=no
 
 export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
 export SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
 
-do_check() {
-	# Void does not package components necessary for these tests
-	python3 -m pytest -k 'not test_bdist_wininst_warning' \
-		--ignore=setuptools/tests/test_distutils_adoption.py \
-		--ignore=setuptools/tests/test_virtualenv.py setuptools/tests
-}
-
 post_install() {
 	vlicense LICENSE
 }

From bfcde31f91e7f052138daebc8c69a84ad021c035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Mar 2021 19:34:48 -0300
Subject: [PATCH 2454/3458] mdBook: update to 0.4.7.

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

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 38cd87b53dd9..8d1fc3e43bc8 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.6
+version=0.4.7
 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=a0a8f8e65030370cec8f5114ccb57334c9f2b7153dc51677e12dc74632d3ed23
+checksum=5adbea6d60a7d4ec13dcf13b451336ce7127c2e872ea0d8482e9bb73f6f61dfd
 
 post_install() {
 	vlicense LICENSE

From 39bcf766694df43c2d7f716680909b3607769b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Mar 2021 19:35:10 -0300
Subject: [PATCH 2455/3458] mdbook-linkcheck: update to 0.7.4.

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

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb41..fa737c2324e3 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -1,7 +1,7 @@
 # Template file for 'mdbook-linkcheck'
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
-version=0.7.2
+version=0.7.4
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://crates.io/crates/mdbook-linkcheck"
 distfiles="https://github.com/Michael-F-Bryan/${pkgname}/archive/v${version}.tar.gz"
-checksum=ca9ec8cee58c1ae9ed5169da285e3254214026396351acc857f6ecb7a4186f29
+checksum=ab88c836ed93600097f64e2eae67fc7d7eaf9dec6e16bab757041ac497f16aa5
 
 post_install() {
 	vlicense LICENSE

From e8e849e5f2b843db7e2cd7f4d24897736cd69074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Mar 2021 19:35:42 -0300
Subject: [PATCH 2456/3458] tree-sitter: update to 0.19.0.

Update common/shlibs due to ABI changes.
---
 common/shlibs                | 2 +-
 srcpkgs/tree-sitter/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7fe55e384b00..aaf452e0bb59 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3923,4 +3923,4 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
 libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
-libtree-sitter.so.0 tree-sitter-0.18.2_1
+libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index 3a60fb91c29e..e3218d9b4444 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -1,6 +1,6 @@
 # Template file for 'tree-sitter'
 pkgname=tree-sitter
-version=0.18.2
+version=0.19.0
 revision=1
 build_style=gnu-makefile
 short_desc="Parser generator tool and incremental parsing library"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://tree-sitter.github.io"
 distfiles="https://github.com/tree-sitter/${pkgname}/archive/v${version}.tar.gz"
-checksum=feedb3e77f7869baf3b242c586aa5be4277a049c6e0bc366ee5c6aeb4ba3da39
+checksum=7fa56a76b29b170ae11026a5c965e5a1177c158e251bec103d353ffff16a84e9
 
 post_install() {
 	vlicense LICENSE

From 9e4404e88a7288c3071555af9bb26127e6b3dca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Mar 2021 19:37:35 -0300
Subject: [PATCH 2457/3458] kstars: update to 3.5.2.

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

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index 53bc3fa360b4..eac916757446 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,6 +1,6 @@
 # Template file for 'kstars'
 pkgname=kstars
-version=3.5.1
+version=3.5.2
 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=81ffb2697898405b8ed7f9ef74fe8e3ae0f842b46d3c0413c106406d834ac545
+checksum=897eeb3106dcb5d2b701e1f866f1fe4f8aefd591f09f9e6eac9875e742a85d75

From c9603291cef0b6d7119841eedbc0400df12803c0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 1 Mar 2021 20:05:54 -0700
Subject: [PATCH 2458/3458] python3-rich: update to 9.12.3.

---
 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 ecee68704e03..929f3c62c2b2 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.12.2
+version=9.12.3
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,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=493b4288273aa46475230733358696457e5df9215c898b164a324b7d9d694e88
+checksum=77bd13c72350c4907540be33910c0ec13bebb68fba4986e055fb564338f9e94a
 
 post_install() {
 	vlicense LICENSE

From 15031d45bb7e25a7df18a0c38fbcf2bc627bbad7 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 28 Feb 2021 15:56:41 -0800
Subject: [PATCH 2459/3458] slirp4netns: update to 1.1.9.

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

diff --git a/srcpkgs/slirp4netns/template b/srcpkgs/slirp4netns/template
index c228db1ecd07..c3dd34332143 100644
--- a/srcpkgs/slirp4netns/template
+++ b/srcpkgs/slirp4netns/template
@@ -1,6 +1,6 @@
 # Template file for 'slirp4netns'
 pkgname=slirp4netns
-version=1.1.7
+version=1.1.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
@@ -10,7 +10,9 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/rootless-containers/slirp4netns"
 distfiles="https://github.com/rootless-containers/slirp4netns/archive/v${version}.tar.gz"
-checksum=5c9e4dd7d99683a0c9ba8509aec865245604db83359ff1b7c99f9f3ae1569a28
+checksum=5ff0d3e4bf6b11c8a4fcf5bd3219b8d52096e3b8cc73ca760aa554bb1eb08768
+# tests fail due to use of unshare (unavailable with chroot util-linux)
+make_check=no
 
 pre_configure() {
 	./autogen.sh

From f53f80074371ffd969e115e95f79ead73c2418fd Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Mon, 1 Mar 2021 20:02:54 +0100
Subject: [PATCH 2460/3458] minio: update to 2021.03.01.

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

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index bc78bbf6b84e..0088d179f280 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2021.02.11
+version=2021.03.01
 revision=1
-_version="${version//./-}T08-23-43Z"
+_version="${version//./-}T04-20-55Z"
 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=0b852c9fcf1bb6e389fbf8d57d2fb400663e95baf2c45fcc62959e8a5ec8f43e
+checksum=516b51d036cc0f599feb3a24c33142c7adf16aa15cc6ed5d0fddef1fde5bceeb
 system_accounts="_minio"
 _minio_homedir="/var/lib/minio"
 _minio_descr="Minio Daemon User"

From 3a3bcb456ea62898b15173cdbd3765dfbfa836cb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Mar 2021 13:13:50 +0100
Subject: [PATCH 2461/3458] sbcl: update to 2.1.2.

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

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 0a1afbeb9a2b..67b3e5f34a5e 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.1
+version=2.1.2
 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=a9ad892ea038b7155a60c1144801084fab3b2b8cbb0c5bde7e1f42a6b4318a97
+checksum=b7710550939855ed49598c4a014483ed120b6991658a2a3b6afa47713dce4c0b
 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+=" d7935c116af2ecd7485eae54d29491964b1f3ed97068f3127bd8871e120611a4"
+	checksum+=" 5312b826a65b07df1d59370bd52a753269c8d703b4f482e6a8dbb7986599be46"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 7554fd3d030494fd5ff24b491757072283a80c2e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Mar 2021 13:15:50 +0100
Subject: [PATCH 2462/3458] qed: update to 1.0.5.

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

diff --git a/srcpkgs/qed/template b/srcpkgs/qed/template
index d66a017a2679..1c46507437e9 100644
--- a/srcpkgs/qed/template
+++ b/srcpkgs/qed/template
@@ -1,6 +1,6 @@
 # Template file for 'qed'
 pkgname=qed
-version=1.0.3
+version=1.0.5
 revision=1
 wrksrc="QED-${version}"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"  # Usenix Tape
 homepage="https://github.com/phonologus/QED"
 distfiles="https://github.com/phonologus/QED/archive/v${version}.tar.gz"
-checksum=a17830ebac244184aa9d52d934a5d938859bb75e4a1a2c7ff5d4e1a8a2600e97
+checksum=4b0bd4ec84813b6c0d6ea67c95dddc7ab09eec9d69585e851fe6403c60643b76
 
 do_install() {
 	vbin qed

From 633796e6fa0b89326f6d65039f503d7af7c77df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Mar 2021 13:41:11 +0100
Subject: [PATCH 2463/3458] linux4.14: update to 4.14.222

Convert template to base tarball + patch scheme.
---
 srcpkgs/linux4.14/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d1..808bc4343609 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,14 +1,17 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
-version=4.14.221
+version=4.14.222
 revision=1
-wrksrc="linux-${version}"
+wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 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=ce2254075ff4846f13380c1cf4bec1e351e5996a7dd109c200e222e49fd2c7e9
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
+ https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
+checksum="f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
+ f6be478dbffdd153850aec45f198f236dbfeaf2f62138925793f9726dc442a28"
+skip_extraction="patch-${version}.xz"
 python_version=2 #unverified
 patch_args="-Np1"
 
@@ -19,7 +22,8 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage
+ gmp-devel libmpc-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;
@@ -47,6 +51,10 @@ export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
+pre_patch() {
+	xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1
+}
+
 do_configure() {
 	# 4.14rc1 misses Documentation/DocBook. We ship the directory from 4.12 here.
 	cp -a $FILESDIR/DocBook -t Documentation

From ae5578af18959e24704f541bdfdbfc6b3fd190b2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 2 Mar 2021 13:38:16 +0100
Subject: [PATCH 2464/3458] libvirt: fix build race conditions

---
 srcpkgs/libvirt/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 60d9f26804e5..52c0ee252845 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -69,9 +69,16 @@ post_patch() {
 }
 
 pre_build() {
+	# racey custom targets; prevent parallelism issues
 	ninja -C build \
 		src/remote/qemu_protocol.h \
-		src/remote/remote_protocol.h
+		src/remote/remote_protocol.h \
+		src/util/virkeycodetable_linux.h \
+		src/util/virkeycodetable_osx.h \
+		src/util/virkeycodetable_win32.h \
+		src/util/virkeynametable_linux.h \
+		src/util/virkeynametable_osx.h \
+		src/util/virkeynametable_win32.h
 }
 
 post_install() {

From 532d1b8aa4fff8825c054c3e3e3edf47df4d9259 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 2 Mar 2021 13:38:59 +0100
Subject: [PATCH 2465/3458] 0ad: fix on ppc64le, musl

---
 srcpkgs/0ad/patches/ppc64.patch | 48 +++++++++++++++++++++++++++++++++
 srcpkgs/0ad/template            |  8 +++++-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/0ad/patches/ppc64.patch b/srcpkgs/0ad/patches/ppc64.patch
index 87bc3a4800d7..f95a2ecba779 100644
--- a/srcpkgs/0ad/patches/ppc64.patch
+++ b/srcpkgs/0ad/patches/ppc64.patch
@@ -1,3 +1,23 @@
+--- build/premake/premake5.lua
++++ build/premake/premake5.lua
+@@ -85,6 +85,8 @@ else
+ 			arch = "arm"
+ 		elseif string.find(machine, "aarch64") == 1 then
+ 			arch = "aarch64"
++		elseif string.find(machine, "ppc64") == 1 or string.find(machine, "powerpc64") == 1 then
++			arch = "ppc64"
+ 		elseif string.find(machine, "e2k") == 1 then
+ 			arch = "e2k"
+ 		else
+@@ -863,6 +865,8 @@ function setup_all_libs ()
+ 		table.insert(source_dirs, "lib/sysdep/arch/arm");
+ 	elseif arch == "aarch64" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/aarch64");
++	elseif arch == "ppc64" then
++		table.insert(source_dirs, "lib/sysdep/arch/ppc64");
+ 	elseif arch == "e2k" then
+ 		table.insert(source_dirs, "lib/sysdep/arch/e2k");
+ 	end
 --- /dev/null
 +++ source/lib/sysdep/arch/ppc64/ppc64.cpp
 @@ -0,0 +1,50 @@
@@ -91,3 +111,31 @@
  # error "architecture not correctly detected (either none or multiple ARCH_* defined)"
  #endif
  
+--- libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
++++ libraries/source/nvtt/src/src/nvmath/SimdVector_VE.h
+@@ -27,10 +27,7 @@
+ #ifndef NV_SIMD_VECTOR_VE_H
+ #define NV_SIMD_VECTOR_VE_H
+ 
+-#ifndef __APPLE_ALTIVEC__
+ #include <altivec.h>
+-#undef bool
+-#endif
+ 
+ namespace nv {
+ 
+diff --git a/source/nvtt/src/src/nvtt/squish/simd_ve.h b/source/nvtt/src/src/nvtt/squish/simd_ve.h
+index 5a11858..e256c54 100644
+--- libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
++++ libraries/source/nvtt/src/src/nvtt/squish/simd_ve.h
+@@ -27,10 +27,7 @@
+ #ifndef SQUISH_SIMD_VE_H
+ #define SQUISH_SIMD_VE_H
+ 
+-#ifndef __APPLE_ALTIVEC__
+ #include <altivec.h>
+-#undef bool
+-#endif
+ 
+ namespace nvsquish {
+ 
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 19609b7dda82..44abd93317b3 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -24,7 +24,6 @@ export WX_CONFIG="wx-config-gtk3"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
-	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/34866/steps/shell_3/logs/stdio"
 fi
 
 
@@ -32,6 +31,13 @@ do_extract() {
 	bsdtar xJf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}-alpha-unix-build.tar.xz -C ${wrksrc}
 }
 
+post_patch() {
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \
+			libraries/source/nvtt/src/src/nvcore/CMakeLists.txt
+	fi
+}
+
 do_configure() {
 	cd ${wrksrc}/build/workspaces
 	./clean-workspaces.sh

From e56d3b6dc4e9c300fafa255931f34d07f494bb95 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 2 Mar 2021 08:42:19 +0100
Subject: [PATCH 2466/3458] perl-Locale-Codes: update to 3.67.

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

diff --git a/srcpkgs/perl-Locale-Codes/template b/srcpkgs/perl-Locale-Codes/template
index 1242e70762e5..ae1361bf2d84 100644
--- a/srcpkgs/perl-Locale-Codes/template
+++ b/srcpkgs/perl-Locale-Codes/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Locale-Codes'
 pkgname=perl-Locale-Codes
-version=3.66
+version=3.67
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Locale-Codes"
 distfiles="${CPAN_SITE}/Locale/${pkgname/perl-/}-${version}.tar.gz"
-checksum=99facd6d56e28ca68f323d02cb7fc6c8eb9833b0696a5a833ef4ac3f5e5c57e7
+checksum=13dde2bcc15f72b0d735182da99715cc55a67fac7c7e55ae2165c52a871726d3

From 37db52952d1b722bbaccada635f05c0321f19fe0 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Tue, 2 Mar 2021 09:19:51 -0300
Subject: [PATCH 2467/3458] rust-analyzer: update to 2021.03.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 f32c3b27177d..7b767f95f384 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.22
+version=2021.03.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=dbd152018e8327427dfaf12e7887134e51ce2567f2f6ad603ca0967f9370e92d
+checksum=6893a1fc972297dddd48debf87a107b7dcf9f739e221e251e2ef86f469df365f
 
 export RUST_ANALYZER_REV=${_ver}
 

From e4fe236f0e44b42ec68b8d0be16c75aa7c766ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Mar 2021 14:42:20 +0100
Subject: [PATCH 2468/3458] libretro-mupen64plus-rpi: fix build

---
 srcpkgs/libretro-mupen64plus-rpi/patches/string.patch | 10 ++++++++++
 srcpkgs/libretro-mupen64plus-rpi/template             |  2 ++
 2 files changed, 12 insertions(+)
 create mode 100644 srcpkgs/libretro-mupen64plus-rpi/patches/string.patch

diff --git a/srcpkgs/libretro-mupen64plus-rpi/patches/string.patch b/srcpkgs/libretro-mupen64plus-rpi/patches/string.patch
new file mode 100644
index 000000000000..d38027bbd279
--- /dev/null
+++ b/srcpkgs/libretro-mupen64plus-rpi/patches/string.patch
@@ -0,0 +1,10 @@
+--- GLideN64/src/ShaderUtils.h	2019-05-31 19:25:22.000000000 +0200
++++ GLideN64/src/ShaderUtils.h	2021-03-02 14:30:43.395732704 +0100
+@@ -1,6 +1,7 @@
+ #ifndef SHADER_UTILS_H
+ #define SHADER_UTILS_H
+ 
++#include <string>
+ #include "OpenGL.h"
+ #include "Combiner.h"
+ 
diff --git a/srcpkgs/libretro-mupen64plus-rpi/template b/srcpkgs/libretro-mupen64plus-rpi/template
index 3d7e80733dd4..47752ab573e9 100644
--- a/srcpkgs/libretro-mupen64plus-rpi/template
+++ b/srcpkgs/libretro-mupen64plus-rpi/template
@@ -15,6 +15,8 @@ distfiles="https://github.com/libretro/mupen64plus-libretro/archive/${_gitrev}.t
 checksum=947abfb1d5ff34d6b22fecfb2df02bd3759fde3f4a0e5d238f65ec7e97d964d4
 conflicts="ĺibretro-mupen64plus>=0"
 
+CFLAGS="-fcommon"
+
 do_build() {
 	local _args="ARCH=arm"
 

From 3fa28f771ed70d4ffde856d123b24c63c7986b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Mar 2021 14:43:39 +0100
Subject: [PATCH 2469/3458] linux4.9: update to 4.9.258

Convert template to base tarball + patch scheme.
---
 srcpkgs/linux4.9/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee85..e4dbd5a06a2f 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -1,15 +1,18 @@
 # Template file for 'linux4.9'
 pkgname=linux4.9
-version=4.9.257
+version=4.9.258
 revision=1
-wrksrc="linux-${version}"
+wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 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=95e780fffc81de8217a31a3e6e212b69643f5344e9ba0dabaa6e426126f6d64f
+distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
+ https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
+checksum="029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a
+ 5a35fc05ba60b80588592cade43ddea4bdef0933882767bf8ad7e2a6f4ff2a4a"
 python_version=2 #unverified
+skip_extraction="patch-${version}.xz"
 patch_args="-Np1"
 
 nodebug=yes  # -dbg package is generated below manually
@@ -19,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;
@@ -46,6 +49,10 @@ export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
+pre_patch() {
+	xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1
+}
+
 do_configure() {
 	# If there's a file called <arch>-dotconfig, use it to
 	# configure the kernel; otherwise use arch defaults and all stuff

From fde6fa702c6c5e1e1f7b4467da60d1f74a7eaf42 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Mar 2021 15:54:10 +0100
Subject: [PATCH 2470/3458] libimagequant: update to 2.14.1.

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

diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template
index e6fe4f23ca9a..629732b28bbe 100644
--- a/srcpkgs/libimagequant/template
+++ b/srcpkgs/libimagequant/template
@@ -1,6 +1,6 @@
 # Template file for 'libimagequant'
 pkgname=libimagequant
-version=2.13.1
+version=2.14.1
 revision=1
 build_style=configure
 configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/lib/"
 distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz"
-checksum=1f46deec3fa280335cf7f0be3ede6006bb420ba8159a03d1f6938e8d283d03ae
+checksum=b5fa27da1f3cf3e8255dd02778bb6a51dc71ce9f99a4fc930ea69b83200a7c74
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*) configure_args+=" --enable-sse";;

From 0a905b8635edd1fc2b1730d2e8ad5ee4d7a43750 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Mar 2021 15:57:02 +0100
Subject: [PATCH 2471/3458] pngquant: update to 2.14.1.

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

diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 382eeecf7a91..9e74557dc2a8 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,6 +1,6 @@
 # Template file for 'pngquant'
 pkgname=pngquant
-version=2.13.1
+version=2.14.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-openmp"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://pngquant.org/"
 distfiles="https://github.com/pornel/${pkgname}/archive/${version}.tar.gz"
-checksum=2d462ca5739ac0afe5a6851914a48ff9d06d4fbd3c4883e8308de5dcc6d444bc
+checksum=5b2e29d61f548b18b0dd37156a49f87625123250577815add666e473fd1ca1af
 make_check_target=test
 
 case "$XBPS_TARGET_MACHINE" in

From e1c002943c2f1e1dd15382690d278857b916616c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Mar 2021 09:45:38 -0500
Subject: [PATCH 2472/3458] python-xlib: update to 0.29.

---
 srcpkgs/python-xlib/template | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python-xlib/template b/srcpkgs/python-xlib/template
index de315a200d9d..9a816ae5af11 100644
--- a/srcpkgs/python-xlib/template
+++ b/srcpkgs/python-xlib/template
@@ -1,21 +1,31 @@
 # Template file for 'python-xlib'
 pkgname=python-xlib
-version=0.27
-revision=3
+version=0.29
+revision=1
 build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools python3-setuptools_scm"
 depends="python-six"
+checkdepends="python3-pytest python3-six python3-mock
+ python-pytest python-six python-mock"
 short_desc="Fully functional X client library for Python2"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/python-xlib/python-xlib"
 distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
-checksum=a90667c70905c6ef0754c8a09fa61acbc1e1b7ddb946d527831800d7cbfe9348
+checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
 
 pre_build() {
 	sed -i '/setup_requires/d' setup.py
 }
 
+do_check() {
+	# Ignore tests that require an X11 DISPLAY
+	PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
+		python2 -m pytest --ignore test/test_xlib_display.py
+	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
+		python3 -m pytest --ignore test/test_xlib_display.py
+}
+
 python3-xlib_package() {
 	depends="python3-six"
 	short_desc="${short_desc/Python2/Python3}"

From 4af2d35c0b930ae72bc33505b20ad6623fb7ba73 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Mar 2021 09:50:27 -0500
Subject: [PATCH 2473/3458] python3-flit_core: update to 3.1.0.

---
 .../python3-flit_core/patches/use_toml.patch  | 254 ------------------
 srcpkgs/python3-flit_core/template            |   9 +-
 2 files changed, 3 insertions(+), 260 deletions(-)
 delete mode 100644 srcpkgs/python3-flit_core/patches/use_toml.patch

diff --git a/srcpkgs/python3-flit_core/patches/use_toml.patch b/srcpkgs/python3-flit_core/patches/use_toml.patch
deleted file mode 100644
index 8a0a668f6164..000000000000
--- a/srcpkgs/python3-flit_core/patches/use_toml.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From b81b1da55ef0f2768413669725d2874fcb0c29fb Mon Sep 17 00:00:00 2001
-From: Kale Kundert <kale@thekunderts.net>
-Date: Sun, 2 Feb 2020 19:22:34 -0500
-Subject: [PATCH] Replace 'pytoml' with 'toml'
-
-The pytoml package is deprecated, and doesn't support the most recent
-TOML standard (e.g. dotted keys).
----
- doc/development.rst                  |  2 +-
- doc/pyproject_toml.rst               |  2 +-
- flit/init.py                         |  2 +-
- flit/tomlify.py                      |  8 ++++----
- flit_core/flit_core/build_thyself.py |  2 +-
- flit_core/flit_core/config.py        |  2 +-
- flit_core/flit_core/sdist.py         |  2 +-
- flit_core/flit_core/wheel.py         |  2 +-
- pyproject.toml                       |  2 +-
- tests/test_init.py                   | 12 ++++++------
- tests/test_tomlify.py                |  4 ++--
- tox.ini                              |  2 +-
- 12 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git doc/development.rst doc/development.rst
-index 9b8dc5e..f714999 100644
---- doc/development.rst
-+++ doc/development.rst
-@@ -5,7 +5,7 @@ To get a development installation of Flit itself::
- 
-     git clone https://github.com/takluyver/flit.git
-     cd flit
--    python3 -m pip install docutils requests pytoml
-+    python3 -m pip install docutils requests toml
-     python3 bootstrap_dev.py
- 
- This links Flit into the current Python environment, so you can make changes
-diff --git doc/pyproject_toml.rst doc/pyproject_toml.rst
-index f9ddc7f..8d38bf9 100644
---- doc/pyproject_toml.rst
-+++ doc/pyproject_toml.rst
-@@ -120,7 +120,7 @@ Here's the full metadata section from flit itself:
-         "flit_core>=2.2.0",
-         "requests",
-         "docutils",
--        "pytoml",
-+        "toml",
-         "zipfile36; python_version in '3.3 3.4 3.5'",
-     ]
-     requires-python=">=3.5"
-diff --git flit/init.py flit/init.py
-index f7ea93a..b0c77c6 100644
---- flit/init.py
-+++ flit/init.py
-@@ -5,7 +5,7 @@
- from pathlib import Path
- import re
- import sys
--import pytoml as toml
-+import toml
- 
- def get_data_dir():
-     """Get the directory path for flit user data files.
-diff --git flit/tomlify.py flit/tomlify.py
-index 0c8db69..a9c9c60 100644
---- flit/tomlify.py
-+++ flit/tomlify.py
-@@ -5,7 +5,7 @@
- import configparser
- import os
- from pathlib import Path
--import pytoml
-+import toml
- 
- from .config import metadata_list_fields
- from .init import TEMPLATE
-@@ -40,11 +40,11 @@ def convert(path):
- 
-     written_entrypoints = False
-     with Path('pyproject.toml').open('w', encoding='utf-8') as f:
--        f.write(TEMPLATE.format(metadata=pytoml.dumps(metadata)))
-+        f.write(TEMPLATE.format(metadata=toml.dumps(metadata)))
- 
-         if scripts:
-             f.write('\n[tool.flit.scripts]\n')
--            pytoml.dump(scripts, f)
-+            toml.dump(scripts, f)
- 
-         for groupname, group in entrypoints.items():
-             if not dict(group):
-@@ -53,7 +53,7 @@ def convert(path):
-             if '.' in groupname:
-                 groupname = '"{}"'.format(groupname)
-             f.write('\n[tool.flit.entrypoints.{}]\n'.format(groupname))
--            pytoml.dump(OrderedDict(group), f)
-+            toml.dump(OrderedDict(group), f)
-             written_entrypoints = True
- 
-     print("Written 'pyproject.toml'")
-diff --git flit_core/flit_core/build_thyself.py flit_core/flit_core/build_thyself.py
-index 7daf67f..f3aaf7c 100644
---- flit_core/flit_core/build_thyself.py
-+++ flit_core/flit_core/build_thyself.py
-@@ -25,7 +25,7 @@
-     'summary': ('Distribution-building parts of Flit. '
-                     'See flit package for more information'),
-     'requires_dist': [
--        'pytoml',
-+        'toml',
-     ],
-     'requires_python': '>=3.4',
-     'classifiers': [
-diff --git flit_core/flit_core/config.py flit_core/flit_core/config.py
-index 0af9c00..6ed20d3 100644
---- flit_core/flit_core/config.py
-+++ flit_core/flit_core/config.py
-@@ -3,7 +3,7 @@
- import logging
- import os
- import os.path as osp
--import pytoml as toml
-+import toml
- import re
- 
- log = logging.getLogger(__name__)
-diff --git flit_core/flit_core/sdist.py flit_core/flit_core/sdist.py
-index 1fe5bb4..963b4e5 100644
---- flit_core/flit_core/sdist.py
-+++ flit_core/flit_core/sdist.py
-@@ -95,7 +95,7 @@ def __init__(self, module, metadata, cfgdir, reqs_by_extra, entrypoints,
- 
-     @classmethod
-     def from_ini_path(cls, ini_path: Path):
--        # Local import so bootstrapping doesn't try to load pytoml
-+        # Local import so bootstrapping doesn't try to load toml
-         from .config import read_flit_config
-         ini_info = read_flit_config(ini_path)
-         srcdir = ini_path.parent
-diff --git flit_core/flit_core/wheel.py flit_core/flit_core/wheel.py
-index 1550846..2bc55e1 100644
---- flit_core/flit_core/wheel.py
-+++ flit_core/flit_core/wheel.py
-@@ -83,7 +83,7 @@ def __init__(self, directory, module, metadata, entrypoints, target_fp):
- 
-     @classmethod
-     def from_ini_path(cls, ini_path, target_fp):
--        # Local import so bootstrapping doesn't try to load pytoml
-+        # Local import so bootstrapping doesn't try to load toml
-         from .config import read_flit_config
-         directory = ini_path.parent
-         ini_info = read_flit_config(ini_path)
-diff --git pyproject.toml pyproject.toml
-index ac8d001..0af74b2 100644
---- pyproject.toml
-+++ pyproject.toml
-@@ -11,7 +11,7 @@ requires=[
-     "flit_core>=3.0.0",
-     "requests",
-     "docutils",
--    "pytoml",
-+    "toml",
-     "zipfile36; python_version in '3.3 3.4 3.5'",
- ]
- requires-python=">=3.5"
-diff --git tests/test_init.py tests/test_init.py
-index fb8ad4d..7330ff5 100644
---- tests/test_init.py
-+++ tests/test_init.py
-@@ -6,7 +6,7 @@
- from unittest.mock import patch
- import pytest
- 
--import pytoml
-+import toml
- 
- from flit import init
- 
-@@ -107,7 +107,7 @@ def test_init():
-         generated = Path(td) / 'pyproject.toml'
-         assert_isfile(generated)
-         with generated.open() as f:
--            data = pytoml.load(f)
-+            data = toml.load(f)
-         assert data['tool']['flit']['metadata'][
-                    'author-email'] == "test@example.com"
-         license = Path(td) / 'LICENSE'
-@@ -131,7 +131,7 @@ def test_init_homepage_and_license_are_optional():
-         ti = init.TerminalIniter(td)
-         ti.initialise()
-         with Path(td, 'pyproject.toml').open() as f:
--            data = pytoml.load(f)
-+            data = toml.load(f)
-         assert not Path(td, 'LICENSE').exists()
-     metadata = data['tool']['flit']['metadata']
-     assert metadata == {
-@@ -154,7 +154,7 @@ def test_init_homepage_validator():
-         ti = init.TerminalIniter(td)
-         ti.initialise()
-         with Path(td, 'pyproject.toml').open() as f:
--            data = pytoml.load(f)
-+            data = toml.load(f)
-     metadata = data['tool']['flit']['metadata']
-     assert metadata == {
-         'author': 'Test Author',
-@@ -176,7 +176,7 @@ def test_author_email_field_is_optional():
-         ti = init.TerminalIniter(td)
-         ti.initialise()
-         with Path(td, 'pyproject.toml').open() as f:
--            data = pytoml.load(f)
-+            data = toml.load(f)
-         assert not Path(td, 'LICENSE').exists()
-     metadata = data['tool']['flit']['metadata']
-     assert metadata == {
-@@ -216,7 +216,7 @@ def test_init_readme_found_yes_choosen():
-         ti = init.TerminalIniter(td)
-         ti.initialise()
-         with Path(td, 'pyproject.toml').open() as f:
--            data = pytoml.load(f)
-+            data = toml.load(f)
- 
-     metadata = data['tool']['flit']['metadata']
-     assert metadata == {
-diff --git tests/test_tomlify.py tests/test_tomlify.py
-index 2bd75dc..a7b7978 100644
---- tests/test_tomlify.py
-+++ tests/test_tomlify.py
-@@ -1,6 +1,6 @@
- import os
- from pathlib import Path
--import pytoml
-+import toml
- from shutil import copy
- from testpath import assert_isfile
- 
-@@ -18,7 +18,7 @@ def test_tomlify(copy_sample, monkeypatch):
-     assert_isfile(pyproject_toml)
- 
-     with pyproject_toml.open(encoding='utf-8') as f:
--        content = pytoml.load(f)
-+        content = toml.load(f)
- 
-     assert 'build-system' in content
-     assert 'tool' in content
-diff --git tox.ini tox.ini
-index 08ce1bf..d1025e1 100644
---- tox.ini
-+++ tox.ini
-@@ -18,7 +18,7 @@ deps =
-     testpath
-     responses
-     docutils
--    pytoml
-+    toml
-     pytest>=2.7.3
-     pytest-cov
- 
diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template
index f3b166c60ff2..b8dffd13ec40 100644
--- a/srcpkgs/python3-flit_core/template
+++ b/srcpkgs/python3-flit_core/template
@@ -1,22 +1,19 @@
 # Template file for 'python3-flit_core'
 pkgname=python3-flit_core
-version=3.0.0
+version=3.1.0
 revision=1
 wrksrc="flit-${version}"
 build_wrksrc="flit_core"
 build_style=python3-pep517
 depends="python3-toml"
+checkdepends="python3-pytest python3-testpath $depends"
 short_desc="Simplified packaging of Python modules - PEP 517 build backend"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://flit.readthedocs.io"
 changelog="https://flit.readthedocs.io/en/latest/history.html"
 distfiles="${PYPI_SITE}/f/flit/flit-${version}.tar.gz"
-checksum=b4fe0f84a1ffbf125d003e253ec98c0b6e3e31290b31fba3ad22d28588c20893
-
-do_check() {
-	: provides no tests
-}
+checksum=c45104d677572958cbe63ae99011bed16b6e1cf5d6620bc6a8c6f1cfcd7aa40b
 
 post_install() {
 	vlicense ../LICENSE

From d3ca1621f3c33eefb9f355dd56722e3472e10ace Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Mar 2021 09:59:30 -0500
Subject: [PATCH 2474/3458] python3-psutil: update to 5.8.0.

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

diff --git a/srcpkgs/python3-psutil/template b/srcpkgs/python3-psutil/template
index 48ac54ddcfbf..e8f18070ff1a 100644
--- a/srcpkgs/python3-psutil/template
+++ b/srcpkgs/python3-psutil/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-psutil'
 pkgname=python3-psutil
-version=5.7.3
+version=5.8.0
 revision=1
 wrksrc="psutil-${version}"
 build_style=python3-module
@@ -11,8 +11,11 @@ short_desc="Cross-platform process and system utilities module for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/giampaolo/psutil"
+changelog="https://raw.githubusercontent.com/giampaolo/psutil/master/HISTORY.rst"
 distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz"
-checksum=af73f7bcebdc538eda9cc81d19db1db7bf26f103f91081d780bbacfcb620dee2
+checksum=0c9ccb99ab76025f2f0bbecf341d4656e9c1351db8cc8a03ccd62e318ab4b5c6
+# Tests seem to assume package is installed
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From f9fb37bd99db67a1253ebbd6aaecac31bb8683da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Mar 2021 10:00:42 -0500
Subject: [PATCH 2475/3458] python3-Pillow: update to 8.1.1.

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

diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
index c0e74d3f5cf1..d4c9d3fd1dea 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
-version=8.1.0
+version=8.1.1
 revision=1
 wrksrc="Pillow-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="custom:PIL"
 homepage="https://python-pillow.org"
 changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=887668e792b7edbfb1d3c9d8b5d8c859269a0f0eba4dda562adb95500f60dbba
+checksum=f6fc18f9c9c7959bf58e6faf801d14fafb6d4717faaf6f79a68c8bb2a13dcf20
 
 do_check() {
 	PYTHONPATH=$(cd build/lib.linux-* && pwd) python3 -m pytest

From 1441ff43331a2045b54fef32552921b23e776a78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 2 Mar 2021 10:16:50 -0500
Subject: [PATCH 2476/3458] python3-pandas: update to 1.2.3.

---
 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 955e14075caf..c8a7de702c09 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.2
+version=1.2.3
 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=043693dc2a2722a0a7ab4be66b2b7e47f4987225c710120d0ef97a970e296a79
+checksum=89df1a3cabd86e5dd3c7a5fdd7ec5338b2613e7a7d60f30254a4e7b08902dade
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From 58da85e9ddc189f58569565a289b693ad5509a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Mar 2021 17:19:58 +0100
Subject: [PATCH 2477/3458] linux4.4: update to 4.4.258

Convert template to base tarball + patch scheme.
---
 srcpkgs/linux4.4/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e3..d85511fe55d3 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -1,14 +1,17 @@
 # Template file for 'linux4.4'
 pkgname=linux4.4
-version=4.4.257
+version=4.4.258
 revision=1
-wrksrc="linux-${version}"
+wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 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=3e067c5625b6a1201325c45c9b9e75f87e768cfbb9426f5f173dee73dc234b5a
+distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version%.*}.tar.xz
+ ${KERNEL_SITE}/kernel/v4.x/patch-${version}.xz"
+checksum="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
+ 91504bd4be27cc24aebcbe1d7ddf5c89a7314c1d730da047ef02c46ef15c3cbd"
+skip_extraction="patch-${version}.xz"
 python_version=2 #unverified
 
 nocross=yes
@@ -19,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;
@@ -46,6 +49,10 @@ export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0}
 export KBUILD_BUILD_USER=voidlinux
 export KBUILD_BUILD_HOST=voidlinux
 
+pre_patch() {
+	xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1
+}
+
 do_configure() {
 	# If there's a file called <arch>-dotconfig, use it to
 	# configure the kernel; otherwise use arch defaults and all stuff

From ac9a3597965b121599faa84ab5c6c39f3671f337 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Tue, 2 Mar 2021 09:45:39 -0300
Subject: [PATCH 2478/3458] circleci-cli: update to 0.1.15044.

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

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index 0b4049bea15d..fc1be221333e 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
-version=0.1.9578
+version=0.1.15044
 revision=1
 build_style=go
 go_import_path=github.com/CircleCI-Public/${pkgname}
@@ -11,7 +11,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="MIT"
 homepage="https://circleci-public.github.io/circleci-cli/"
 distfiles="https://github.com/CircleCI-Public/${pkgname}/archive/v${version}.tar.gz"
-checksum=d5dac07d27d97ee41dced89cf2b36dfeea17906343b6a6a21c1d8c4ca34a78a0
+checksum=b3206f5fbb6da7588fa93e8b2e8bd91f3a4f73da8979d517273f6db275680105
 
 pre_build() {
 	packr2

From cd5315b49ab5bb762cc0b3185705e1fe161ff1c1 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 2 Mar 2021 11:50:12 +0100
Subject: [PATCH 2479/3458] xprintidle: update to 0.2.4, fix license.

---
 srcpkgs/xprintidle/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xprintidle/template b/srcpkgs/xprintidle/template
index a6d77d4077e1..0ef278ca6acf 100644
--- a/srcpkgs/xprintidle/template
+++ b/srcpkgs/xprintidle/template
@@ -1,12 +1,13 @@
 # Template file for 'xprintidle'
 pkgname=xprintidle
-version=0.2.2
-revision=2
-build_style=gnu-configure
-makedepends="libXScrnSaver-devel"
+version=0.2.4
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libX11-devel libXext-devel libXScrnSaver-devel"
 short_desc="Query X server for user's idle time and print it in milliseconds"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/g0hl1n/xprintidle"
 distfiles="https://github.com/g0hl1n/xprintidle/archive/${version}.tar.gz"
-checksum=8484ac3c748214ae8330f84974bf92aee76033a4072ea86b02cd0f831ac0b6a6
+checksum=fe4e14743a449d67917babc7b29082e12e1a4bfff7efe4b88e3a34a5fc791d01

From 144414f6b1c704c4a826a12d7cad8432c55f4daf Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 1 Mar 2021 19:25:36 +0300
Subject: [PATCH 2480/3458] fish-shell: update to 3.2.0

From 3.2.0 onward, the distfiles will be in XZ format
---
 srcpkgs/fish-shell/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 82c5969f5999..250c07b7fe1f 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,18 +1,19 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=3.1.2
-revision=2
+version=3.2.0
+revision=1
 wrksrc="fish-${version}"
 build_style=cmake
 hostmakedepends="gettext"
 makedepends="ncurses-devel pcre2-devel gettext-devel"
 depends="groff"
+checkdepends="python3-pexpect procps-ng"
 short_desc="User friendly shell intended mostly for interactive use"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://fishshell.com/"
-distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.gz"
-checksum=d5b927203b5ca95da16f514969e2a91a537b2f75bec9b21a584c4cd1c7aa74ed
+distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
+checksum=4f0293ed9f6a6b77e47d41efabe62f3319e86efc8bf83cc58733044fbc6f9211
 register_shell="/bin/fish /usr/bin/fish"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -21,5 +22,5 @@ fi
 
 post_install() {
 	# Starting with fish-3.0.0 this is a skeleton file with only comments
-	rm -f "${DESTDIR}/usr/etc/fish/config.fish"
+	rm "${DESTDIR}/usr/etc/fish/config.fish"
 }

From 004cb9e1ca0ec634d32bd76c1331c5787c54aea5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 2 Mar 2021 10:10:09 +0400
Subject: [PATCH 2481/3458] libbytesize: update to 2.5.

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

diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index ce35ad28fa26..78054a72adb7 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,7 +1,7 @@
 # Template file for 'libbytesize'
 pkgname=libbytesize
-version=2.4
-revision=2
+version=2.5
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext python3"
 makedepends="mpfr-devel pcre2-devel"
@@ -12,7 +12,9 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/storaged-project/libbytesize"
 changelog="https://raw.githubusercontent.com/storaged-project/libbytesize/master/NEWS.rst"
 distfiles="https://github.com/storaged-project/libbytesize/releases/download/${version}/libbytesize-${version}.tar.gz"
-checksum=25ccb5762bb8c860b63ed1d40e0c5564e3e0084693fbe6554467a8ca1c1d8c7f
+checksum=6305addae2b7be313dbfc36b96094ec0544d5144859ab4a5685ca6d314d6fdda
+# checks fails in libbytesize_unittest.sh
+make_check=no
 
 pre_check() {
 	# Disable test that depends on unpackaged pocketlint

From b4f3c17f83c234eaaec4512a259e80351916f61c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 2 Mar 2021 10:09:25 +0100
Subject: [PATCH 2482/3458] nootka: update to 1.4.7.

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

diff --git a/srcpkgs/nootka/template b/srcpkgs/nootka/template
index 96ce072977c8..b477c90e05b1 100644
--- a/srcpkgs/nootka/template
+++ b/srcpkgs/nootka/template
@@ -1,6 +1,6 @@
 # Template file for 'nootka'
 pkgname=nootka
-version=1.4.6
+version=1.4.7
 revision=1
 wrksrc="nootka-${version}-source"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://nootka.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/nootka/Nootka-${version}/nootka-${version}-source.tar.bz2"
-checksum=26b94b90065d11a47c9f6d091ebc2c1c449f4ef26202d203045199900b2e3514
+checksum=1d85a2970ddb51117b0a98df4d84ca9e9498fbd1d2b1c55bfa62931333a73cf9

From 6d2ed56774cd927c42e82923a75a9d46ef84d75e Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 2 Mar 2021 10:24:13 +0100
Subject: [PATCH 2483/3458] comrak: update to 0.9.1.

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

diff --git a/srcpkgs/comrak/template b/srcpkgs/comrak/template
index 83ddda5deb3d..75e0ee9e60fd 100644
--- a/srcpkgs/comrak/template
+++ b/srcpkgs/comrak/template
@@ -1,6 +1,6 @@
 # Template file for 'comrak'
 pkgname=comrak
-version=0.9.0
+version=0.9.1
 revision=1
 build_style=cargo
 short_desc="CommonMark + GFM compatible Markdown parser and renderer"
@@ -8,7 +8,7 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="BSD-2-Clause"
 homepage="https://github.com/kivikakk/comrak"
 distfiles="https://github.com/kivikakk/comrak/archive/${version}.tar.gz"
-checksum=0a7c134dfe937abb40e0c681ebcb3a5a30299b93bc9b15058d24dd77a3bb61c2
+checksum=c5415987223ebcc64357eab720219d3d8393b61cedb58dc35396cc0249726986
 
 post_install() {
 	vlicense COPYING

From de8b4fdba896e7c4be19b1b004d2377acb480ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:19:52 -0300
Subject: [PATCH 2484/3458] key-mon: remove package.

Unmaintained by upstream, python2 and gtk2 only.
---
 srcpkgs/key-mon/template          | 18 ------------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 srcpkgs/key-mon/template

diff --git a/srcpkgs/key-mon/template b/srcpkgs/key-mon/template
deleted file mode 100644
index bd412a560fd7..000000000000
--- a/srcpkgs/key-mon/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'key-mon'
-pkgname=key-mon
-version=1.17
-revision=5
-build_style=python2-module
-hostmakedepends="python"
-depends="dbus-glib pygtk python-dbus python-xlib"
-short_desc="Utility to show live keyboard and mouse status"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://code.google.com/p/key-mon"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/key-mon-${version}.tar.gz"
-checksum=b8d029b375e7f876d44db6b72ed3e7e6c0372a9e9dc21ea85d9055cc7a033fd2
-
-post_install() {
-	vinstall icons/key-mon.desktop 644 usr/share/applications
-	vinstall icons/key-mon.xpm 644 usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 256e5e699548..bdce95640a4a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -161,6 +161,7 @@ replaces="
  kadu<=4.3_6
  keepassx<=0.4.4_2
  keepassx2<=2.0.3_2
+ key-mon<=1.17_5
  libapp<=20140527_2
  libdbusmenu-qt<=0.9.2_4
  libfcitx-qt<=4.2.9.8_1

From 86f42161e0b5ce7db86af64aa6aaf343b25cc787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:44:40 -0300
Subject: [PATCH 2485/3458] python-xlib: become python3-xlib, simplify testing

---
 srcpkgs/python-xlib/template                 | 35 --------------------
 srcpkgs/python3-xlib                         |  1 -
 srcpkgs/python3-xlib/template                | 19 +++++++++++
 srcpkgs/{python-xlib => python3-xlib}/update |  0
 srcpkgs/removed-packages/template            |  1 +
 5 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-xlib/template
 delete mode 120000 srcpkgs/python3-xlib
 create mode 100644 srcpkgs/python3-xlib/template
 rename srcpkgs/{python-xlib => python3-xlib}/update (100%)

diff --git a/srcpkgs/python-xlib/template b/srcpkgs/python-xlib/template
deleted file mode 100644
index 9a816ae5af11..000000000000
--- a/srcpkgs/python-xlib/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-xlib'
-pkgname=python-xlib
-version=0.29
-revision=1
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools_scm"
-depends="python-six"
-checkdepends="python3-pytest python3-six python3-mock
- python-pytest python-six python-mock"
-short_desc="Fully functional X client library for Python2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/python-xlib/python-xlib"
-distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
-checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
-
-pre_build() {
-	sed -i '/setup_requires/d' setup.py
-}
-
-do_check() {
-	# Ignore tests that require an X11 DISPLAY
-	PYTHONPATH="$(cd build-2.7/lib* && pwd)" \
-		python2 -m pytest --ignore test/test_xlib_display.py
-	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" \
-		python3 -m pytest --ignore test/test_xlib_display.py
-}
-
-python3-xlib_package() {
-	depends="python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-xlib b/srcpkgs/python3-xlib
deleted file mode 120000
index c2832fd0e802..000000000000
--- a/srcpkgs/python3-xlib
+++ /dev/null
@@ -1 +0,0 @@
-python-xlib
\ No newline at end of file
diff --git a/srcpkgs/python3-xlib/template b/srcpkgs/python3-xlib/template
new file mode 100644
index 000000000000..ba653b4786fc
--- /dev/null
+++ b/srcpkgs/python3-xlib/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-xlib'
+pkgname=python3-xlib
+version=0.29
+revision=2
+wrksrc=python-xlib-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-six"
+checkdepends="$depends xvfb-run python3-nose python3-mock"
+short_desc="Fully functional X client library for Python3"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/python-xlib/python-xlib"
+distfiles="${homepage}/releases/download/${version}/python-xlib-${version}.tar.bz2"
+checksum=1c7ed1da3fc507e5cdb636c55b3619aac3c7a226b01860191bcba887d7ebeb6d
+
+do_check() {
+	python3 runtests.py
+}
diff --git a/srcpkgs/python-xlib/update b/srcpkgs/python3-xlib/update
similarity index 100%
rename from srcpkgs/python-xlib/update
rename to srcpkgs/python3-xlib/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bdce95640a4a..084e0e263e4b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -211,6 +211,7 @@ replaces="
  python-pyside<=1.2.2_7
  python-pytest-relaxed<=1.1.2_2
  python-sqlite<=2.8.3_1
+ python-xlib<0.29_1
  python3-Django<=3.0.7_2
  python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4

From c407e9426a0f439438cf001f7c8b6e4f9aade8f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 15:46:07 -0300
Subject: [PATCH 2486/3458] removed-packages: revbump for removal of some
 python packages.

---
 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 084e0e263e4b..73dde9284a6c 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=32
+revision=33
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From a966226e84a6bbdf906477605d33f04c76725965 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 2 Mar 2021 21:07:31 +0100
Subject: [PATCH 2487/3458] icdiff: update to 2.0.0.

---
 srcpkgs/icdiff/template | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 77ed89b25982..c357948e27c2 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,39 +1,28 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=1.9.5
-revision=3
+version=2.0.0
+revision=1
 wrksrc="${pkgname}-release-${version}"
-build_style=python-module
-pycompile_module="icdiff.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-setuptools"
-short_desc="Improved colored diff (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-setuptools"
+short_desc="Side-by-side highlighted command line diffs"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=f2e3df30e93df92224538ef3c62a73891af92de4caf94e8117582835e1040fc7
+checksum=bce07ff4995aafe9de274ca0a322e56275dc264948b125457d2cc73dd7e9eee2
 
-alternatives="
- icdiff:icdiff:/usr/bin/icdiff2
- icdiff:git-icdiff:/usr/bin/git-icdiff2"
+replaces="python3-icdiff>=0"
+provides="python3-icdiff-${version}_${revision}"
 
 post_install() {
 	vlicense LICENSE
 }
 
 python3-icdiff_package() {
-	depends="python3 python3-setuptools"
-	pycompile_module="icdiff.py"
-	alternatives="
-	 icdiff:icdiff:/usr/bin/icdiff3
-	 icdiff:git-icdiff:/usr/bin/git-icdiff3"
-	short_desc="${short_desc/2/3}"
-	pkg_install() {
-		vmove usr/bin/icdiff3
-		vmove usr/bin/git-icdiff3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
+	build_style=meta
+	short_desc+=" - transitional dummy pkg"
+	depends="icdiff"
 }

From 9cb8802a651a0dfb9e83f62ecf223e1a96e81172 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 2 Mar 2021 15:29:35 -0500
Subject: [PATCH 2488/3458] salt: update to 3002.5.

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

diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index a44ca3a7ff8d..7f5386a77182 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,6 +1,6 @@
 # Template file for 'salt'
 pkgname=salt
-version=3002.2
+version=3002.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="http://saltstack.org/"
 changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
 distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
-checksum=bd6d29621ce8e099412777cd396af35474aa112bb0999b5da804387d87290075
+checksum=c8ab404335104351066ec1bcc42278aa77e24aaacc308603939d75aba05519af
 conf_files="
  /etc/salt/cloud.providers.d/digitalocean.conf
  /etc/salt/cloud.providers.d/vsphere.conf

From d7192f8ca5d4066069fc1267ce690f464629b75c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 2 Mar 2021 22:30:41 +0100
Subject: [PATCH 2489/3458] clojure: update to 1.10.2.796.

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

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index e499dcdddde3..d119c8e82de8 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,6 +1,6 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.1.697
+version=1.10.2.796
 revision=1
 wrksrc="clojure-tools"
 depends="virtual?java-environment rlwrap"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"
 homepage="https://clojure.org/"
 distfiles="https://download.clojure.org/install/clojure-tools-${version}.tar.gz"
-checksum=700dd4a4fad95eda3392fd9f6026bbb4b0a3f31d7bf6c01324f225623f365974
+checksum=af8feacb8f4ad3135c10b7cd60b996c230f2d133f10dd1549e6beeb79577da7b
 
 do_install() {
 	vmkdir /usr/lib/clojure

From b7faccce3044427b57c78350c4afa3cb0747d069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Mar 2021 22:39:49 +0100
Subject: [PATCH 2490/3458] leatherman: update to 1.12.4

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

diff --git a/common/shlibs b/common/shlibs
index aaf452e0bb59..c836cc1a3775 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2558,15 +2558,15 @@ libOpenCOLLADABaseUtils.so opencollada-0.0.20160223_1
 libOpenCOLLADAFramework.so opencollada-0.0.20160223_1
 libOpenCOLLADASaxFrameworkLoader.so opencollada-0.0.20160223_1
 libOpenCOLLADAStreamWriter.so opencollada-0.0.20160223_1
-leatherman_util.so.1.12.3 leatherman-1.12.3_1
-leatherman_locale.so.1.12.3 leatherman-1.12.3_1
-leatherman_logging.so.1.12.3 leatherman-1.12.3_1
-leatherman_json_container.so.1.12.3 leatherman-1.12.3_1
-leatherman_file_util.so.1.12.3 leatherman-1.12.3_1
-leatherman_curl.so.1.12.3 leatherman-1.12.3_1
-leatherman_dynamic_library.so.1.12.3 leatherman-1.12.3_1
-leatherman_execution.so.1.12.3 leatherman-1.12.3_1
-leatherman_ruby.so.1.12.3 leatherman-1.12.3_1
+leatherman_util.so.1.12.4 leatherman-1.12.4_1
+leatherman_locale.so.1.12.4 leatherman-1.12.4_1
+leatherman_logging.so.1.12.4 leatherman-1.12.4_1
+leatherman_json_container.so.1.12.4 leatherman-1.12.4_1
+leatherman_file_util.so.1.12.4 leatherman-1.12.4_1
+leatherman_curl.so.1.12.4 leatherman-1.12.4_1
+leatherman_dynamic_library.so.1.12.4 leatherman-1.12.4_1
+leatherman_execution.so.1.12.4 leatherman-1.12.4_1
+leatherman_ruby.so.1.12.4 leatherman-1.12.4_1
 libUTF.so opencollada-0.0.20160223_1
 libbuffer.so opencollada-0.0.20160223_1
 libftoa.so opencollada-0.0.20160223_1
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index e8b2080deb22..5f28459fd73c 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,6 +1,6 @@
 # Template file for 'leatherman'
 pkgname=leatherman
-version=1.12.3
+version=1.12.4
 revision=1
 build_style=cmake
 configure_args="-DLEATHERMAN_SHARED=ON"
@@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="Apache-2.0"
 homepage="https://github.com/puppetlabs/leatherman/"
 distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=0d470b6f3240bc605f48631546dd77c814116b1ff6b2a36aa9f395c4a4eab319
+checksum=00f1b50a7f5f15fcb8dcf0e242f8ada7d31ec78b6093152eee8744e3e284dc28
 python_version=3
 
 CXXFLAGS="-Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value -Wno-deprecated-copy -Wno-type-limits"

From 20ff924209edb7341ea528d9cc4071ad620423f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Mar 2021 22:40:15 +0100
Subject: [PATCH 2491/3458] facter: update to 3.14.16

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

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d0..5cd87050a711 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
-version=3.14.11
-revision=5
+version=3.14.16
+revision=1
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://puppet.com/docs/puppet/latest/facter.html"
 distfiles="https://downloads.puppetlabs.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=098a318a68124d8d8db4b152888c0ecf2ff0e48228a6fe064d907a87f72e8cbd
+checksum=196c69b1ae325dbf11f68025eb12b9c53c054bee9112bd4f3e2ece8c5fe76571
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in

From 55ef95b05375fdbd64af5f27f59d9f119ec1323a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Mar 2021 23:23:03 +0100
Subject: [PATCH 2492/3458] facter: add CMAKE_INSTALL_LIBDIR

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

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 5cd87050a711..9a223f79b3b6 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -4,7 +4,7 @@ version=3.14.16
 revision=1
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
- -DENABLE_CXX_WERROR=OFF"
+ -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
 hostmakedepends="ruby-devel"
 makedepends="boost-devel cpp-hocon leatherman-devel libblkid-devel libcurl-devel
  ruby-devel yaml-cpp-devel"

From ff3210e3be5c80ec56cb8cc164a46a44fcb6527b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 2 Mar 2021 23:34:50 +0100
Subject: [PATCH 2493/3458] facter: fix up vendor_ruby install path

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

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 9a223f79b3b6..9fca63a366b7 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -22,6 +22,11 @@ pre_configure() {
 	esac
 }
 
+post_build() {
+	# fixup vendor_ruby usr/lib{32,64} install path to always use usr/lib
+	vsed -i build/lib/cmake_install.cmake -e "s;lib32;lib;g" -e "s;lib64;lib;g"
+}
+
 facter-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From 7c1d42bcf4349d5c3270475d207438ea62c62d60 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 2 Mar 2021 21:50:10 +0100
Subject: [PATCH 2494/3458] praat: update to 6.1.40

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

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 2bb97e3710b7..6fed29714eab 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.1.37
+version=6.1.40
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.praat.org/"
 changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html"
 distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz"
-checksum=991426e002fee0b846dd8bb4cc5c83831478985af40abb43a76af98307cb1ca8
+checksum=86bdcbe7810080532ffe65c92d44028cedf54813ec2d31674a53b3e7ceb8e100
 
 # there are a number of pre-defined Makefiles for certain configurations
 # build options are used to choose which one to use among a selected few

From af4ce8105c543e5ad5d1948e9c26cb4561631305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Tue, 2 Mar 2021 22:12:57 +0100
Subject: [PATCH 2495/3458] Clight: Update to 4.4

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

diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index e77ac5ee11e2..be2ad8c973e7 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,6 +1,6 @@
 # Template file for 'Clight'
 pkgname=Clight
-version=4.3
+version=4.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ 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=f354ba50fd74931c1fecc832f41334bae7c98c3aad81341bbbd79bd4d7853982
+checksum=1371ac6f537cec4fc61581dbb6ceb143df08f20e24f884fa148068008864b054
 
 post_install() {
 	vcompletion Extra/completions/_clight zsh

From 82e5dbbd13447a430ffef1909d91d9f7e3824bd9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 2 Mar 2021 23:23:41 +0200
Subject: [PATCH 2496/3458] cantarell-fonts: update to 0.301.

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

diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template
index f052bb14fd2b..e9ef2be85d80 100644
--- a/srcpkgs/cantarell-fonts/template
+++ b/srcpkgs/cantarell-fonts/template
@@ -1,7 +1,7 @@
 # Template file for 'cantarell-fonts'
 pkgname=cantarell-fonts
-version=0.201
-revision=2
+version=0.301
+revision=1
 build_style=meson
 configure_args="-Dfontsdir=/usr/share/fonts/cantarell -Duseprebuilt=true -Dbuildappstream=true"
 hostmakedepends="gettext pkg-config meson appstream-glib"
@@ -12,4 +12,4 @@ license="OFL-1.1"
 homepage="https://wiki.gnome.org/Projects/CantarellFonts"
 changelog="https://gitlab.gnome.org/GNOME/cantarell-fonts/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=b61f64e5f6a48aa0abc7a53cdcbce60de81908ca36048a64730978fcd9ac9863
+checksum=3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83

From e385c270dcaa57e529a634452e2b92bf2285d496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 19:58:28 -0300
Subject: [PATCH 2497/3458] xbps-src/shutils/show: remove outdated long_desc
 printing.

---
 common/xbps-src/shutils/show.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/xbps-src/shutils/show.sh b/common/xbps-src/shutils/show.sh
index e2f50f618ad8..d781d07aae86 100644
--- a/common/xbps-src/shutils/show.sh
+++ b/common/xbps-src/shutils/show.sh
@@ -59,7 +59,6 @@ show_pkg() {
         fi
     done
     IFS="$OIFS"
-    [ -n "$long_desc" ] && echo "long_desc: $long_desc"
 
     return 0
 }

From 3555a2f137a04fbe3d6bfabf165b6b06f5a1b342 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 3 Mar 2021 00:06:56 +0100
Subject: [PATCH 2498/3458] xpra: don't hard-depend on pandoc

---
 srcpkgs/xpra/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index a3763f74eb43..fa7e05e87fca 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,9 +1,10 @@
 # Template file for 'xpra'
 pkgname=xpra
 version=4.1
-revision=1
+revision=2
 build_style=python3-module
-hostmakedepends="pkg-config python3-Cython pandoc"
+make_install_args="$(vopt_with docs)"
+hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)"
 makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel
  libvpx-devel libwebp-devel libxkbfile-devel python3-gobject-devel x264-devel
  gtk+3-devel pam-devel"
@@ -21,6 +22,13 @@ conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"
 
+build_options="docs"
+desc_option_docs="Enable documentation"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686*|ppc64le*) build_options_default="docs" ;;
+esac
+
 if [ -z "$CROSS_BUILD" ]; then
 	depends+=" python3-PyOpenGL-accelerate"
 	case "$XBPS_TARGET_MACHINE" in

From 093963ae2015ce8073e2308552ce62d10a9ea2c6 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 2 Mar 2021 21:49:48 +0100
Subject: [PATCH 2499/3458] po4a: update to 0.63

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

diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index 6d1a385491f0..c0094f9eaa9c 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
 # Template file for 'po4a'
 pkgname=po4a
-version=0.62
+version=0.63
 revision=1
 build_style=perl-ModuleBuild
 _perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -14,4 +14,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://po4a.org/"
 distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=ef8ea68ceafd810a70c6d2aead57268375542a61d9b7c36ddd2550c9b8708430
+checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595

From c520dfe5679ff0ac6969a8ae1bf4064be55f9584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 21:21:14 -0300
Subject: [PATCH 2500/3458] asciidoc: update to 9.1.0.

distfiles were moved to asciidoc-py repository.
---
 srcpkgs/asciidoc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index bee49904ba4b..48af373b5e46 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -1,8 +1,8 @@
 # Template file for 'asciidoc'
 pkgname=asciidoc
-version=9.0.5
+version=9.1.0
 revision=1
-wrksrc=${pkgname}-py3-${version}
+wrksrc=${pkgname}-py-${version}
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl libxslt python3"
 depends="docbook-xsl libxslt python3"
@@ -12,8 +12,8 @@ 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=b73248717403fe49ef239b2bdb95f2b603e0af15ddd8f5e420f27707010bf95f
+distfiles="https://github.com/asciidoc/asciidoc-py/archive/${version}.tar.gz"
+checksum=5056c20157349f8dc74f005b6e88ccbf1078c4e26068876f13ca3d1d7d045fe7
 
 pre_configure() {
 	autoreconf -fi

From 50224096f11e019e487f7166a0638e8444c793be Mon Sep 17 00:00:00 2001
From: Phosu Parsons <38191182+phossil@users.noreply.github.com>
Date: Mon, 1 Mar 2021 11:53:54 -0600
Subject: [PATCH 2501/3458] iio-sensor-proxy: update to 3.0

---
 srcpkgs/iio-sensor-proxy/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index b8bd70035357..e8cff0494b99 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,16 +1,16 @@
 # Template file for 'iio-sensor-proxy'
 pkgname=iio-sensor-proxy
-version=2.8
+version=3.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool"
 makedepends="libgudev-devel gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-homepage="https://github.com/hadess/iio-sensor-proxy"
-distfiles="$homepage/archive/$version.tar.gz"
-checksum=3129e89777ad308400685d3da16931b404ecc4d6b0a48fe217b405e3310a8373
+license="GPL-3.0-or-later"
+homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
+distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=77f6009050afcabdf324b187992c33c6f1d937fc9e2c18ec76d9120fa107f3ba
 patch_args="-Np1"
 
 pre_configure() {

From 3edf35342055df1ed86014b23c78ad7fddd3fc1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 2 Mar 2021 21:33:13 -0300
Subject: [PATCH 2502/3458] Bear: update to 2.4.4.

Holding off from 3.x series because the C++ rewrite seems to have mostly
introduced regressions for now.
---
 srcpkgs/Bear/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index b2d8cd337659..97db1a9541e8 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,6 +1,6 @@
 # Template file for 'Bear'
 pkgname=Bear
-version=2.4.3
+version=2.4.4
 revision=1
 build_style=cmake
 hostmakedepends="python3"
@@ -11,4 +11,5 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/rizsotto/Bear"
 changelog="https://raw.githubusercontent.com/rizsotto/Bear/master/ChangeLog.md"
 distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=74057678642080d193a9f65a804612e1d5b87da5a1f82ee487bbc44eb34993f2
+checksum=5e95c9fe24714bcb98b858f0f0437aff76ad96b1d998940c0684c3a9d3920e82
+python_version=3

From 29b0093d096bed455b8c192b9165edcf712001ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Mar 2021 20:28:53 -0300
Subject: [PATCH 2503/3458] grpc: add libressl-devel to grpc-devel.

Noticed dependency was required when trying to build Bear 3.0.8.
---
 srcpkgs/grpc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index e915c4322b8d..a2d328497b0b 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.36.0
-revision=1
+revision=2
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,8 +10,8 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
- libprotoc-devel protobuf-devel gperftools-devel re2-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel libressl-devel"
+makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
@@ -58,7 +58,7 @@ post_install() {
 
 grpc-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} c-ares-devel re2-devel zlib-devel"
+	depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.so

From a51709ec34eb223c9477c12f01851fe3f89b245a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Tue, 2 Mar 2021 18:28:21 -0700
Subject: [PATCH 2504/3458] python3-aniso8601: update to 9.0.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 6b820944a6eb..768e5792b8b4 100644
--- a/srcpkgs/python3-aniso8601/template
+++ b/srcpkgs/python3-aniso8601/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-aniso8601'
 pkgname=python3-aniso8601
-version=9.0.0
+version=9.0.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=1c38967317cf761d2ccd908a9d4b654eace289d7bddfb586594e85911956af86
+checksum=72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973
 
 post_install() {
 	vlicense LICENSE

From 9a306b0bed63a9d5337991939dc8cb5f2910e9ce Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Tue, 2 Mar 2021 18:29:41 -0700
Subject: [PATCH 2505/3458] python3-rich: update to 9.12.4.

---
 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 929f3c62c2b2..5b95b25382d6 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.12.3
+version=9.12.4
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,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=77bd13c72350c4907540be33910c0ec13bebb68fba4986e055fb564338f9e94a
+checksum=1e000895221df23cd7f828a9511c15d10189850d4f923b6d8c3d29a32ca95265
 
 post_install() {
 	vlicense LICENSE

From 7d01ccc98d203e5248bcbcf4319416aa8267a9f8 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 3 Mar 2021 09:12:00 +0100
Subject: [PATCH 2506/3458] google-chrome: update to 89.0.4389.72

---
 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 1342f756d196..6b43da734912 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=88.0.4324.182
+_chromeVersion=89.0.4389.72
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=ab00e9412f5f20e30c7db5dc987473248f4adf9ebf2c3f928ef62e1ffb104fe6
+checksum=8b3ee655bf8c8114f4a6494c2161938582ad8cbe683251760ebe0363f2eb4dc0
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 9e530877105bb3aeb831ef492dd47688bb0dd7ba Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 3 Mar 2021 11:48:31 +0100
Subject: [PATCH 2507/3458] 0ad: touch template (didn't rebuild on musl?)

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

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 44abd93317b3..14c0bf1b193b 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -20,6 +20,7 @@ nocross="uses bundled third-party libraries that do not cross-compile"
 CXXFLAGS="-fpermissive"
 # Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl
 LDFLAGS="-fuse-ld=bfd"
+
 export WX_CONFIG="wx-config-gtk3"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 6bdf193f81845741df4d03c11c23c42aab78942d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 3 Mar 2021 11:52:00 +0100
Subject: [PATCH 2508/3458] 0ad: bump to force rebuild (musl isn't picking it
 up)

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

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 14c0bf1b193b..f98525f995be 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.24
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 create_wrksrc=yes
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"

From 3b1eb29a912d952d2efabed1424cdbe2f5f6932a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:16:26 -0300
Subject: [PATCH 2509/3458] asciidoc: resolve redirection in distfiles.

Org name has been changed to asciidoc-py as well, so use that directly
instead of relying on redirection by github.
---
 srcpkgs/asciidoc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index 48af373b5e46..45e6be7bc7e6 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -12,7 +12,7 @@ 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-py/archive/${version}.tar.gz"
+distfiles="https://github.com/asciidoc-py/asciidoc-py/archive/${version}.tar.gz"
 checksum=5056c20157349f8dc74f005b6e88ccbf1078c4e26068876f13ca3d1d7d045fe7
 
 pre_configure() {

From 869ac88af18c81400514199f150fa70476f5a885 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 Mar 2021 09:10:24 +0700
Subject: [PATCH 2510/3458] sun7i-kernel: fix build

A better fix is:

	git rm -rf \
		srcpkgs/a10disp \
		srcpkgs/bananapi-base \
		srcpkgs/cubieboard2-base \
		srcpkgs/cubieboard2-uboot \
		srcpkgs/cubietruck-base \
		srcpkgs/sun7i-kernel \
		srcpkgs/sun7i-kernel-headers

However, until consensus reached, let's not block openssl rebuild.
---
 .../0001-ARM-fix-put_user-for-gcc-8.patch     | 45 +++++++++++++++++++
 srcpkgs/sun7i-kernel/patches/fix-cflags.patch | 13 ++++++
 srcpkgs/sun7i-kernel/template                 | 15 ++++---
 3 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/sun7i-kernel/patches/0001-ARM-fix-put_user-for-gcc-8.patch
 create mode 100644 srcpkgs/sun7i-kernel/patches/fix-cflags.patch

diff --git a/srcpkgs/sun7i-kernel/patches/0001-ARM-fix-put_user-for-gcc-8.patch b/srcpkgs/sun7i-kernel/patches/0001-ARM-fix-put_user-for-gcc-8.patch
new file mode 100644
index 000000000000..00570f8cf3ed
--- /dev/null
+++ b/srcpkgs/sun7i-kernel/patches/0001-ARM-fix-put_user-for-gcc-8.patch
@@ -0,0 +1,45 @@
+From 0ca85fc310e8c24cba10ed241a0188795e177683 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 26 Jul 2018 10:13:23 +0200
+Subject: [PATCH] ARM: fix put_user() for gcc-8
+
+Building kernels before linux-4.7 with gcc-8 results in many build failures
+when gcc triggers a check that was meant to catch broken compilers:
+
+/tmp/ccCGMQmS.s:648: Error: .err encountered
+
+According to the discussion in the gcc bugzilla, a local "register
+asm()" variable is still supposed to be the correct way to force an
+inline assembly to use a particular register, but marking it 'const'
+lets the compiler do optimizations that break that, i.e the compiler is
+free to treat the variable as either 'const' or 'register' in that case.
+
+Upstream commit 9f73bd8bb445 ("ARM: uaccess: remove put_user() code
+duplication") fixed this problem in linux-4.8 as part of a larger change,
+but seems a little too big to be backported to 4.4.
+
+Let's take the simplest fix and change only the one broken line in the
+same way as newer kernels.
+
+Suggested-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
+Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745
+Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86673
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/include/asm/uaccess.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
+index 35c9db857ebe..cd8b589111ba 100644
+--- a/arch/arm/include/asm/uaccess.h
++++ b/arch/arm/include/asm/uaccess.h
+@@ -251,7 +251,7 @@ extern int __put_user_8(void *, unsigned long long);
+ 	({								\
+ 		unsigned long __limit = current_thread_info()->addr_limit - 1; \
+ 		const typeof(*(p)) __user *__tmp_p = (p);		\
+-		register const typeof(*(p)) __r2 asm("r2") = (x);	\
++		register typeof(*(p)) __r2 asm("r2") = (x);	\
+ 		register const typeof(*(p)) __user *__p asm("r0") = __tmp_p; \
+ 		register unsigned long __l asm("r1") = __limit;		\
+ 		register int __e asm("r0");				\
diff --git a/srcpkgs/sun7i-kernel/patches/fix-cflags.patch b/srcpkgs/sun7i-kernel/patches/fix-cflags.patch
new file mode 100644
index 000000000000..16117cfaf9f3
--- /dev/null
+++ b/srcpkgs/sun7i-kernel/patches/fix-cflags.patch
@@ -0,0 +1,13 @@
+Index: arch/arm/mach-sun7i/pm/standby/Makefile
+===================================================================
+--- a/arch/arm/mach-sun7i/pm/standby/Makefile.orig
++++ b/arch/arm/mach-sun7i/pm/standby/Makefile
+@@ -15,6 +15,8 @@ LD_FILE = standby.xn
+ KBUILD_CFLAGS := $(LINUXINCLUDE) -I$(srctree)/arch/arm/mach-sun7i/pm -Os -g -c
+ KBUILD_CFLAGS += -nostdlib -march=armv7-a -marm -mlittle-endian -D__STANDBY_MODULE__
+ KBUILD_CFLAGS += -fno-unwind-tables -fno-asynchronous-unwind-tables
++KBUILD_CFLAGS += -fno-builtin -fno-tree-loop-distribute-patterns
++KBUILD_CFLAGS += -fno-stack-protector
+ KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ 
+ LDFLAGS_standby.elf := -T
diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d7..e8d90d530157 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -20,9 +20,11 @@ checksum="e3de775107e7ba6ad0cf3345844fca1d61c8a11037fa71a5238ead439d15a166
  eeceb6459f2f40c91a6a5be8d8c60e68dec2631ec84d6165721edacb059507c4
  f0bba58788f090dd213df0bde1ea0ce38999a8d28bebe443c899cb9cbc2b5eed"
 
-create_wrksrc=yes
-build_wrksrc="linux-sunxi-${_githash}"
+wrksrc="linux-sunxi-${_githash}"
 _kernver="${version}_${revision}"
+skip_extraction="
+ 0001-Backport-firmware-loader.patch
+ 0001-Backport-msdos-partition-UUIDs.patch"
 
 nostrip=yes
 noverifyrdeps=yes
@@ -30,6 +32,8 @@ archs="armv7l*"
 hostmakedepends="perl python kmod uboot-mkimage libressl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
+patch_args=-Np1
+python_version=2
 # These files could be modified when an external module is built.
 mutable_files="
 	/usr/lib/modules/${_kernver}/modules.dep
@@ -40,12 +44,11 @@ mutable_files="
 	/usr/lib/modules/${_kernver}/modules.alias.bin
 	/usr/lib/modules/${_kernver}/modules.devname"
 
-post_extract() {
-	cd "${build_wrksrc}"
+post_patch() {
 	# Apply backported kernel firmware changes required by eudev>=2.1.
-	patch -p1 -i ../0001-Backport-firmware-loader.patch
+	patch -p1 -i $XBPS_SRCDISTDIR/${pkgname}-${version}/0001-Backport-firmware-loader.patch
 	# Apply backported kernel msdos partition UUID changes
-	patch -p1 -i ../0001-Backport-msdos-partition-UUIDs.patch
+	patch -p1 -i $XBPS_SRCDISTDIR/${pkgname}-${version}/0001-Backport-msdos-partition-UUIDs.patch
 }
 
 do_configure() {

From 55c7ab40b2792fdf2a37bfea3710e353f91e10c6 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 Mar 2021 21:26:34 +0700
Subject: [PATCH 2511/3458] asciidoc: use pre-generated tarball

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

diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index 45e6be7bc7e6..1b2ec9bd3fee 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -2,9 +2,8 @@
 pkgname=asciidoc
 version=9.1.0
 revision=1
-wrksrc=${pkgname}-py-${version}
 build_style=gnu-configure
-hostmakedepends="automake docbook-xsl libxslt python3"
+hostmakedepends="docbook-xsl libxslt python3"
 depends="docbook-xsl libxslt python3"
 conf_files="/etc/asciidoc/filters/*/*.conf /etc/asciidoc/*.conf"
 short_desc="Text based document generation"
@@ -12,9 +11,5 @@ 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-py/asciidoc-py/archive/${version}.tar.gz"
-checksum=5056c20157349f8dc74f005b6e88ccbf1078c4e26068876f13ca3d1d7d045fe7
-
-pre_configure() {
-	autoreconf -fi
-}
+distfiles="https://github.com/asciidoc-py/asciidoc-py/releases/download/$version/asciidoc-$version.tar.gz"
+checksum=fd499fcf51317b1aaf27336fb5e919c44c1f867f1ae6681ee197365d3065238b

From c85b4e142d9b62f617f6d47905856bb8396cca76 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, 28 Feb 2021 22:55:13 +0700
Subject: [PATCH 2512/3458] monkey: move libdir to /usr/lib{32,64}/monkey

Those shared-objects are plugins for monkey,
its included debian rules also put them in /usr/lib/monkey.

While we're at it, fix --musl-mode argument.
(The actual code doesn't change if MUSL_CODE defined or not)
---
 srcpkgs/monkey/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index 87a67260acfa..e910e31586f6 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,9 +1,10 @@
 # Template file for 'monkey'
 pkgname=monkey
 version=1.6.9
-revision=2
+revision=3
 build_style=configure
-configure_args="--prefix=/usr --sbindir=/usr/bin --libdir=/usr/lib
+configure_args="--prefix=/usr --sbindir=/usr/bin
+ --libdir=/usr/lib$XBPS_TARGET_WORDSIZE/$pkgname
  --sysconfdir=/etc/monkey/ --enable-plugins=mbedtls --malloc-libc
  --webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
  --pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
@@ -34,7 +35,7 @@ make_dirs="
 CFLAGS="-fcommon"
 
 case $XBPS_TARGET_MACHINE in
-	*-musl) configure_args+="--musl-mode --no-backtrace ";;
+	*-musl) configure_args+=" --musl-mode --no-backtrace ";;
 esac
 
 post_install() {
@@ -47,6 +48,5 @@ monkey-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
 	}
 }

From 4c3e5a4e75aea766d576539fe66dca72a323e3bd Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 3 Mar 2021 12:00:50 +0100
Subject: [PATCH 2513/3458] zoom: update to 5.5.7938.0228.

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

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index c648dd97ebfe..a55a7de837c1 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.5.7011.0206
+version=5.5.7938.0228
 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=023083f12cd456b7356aef6f331b37fcf52b242ff575b6c7b1f64b3987a75001
+checksum=28cf28dad8089f495e70e33880a75339d93fceca21945aad357f9c6bf4ba1466
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 4a0eb5c87d92043e4dc19180b7767876067300bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:51:59 -0300
Subject: [PATCH 2514/3458] xprintidle: bump to force build on musl.

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

diff --git a/srcpkgs/xprintidle/template b/srcpkgs/xprintidle/template
index 0ef278ca6acf..9a9bc1c3bdf7 100644
--- a/srcpkgs/xprintidle/template
+++ b/srcpkgs/xprintidle/template
@@ -1,7 +1,7 @@
 # Template file for 'xprintidle'
 pkgname=xprintidle
 version=0.2.4
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXext-devel libXScrnSaver-devel"

From 246a74d28642de4e6811ac3ba16c4a71b53d9ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:51:59 -0300
Subject: [PATCH 2515/3458] fish-shell: bump to force build on musl.

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

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 250c07b7fe1f..05daee1117aa 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
 version=3.2.0
-revision=1
+revision=2
 wrksrc="fish-${version}"
 build_style=cmake
 hostmakedepends="gettext"

From 76b391f465ec1804f8c6bba06ab8731a320aa9f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:51:59 -0300
Subject: [PATCH 2516/3458] removed-packages: bump to force build on musl.

---
 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 73dde9284a6c..6a8a42aa0a31 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=33
+revision=34
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From fb4aedbb8d0aae33a160efc3d53581eb4a2ce5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:51:59 -0300
Subject: [PATCH 2517/3458] python3-xlib: bump to force build on musl.

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

diff --git a/srcpkgs/python3-xlib/template b/srcpkgs/python3-xlib/template
index ba653b4786fc..73a3fbc2d38e 100644
--- a/srcpkgs/python3-xlib/template
+++ b/srcpkgs/python3-xlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xlib'
 pkgname=python3-xlib
 version=0.29
-revision=2
+revision=3
 wrksrc=python-xlib-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"

From a09b8f7548a56e4edfdd6ed481dd79ed3091d7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:51:59 -0300
Subject: [PATCH 2518/3458] comrak: bump to force build on musl.

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

diff --git a/srcpkgs/comrak/template b/srcpkgs/comrak/template
index 75e0ee9e60fd..d41256ba3285 100644
--- a/srcpkgs/comrak/template
+++ b/srcpkgs/comrak/template
@@ -1,7 +1,7 @@
 # Template file for 'comrak'
 pkgname=comrak
 version=0.9.1
-revision=1
+revision=2
 build_style=cargo
 short_desc="CommonMark + GFM compatible Markdown parser and renderer"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"

From 0fe814d73801a104269470477ed8399b67a57726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:52:00 -0300
Subject: [PATCH 2519/3458] nootka: bump to force build on musl.

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

diff --git a/srcpkgs/nootka/template b/srcpkgs/nootka/template
index b477c90e05b1..8726ab984e8c 100644
--- a/srcpkgs/nootka/template
+++ b/srcpkgs/nootka/template
@@ -1,7 +1,7 @@
 # Template file for 'nootka'
 pkgname=nootka
 version=1.4.7
-revision=1
+revision=2
 wrksrc="nootka-${version}-source"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"

From 2bdd8a980cde01223fdab38c693c35ee8259c9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:52:00 -0300
Subject: [PATCH 2520/3458] libbytesize: bump to force build on musl.

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

diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 78054a72adb7..800dc6e3d3c6 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,7 +1,7 @@
 # Template file for 'libbytesize'
 pkgname=libbytesize
 version=2.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext python3"
 makedepends="mpfr-devel pcre2-devel"

From 4e6e4050a6274b854915c311960599f0b56c146d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:52:00 -0300
Subject: [PATCH 2521/3458] perl-Locale-Codes: bump to force build on musl.

---
 srcpkgs/perl-Locale-Codes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Locale-Codes/template b/srcpkgs/perl-Locale-Codes/template
index ae1361bf2d84..4576a28a70f0 100644
--- a/srcpkgs/perl-Locale-Codes/template
+++ b/srcpkgs/perl-Locale-Codes/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Locale-Codes'
 pkgname=perl-Locale-Codes
 version=3.67
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"

From 77b6af504b729febe457bc1880c8916fbb443ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Mar 2021 11:52:00 -0300
Subject: [PATCH 2522/3458] rust-analyzer: bump to force build on musl.

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

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 7b767f95f384..50b594d7b823 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,7 +1,7 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
 version=2021.03.01
-revision=1
+revision=2
 _ver=${version//./-}
 wrksrc="${pkgname}-${_ver}"
 build_style=cargo

From f68d4d6ce2fdfd679d79cf54c42ee5061d014e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 3 Mar 2021 16:30:12 +0100
Subject: [PATCH 2523/3458] glib: update to 2.66.7

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

diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index c011c7ef7b4e..942720feaa43 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.6
+version=2.66.7
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,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=80fff9c63d2725834328071c42003c311f77f91caf2285195c587c62f5638329
+checksum=09f158769f6f26b31074e15b1ac80ec39b13b53102dfae66cfe826fb2cc65502
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 2fff4d355a3f7067bc97cfe155c5168c4e95e028 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 3 Mar 2021 06:17:17 -0700
Subject: [PATCH 2524/3458] gtk+3: update to 3.24.26.

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

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 9048c2969808..03f4a90c4992 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+3'
 # Revbump gtk-layer-shell when updating, otherwise it presents a warning message
 pkgname=gtk+3
-version=3.24.24
+version=3.24.26
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -28,7 +28,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=cc9d4367c55b724832f6b09ab85481738ea456871f0381768a6a99335a98378a
+checksum=2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"

From 5892d402c3b155258bc3cb5fa0d8e0f1fe1f66b9 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 3 Mar 2021 06:17:22 -0700
Subject: [PATCH 2525/3458] gtk-layer-shell: update to 0.6.0.

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

diff --git a/srcpkgs/gtk-layer-shell/template b/srcpkgs/gtk-layer-shell/template
index 901a96dce721..4a5fc2b89b0d 100644
--- a/srcpkgs/gtk-layer-shell/template
+++ b/srcpkgs/gtk-layer-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk-layer-shell'
 pkgname=gtk-layer-shell
-version=0.5.2
+version=0.6.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="LGPL-3.0-or-later, MIT"
 homepage="https://github.com/wmww/gtk-layer-shell"
 distfiles="https://github.com/wmww/gtk-layer-shell/archive/v${version}.tar.gz"
-checksum=1587b0fbfc0cb023066180e8055704981e8ab3fc7ab8dbe9aad0da05728799be
+checksum=9a0ba72cea90e092d6b10ba47e627cd873271d287d9af80a6f66ab131fb34cac
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=true"

From 7c14d885edf7e2b1286a9c64f36140a371b1ec7f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Mar 2021 13:17:19 +0100
Subject: [PATCH 2526/3458] amber: update to 0.5.8.

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

diff --git a/srcpkgs/amber/template b/srcpkgs/amber/template
index a9419ffd4439..ef529dfc10a6 100644
--- a/srcpkgs/amber/template
+++ b/srcpkgs/amber/template
@@ -1,6 +1,6 @@
 # Template file for 'amber'
 pkgname=amber
-version=0.5.4
+version=0.5.8
 revision=1
 build_style=cargo
 short_desc="Code search/replace tool"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/dalance/amber"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6cfe95d376f078a7003b05c473011bd14932dfc93c69a27c88e9ce77589476c2
+checksum=f12e0b176273e011209e7d8613d1b9a049e50aeb536871c1f6c05a9d6a494935
 
 post_install() {
 	vlicense LICENSE

From dd6fdb9a7d154a882fd4b555b7950d0602d20982 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 1 Mar 2021 14:51:11 +0100
Subject: [PATCH 2527/3458] lrzip: update to 0.640.

---
 srcpkgs/lrzip/patches/CVE-2017-8842.patch | 24 ----------------
 srcpkgs/lrzip/patches/CVE-2017-8844.patch | 35 -----------------------
 srcpkgs/lrzip/patches/CVE-2017-8845.patch | 26 -----------------
 srcpkgs/lrzip/patches/CVE-2018-5650.patch | 24 ----------------
 srcpkgs/lrzip/template                    | 13 ++++-----
 5 files changed, 6 insertions(+), 116 deletions(-)
 delete mode 100644 srcpkgs/lrzip/patches/CVE-2017-8842.patch
 delete mode 100644 srcpkgs/lrzip/patches/CVE-2017-8844.patch
 delete mode 100644 srcpkgs/lrzip/patches/CVE-2017-8845.patch
 delete mode 100644 srcpkgs/lrzip/patches/CVE-2018-5650.patch

diff --git a/srcpkgs/lrzip/patches/CVE-2017-8842.patch b/srcpkgs/lrzip/patches/CVE-2017-8842.patch
deleted file mode 100644
index a5c07078d8e1..000000000000
--- a/srcpkgs/lrzip/patches/CVE-2017-8842.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 38386bd482c0a8102a79958cb3eddcb97a167ca3 Mon Sep 17 00:00:00 2001
-From: Con Kolivas <kernel@kolivas.org>
-Date: Fri, 9 Mar 2018 17:39:40 +1100
-Subject: [PATCH] CVE-2017-8842 Fix divide-by-zero in bufRead::get
-
----
- libzpaq/libzpaq.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libzpaq/libzpaq.h b/libzpaq/libzpaq.h
-index 93387da..cbe211d 100644
---- a/libzpaq/libzpaq.h
-+++ b/libzpaq/libzpaq.h
-@@ -465,7 +465,8 @@ struct bufRead: public libzpaq::Reader {
- 
- 	int get() {
- 		if (progress && !(*s_len % 128)) {
--			int pct = (total_len - *s_len) * 100 / total_len;
-+			int pct = (total_len > 0) ?
-+				(total_len - *s_len) * 100 / total_len : 100;
- 
- 			if (pct / 10 != *last_pct / 10) {
- 				int i;
-
diff --git a/srcpkgs/lrzip/patches/CVE-2017-8844.patch b/srcpkgs/lrzip/patches/CVE-2017-8844.patch
deleted file mode 100644
index ccbd028723e4..000000000000
--- a/srcpkgs/lrzip/patches/CVE-2017-8844.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From dc57230636fe8da068674e1023b2f07c593ec21b Mon Sep 17 00:00:00 2001
-From: Con Kolivas <kernel@kolivas.org>
-Date: Wed, 16 May 2018 14:30:15 +1000
-Subject: [PATCH] Cope with compressed length being longer than uncompressed
- and rounding up, attending to CVE-2017-8844.
-
----
- stream.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/stream.c b/stream.c
-index 4ef910e..01b883a 100644
---- a/stream.c
-+++ b/stream.c
-@@ -1564,7 +1564,7 @@ static void *ucompthread(void *data)
- /* fill a buffer from a stream - return -1 on failure */
- static int fill_buffer(rzip_control *control, struct stream_info *sinfo, int streamno)
- {
--	i64 u_len, c_len, last_head, padded_len, header_length;
-+	i64 u_len, c_len, last_head, padded_len, header_length, max_len;
- 	uchar enc_head[25 + SALT_LEN], blocksalt[SALT_LEN];
- 	struct stream *s = &sinfo->s[streamno];
- 	stream_thread_struct *st;
-@@ -1639,7 +1639,9 @@ static int fill_buffer(rzip_control *control, struct stream_info *sinfo, int str
- 
- 	if (unlikely(u_len > control->maxram))
- 		fatal_return(("Unable to malloc buffer of size %lld in this environment\n", u_len), -1);
--	s_buf = malloc(MAX(u_len, MIN_SIZE));
-+	max_len = MAX(u_len, MIN_SIZE);
-+	max_len = MAX(max_len, c_len);
-+	s_buf = malloc(max_len);
- 	if (unlikely(u_len && !s_buf))
- 		fatal_return(("Unable to malloc buffer of size %lld in fill_buffer\n", u_len), -1);
- 	sinfo->ram_alloced += u_len;
-
diff --git a/srcpkgs/lrzip/patches/CVE-2017-8845.patch b/srcpkgs/lrzip/patches/CVE-2017-8845.patch
deleted file mode 100644
index 11b585c46fb8..000000000000
--- a/srcpkgs/lrzip/patches/CVE-2017-8845.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4893e869e3fc36c65123ce8fedafeb82cba745a4 Mon Sep 17 00:00:00 2001
-From: Con Kolivas <kernel@kolivas.org>
-Date: Wed, 16 May 2018 16:55:41 +1000
-Subject: [PATCH] Add sanity check for invalid values during decompression,
- addressing CVE-2017-8845.
-
----
- stream.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/stream.c b/stream.c
-index af4a4aa..79890ba 100644
---- a/stream.c
-+++ b/stream.c
-@@ -1632,6 +1632,10 @@ static int fill_buffer(rzip_control *control, struct stream_info *sinfo, int str
- 	c_len = le64toh(c_len);
- 	u_len = le64toh(u_len);
- 	last_head = le64toh(last_head);
-+	if (unlikely(c_len < 1 || u_len < 1 || last_head < 0)) {
-+		fatal_return(("Invalid data compressed len %lld uncompressed %lld last_head %lld\n",
-+			     c_len, u_len, last_head), -1);
-+	}
- 	print_maxverbose("Fill_buffer stream %d c_len %lld u_len %lld last_head %lld\n", streamno, c_len, u_len, last_head);
- 
- 	padded_len = MAX(c_len, MIN_SIZE);
-
diff --git a/srcpkgs/lrzip/patches/CVE-2018-5650.patch b/srcpkgs/lrzip/patches/CVE-2018-5650.patch
deleted file mode 100644
index c537137cac02..000000000000
--- a/srcpkgs/lrzip/patches/CVE-2018-5650.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 50cfb3b9f68c7458822795e8b87a07dc06b39816 Mon Sep 17 00:00:00 2001
-From: Con Kolivas <kernel@kolivas.org>
-Date: Wed, 16 May 2018 19:26:15 +1000
-Subject: [PATCH] Prevent infinite loop from crafted/corrupt archive in
- unzip_match.
-
----
- runzip.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/runzip.c b/runzip.c
-index 667ae05..44e886d 100644
---- a/runzip.c
-+++ b/runzip.c
-@@ -219,6 +219,8 @@ static i64 unzip_match(rzip_control *control, void *ss, i64 len, uint32 *cksum,
- 
- 	while (len) {
- 		n = MIN(len, offset);
-+		if (unlikely(n < 1))
-+			fatal_return(("Failed fd history in unzip_match due to corrupt archive\n"), -1);
- 
- 		if (unlikely(read_fdhist(control, off_buf, (size_t)n) != (ssize_t)n)) {
- 			dealloc(buf);
-
diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index e4d13571be65..e1850b324a4b 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -1,17 +1,16 @@
 # Template file for 'lrzip'
 pkgname=lrzip
-version=0.631
-revision=2
-patch_args="-Np1"
+version=0.640
+revision=1
 build_style="gnu-configure"
 hostmakedepends="perl automake libtool"
-makedepends="zlib-devel bzip2-devel lzo-devel"
-short_desc="Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms"
+makedepends="zlib-devel bzip2-devel lzo-devel liblz4-devel"
+short_desc="Multi-threaded compression using rzip/lzma, lzo, and zpaq"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://lrzip.kolivas.org/"
 distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz"
-checksum=10315c20d5a47590e7220c210735ba169677824d5672509266682eccec84d952
+checksum=30d0be2dd839b81895806a0f537f942888359b3d115554599fd9ab9f5b97a231
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

From 41d8c698a09725d82c9149040e14ddadf51b9053 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 Mar 2021 07:50:58 +0700
Subject: [PATCH 2528/3458] apostrophe: update to 2.3.

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

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 97ceb5d89927..4a60c9a66dcb 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,16 +1,16 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.2.0.3
-revision=2
+version=2.3
+revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir
-hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext glade3-devel"
-makedepends="libglib-devel gtk+3-devel"
-depends="python3-regex python3-pypandoc libgladeui3 gspell iso-codes"
+hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
+makedepends="libglib-devel gtk+3-devel libhandy1-devel"
+depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/somas/apostrophe"
 distfiles="$homepage/-/archive/v$version/apostrophe-v$version.tar.bz2"
-checksum=e37d71f2a053e32c0af72672a0cdd318ba3d8ed3f7f673ed0ea2ab0e88f63f52
+checksum=329138535cd52fc2436ea36c04af0cbb618b83391398b6f374dd994403fdfbd7

From 9e3b0cd06127ba4b4d01c8f37eb2a3fea57bcec5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 4 Mar 2021 02:34:55 +0100
Subject: [PATCH 2529/3458] kcgi: update to 0.12.4.

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

diff --git a/srcpkgs/kcgi/template b/srcpkgs/kcgi/template
index 05edbed8d032..c29d6bc3baae 100644
--- a/srcpkgs/kcgi/template
+++ b/srcpkgs/kcgi/template
@@ -1,6 +1,6 @@
 # Template file for 'kcgi'
 pkgname=kcgi
-version=0.12.3
+version=0.12.4
 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=96b869f50799c245dc25946b160f1dfa0c321eaaf14a1b63e28e58475edee112
+checksum=e9950cda9a118a778b79bcde5a5d585a78dec4cb259731e6d9e866bcae8f3346
 
 seccomp_audit_get_suffix() {
 	case "$1" in

From 4bfdfd3fd5248c8a55c1262f2fcb21bbe367e6b5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 4 Mar 2021 13:46:49 +0100
Subject: [PATCH 2530/3458] linux5.10: update to 5.10.20.

---
 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 6b37aa21b44e..57f51c95acaa 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.19
+version=5.10.20
 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=27e7bbb0de7f0acc29c3c2e0a70c9a5fafc5fcf250993ce48713f809862ab4d6
+checksum=9be37146feba42be05137cf900a7d9012990b5a1d5e59bc0c8da1f86952930a3
 python_version=3
 patch_args="-Np1"
 

From 46905e2363cbd67ecd1e3a2bd8ac10650ef99b8f 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, 27 Feb 2021 07:41:50 +0700
Subject: [PATCH 2531/3458] refind: update to 0.13.1.

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

diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 1c3d80eae41d..f592c67e1646 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -1,7 +1,7 @@
 # Template file for 'refind'
 pkgname=refind
-version=0.13.0
-revision=2
+version=0.13.1
+revision=1
 archs="x86_64* i686* aarch64*"
 makedepends="gnu-efi-libs"
 depends="bash dosfstools efibootmgr"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only, BSD-3-Clause, BSD-2-Clause, GPL-2.0-only, LGPL-2.1-only"
 homepage="https://sourceforge.net/projects/refind/"
 distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
-checksum=c5d888f079f58ba5596782c1259e38100674de3398c3b579b6fc0f1738a33b7e
+checksum=291a81f2e2c7f68a4f6abd92c998290de20b39886871ebc9cc19e7912b8856fa
 python_version=2
 conf_files="/etc/default/refind-kernel-hook.conf"
 

From 982d8af9b4d31df06a9edb1c69c6808ec9efd0d9 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 4 Mar 2021 09:36:43 +0100
Subject: [PATCH 2532/3458] youtube-dl: update to 2021.03.03.

---
 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 4c522ae07718..e7b21685dfb6 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.22
+version=2021.03.03
 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=fd605dd76b6e46179bd2eed6905537bebffdc72732b578db21d3074bb19b44a6
+checksum=eee0cc1d9644f1c166f4bd41b2fe9ba001f41f34ac828246a00bc4d82adae287
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 8d4ddaeb587999ccfd984bd0429bde25cce0b1af Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 3 Mar 2021 11:52:18 +0100
Subject: [PATCH 2533/3458] miniupnpc: update to 2.2.2.

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

diff --git a/srcpkgs/miniupnpc/template b/srcpkgs/miniupnpc/template
index 4cdbbcb0709f..03a021fe4d4f 100644
--- a/srcpkgs/miniupnpc/template
+++ b/srcpkgs/miniupnpc/template
@@ -1,6 +1,6 @@
 # Template file for 'miniupnpc'
 pkgname=miniupnpc
-version=2.2.1
+version=2.2.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="which"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 #changelog="http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-${version}.tar.gz"
 homepage="http://miniupnp.free.fr"
 distfiles="http://miniupnp.free.fr/files/${pkgname}-${version}.tar.gz"
-checksum=3a3167e57727bf1d2a7b4861f7c7b57a663f58b9cf68227762ed2fc64e8ea11f
+checksum=888fb0976ba61518276fe1eda988589c700a3f2a69d71089260d75562afd3687
 
 CFLAGS="-fPIC"
 

From c550e4512e4e16fff54255b14e9e4d6a01b89657 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 4 Mar 2021 17:51:56 +0100
Subject: [PATCH 2534/3458] fuse-zip: update to 0.7.2

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

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index 80f9de31cbda..21b0e6d3a0d3 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -1,8 +1,8 @@
 # Template file for 'fuse-zip'
 pkgname=fuse-zip
-version=0.7.1
+version=0.7.2
 revision=1
-wrksrc=agalanin-fuse-zip-0865d60054d9
+wrksrc=agalanin-fuse-zip-9b01842a149d
 build_style=gnu-makefile
 make_build_args="all doc"
 make_install_args="prefix=/usr"
@@ -13,7 +13,7 @@ maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
 distfiles="${homepage}/get/${version}.tar.gz"
-checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195
+checksum=bba004193db9841a8d9a59e927fffe24f1b92f7ad15a5694c687456617b638a2
 
 do_check() {
 	: requires some tcl modules

From c8de0ee7efabae50eebfde5eac4be763cec231e5 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Thu, 4 Mar 2021 02:18:59 +0600
Subject: [PATCH 2535/3458] ibus-m17n: update to 1.4.4

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

diff --git a/srcpkgs/ibus-m17n/template b/srcpkgs/ibus-m17n/template
index 51cbe18afb12..7118fe0e3bc0 100644
--- a/srcpkgs/ibus-m17n/template
+++ b/srcpkgs/ibus-m17n/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-m17n'
 pkgname=ibus-m17n
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr --libexecdir=/usr/lib/ibus"
@@ -13,7 +13,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ibus/ibus-m17n"
 distfiles="https://github.com/ibus/ibus-m17n/releases/download/${version}/ibus-m17n-${version}.tar.gz"
-checksum=a6f82c035eef129c3a5fa5903d01f65358350f0abe1a0cfc7b2c86a9f49ec8d6
+checksum=a479351c3ed44283aef2b990f21e8a3e1b23ff0745836d3a45edfe7929432915
 
 pre_configure() {
 	autoreconf -fi

From 8f7e18f01b511afa2633e1107bd7dd63c10dc7f1 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 4 Mar 2021 22:53:28 +0300
Subject: [PATCH 2536/3458] github-cli: update to 1.7.0

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

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index ec3ec65be509..38b0f180487e 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=1.6.2
+version=1.7.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -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=8cc3cafb85e1234f61ef5c4468d07307142fa0cc99bdc7452251cf1cac9b38ae
+checksum=8d737d4e4a2943ca6e08c030c0992468162de0fc1366862d101b8e1389bdc36a
 
 pre_build() {
 	local _date

From 6ddce0fd9e22787fe49973aebd2b816d1d48d7cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 4 Mar 2021 20:22:32 +0200
Subject: [PATCH 2537/3458] mtpaint: update to 3.50.06.

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

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index 8f86180e6d8b..0f79101d2053 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50.05
+version=3.50.06
 revision=1
-_commit=96cd3788c4f89973350981dbc71d449cabdac297
+_commit=70306581a6212b728ab35fbbbbe72702863c5acb
 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=cd01f281414c30d47c99042c233836c93d596902ef473e9cbe90ae34f05b8575
+checksum=1b984a486c3707d130a0dc4b9636e1f744bccac5b995daa6cda7451cd19a192e
 
 post_install() {
 	vdoc doc/vcode.t2t

From b0b17649b53f7d9519b23c949d6c4295c79272be Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 3 Mar 2021 17:33:59 -0500
Subject: [PATCH 2538/3458] python3-trimesh: update to 3.9.8.

---
 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 c23cb17455de..d6ef62e856b6 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.9.7
+version=3.9.8
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -17,7 +17,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=44aaa4363391f68743ce5110cc950c03706ac562cc34f194249c91e1f0cde35d
+checksum=81fda3b95da8cc440fd646c89874a69a79dd60cde652d7f66d53014e32e34f97
 
 post_install() {
 	vlicense LICENSE.md

From c64d8568c07d2fe3f5b4eba5baa65b5b1b89fd9f Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 27 Feb 2021 23:09:03 +0100
Subject: [PATCH 2539/3458] ferm: update to 2.6.

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

diff --git a/srcpkgs/ferm/template b/srcpkgs/ferm/template
index 0ea3f9820e73..3b623d0dd0cc 100644
--- a/srcpkgs/ferm/template
+++ b/srcpkgs/ferm/template
@@ -1,15 +1,15 @@
 # Template file for 'ferm'
 pkgname=ferm
-version=2.5.1
-revision=2
+version=2.6
+revision=1
 hostmakedepends="perl"
 depends="perl iptables"
 short_desc="Frontend for iptables"
 maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://ferm.foo-projects.org/"
-distfiles="http://ferm.foo-projects.org/download/2.5/ferm-${version}.tar.xz"
-checksum=4b2ebf0f7e0d8d839d4e6d21ffd2aa1936df919eae3227b257afeb41844e942b
+distfiles="http://ferm.foo-projects.org/download/${version:0:3}/ferm-${version}.tar.xz"
+checksum=689541465e7c073cbd604c9cd18f113c31c0b41bb12614726a59b17e44058885
 
 do_install() {
 	make install PREFIX=${DESTDIR}/usr

From 36770133a460a178f2d848e898dd4f04193317e2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 4 Mar 2021 21:16:24 +0100
Subject: [PATCH 2540/3458] alkimia: update to 8.1.0.

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

diff --git a/srcpkgs/alkimia/template b/srcpkgs/alkimia/template
index 94e776b8c2ce..5b385025413a 100644
--- a/srcpkgs/alkimia/template
+++ b/srcpkgs/alkimia/template
@@ -1,6 +1,6 @@
 # Template file for 'alkimia'
 pkgname=alkimia
-version=8.0.4
+version=8.1.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
 distfiles="${KDE_SITE}/alkimia/${version}/alkimia-${version}.tar.xz"
-checksum=0004a7068dff0aa2cb6f47f70d21c129073be11f2edb21f14512bc4470487d1f
+checksum=916807352707b0490cdd9ca65682eff73b00ca523029bda6fe7a2749a1bc927c
 
 libalkimia-devel_package() {
 	short_desc+=" - development files"

From f75f324d375f1dc08adabcaa7b3e6f305146ae70 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 4 Mar 2021 21:41:39 +0100
Subject: [PATCH 2541/3458] libkdcraw5: update to 20.12.3.

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

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index aac92b85ab60..dcdac1921070 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=20.12.2
+version=20.12.3
 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=d561f6e6aab78768c210d5473f05daa43df1711f745671f9ff3ee1ec0e02fcc1
+checksum=4f12042ea57547cf03d5c82c5adb31b8df3c6b7c6b0fd4eb195885f109c88def
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f9756518c3dbe97caea967a43715c00adaf3889f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 4 Mar 2021 21:41:46 +0100
Subject: [PATCH 2542/3458] gwenview: update to 20.12.3.

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

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 8233dedac130..30718e233b4b 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=20.12.2
+version=20.12.3
 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=b6eca42c1c627fda083a8db32cbf785e1778e937af4b65a1d912d9b8ad942633
+checksum=68234a515f0870c295020a4a7495f42e785e4ad1cce536c77f108a41561b41a2
 patch_args="-Np1"
 
 pre_configure() {

From 200cc96478a7e8b04e2e61f04746763f74b5dc18 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 1 Mar 2021 22:19:18 +0100
Subject: [PATCH 2543/3458] New package: caerbannog-0.3

---
 srcpkgs/caerbannog/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/caerbannog/template

diff --git a/srcpkgs/caerbannog/template b/srcpkgs/caerbannog/template
new file mode 100644
index 000000000000..3366b3350adf
--- /dev/null
+++ b/srcpkgs/caerbannog/template
@@ -0,0 +1,13 @@
+# Template file for 'caerbannog'
+pkgname=caerbannog
+version=0.3
+revision=1
+build_style=meson
+hostmakedepends="glib-devel"
+depends="libhandy1 libnotify python3-anytree python3-gobject python3-fuzzyfinder"
+short_desc="Frontend for password-store"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~craftyguy/caerbannog"
+distfiles="https://git.sr.ht/~craftyguy/${pkgname}/archive/${version}.tar.gz"
+checksum=7fc6a96e9d5ddc31b49b108c5bf383bb5cce02f945ec568e8a44a54d8686e546

From 3222c2d14d9eae4b1318b0d2f9ab074f040af9ac Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 4 Mar 2021 21:44:09 +0100
Subject: [PATCH 2544/3458] linux5.4: update to 5.4.102.

---
 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 ae1a202938cc..5defb48639d5 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.101
+version=5.4.102
 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=4e118c072dbe3209ddeaff32ecc558f7e809d54e661550342079f1ee76d9349d
+checksum=fd697ce1c3f6024d4ae77d4eb5a1552199407b60cb8e90bc621e23cbce639aed
 python_version=3
 patch_args="-Np1"
 

From 4f2f0adadacd309e1265de81435e719e41d76cac Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 4 Mar 2021 21:47:45 +0100
Subject: [PATCH 2545/3458] linux4.19: update to 4.19.178.

---
 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 b0d83714ad0f..7a5d82851bc6 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.177
+version=4.19.178
 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=ac0eb3794e01eac66bea3ab39b8776dadf15c418ddc534ccfd95a0270302357d
+checksum=0b75ba9fefade4615b22696af7d9b3f06da10a7bb8cc2edae0dfbea8a74196ee
 python_version=2 #unverified
 patch_args="-Np1"
 

From f0b4b9a2019544d276fc9bdad9bbb80e1fdfffe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Mar 2021 15:15:56 -0300
Subject: [PATCH 2546/3458] inkscape: add missing checkdepends for
 cli_export-latex test.

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

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d61cf28495c..dd549fae36c6 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -14,7 +14,7 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
 depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour"
-checkdepends="gtest-devel $depends ImageMagick"
+checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-or-later"

From 34571e659dae2306b361dc5893992e119ec4da26 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Mar 2021 00:27:27 +0100
Subject: [PATCH 2547/3458] linux5.11: update to 5.11.3

---
 srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch | 184 ------------------
 srcpkgs/linux5.11/template                    |   6 +-
 2 files changed, 3 insertions(+), 187 deletions(-)
 delete mode 100644 srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch

diff --git a/srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch b/srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch
deleted file mode 100644
index 8d618cf26c94..000000000000
--- a/srcpkgs/linux5.11/patches/amdgpu-dc-fix.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From efc8278eecfd5e6fa36c5d41e71d038f534fe107 Mon Sep 17 00:00:00 2001
-From: Anson Jacob <Anson.Jacob@amd.com>
-Date: Thu, 18 Feb 2021 19:42:57 -0500
-Subject: Revert "drm/amd/display: reuse current context instead of recreating
- one"
-
-This reverts commit 8866a67ab86cc0812e65c04f1ef02bcc41e24d68.
-
-Reason for revert: This breaks hotplug of HDMI on some systems,
-resulting in a blank screen. Caused general hangs on boot/hotplugs.
-
-Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1487
-Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1492
-Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211649
-Signed-off-by: Anson Jacob <Anson.Jacob@amd.com>
-Reviewed-by: Bhawanpreet Lakha <bhawanpreet.lakha@amd.com>
-Acked-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 ++++++++++---------
- drivers/gpu/drm/amd/display/dc/core/dc.c          | 27 +++++++----------------
- drivers/gpu/drm/amd/display/dc/dc_stream.h        |  3 ++-
- 3 files changed, 23 insertions(+), 30 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index 94cd5ddd67ef8..344404c4ac75b 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -1936,7 +1936,7 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state,
- 		dc_commit_updates_for_stream(
- 			dm->dc, bundle->surface_updates,
- 			dc_state->stream_status->plane_count,
--			dc_state->streams[k], &bundle->stream_update);
-+			dc_state->streams[k], &bundle->stream_update, dc_state);
- 	}
- 
- cleanup:
-@@ -1967,7 +1967,8 @@ static void dm_set_dpms_off(struct dc_link *link)
- 
- 	stream_update.stream = stream_state;
- 	dc_commit_updates_for_stream(stream_state->ctx->dc, NULL, 0,
--				     stream_state, &stream_update);
-+				     stream_state, &stream_update,
-+				     stream_state->ctx->dc->current_state);
- 	mutex_unlock(&adev->dm.dc_lock);
- }
- 
-@@ -7663,7 +7664,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
- 				    struct drm_crtc *pcrtc,
- 				    bool wait_for_vblank)
- {
--	int i;
-+	uint32_t i;
- 	uint64_t timestamp_ns;
- 	struct drm_plane *plane;
- 	struct drm_plane_state *old_plane_state, *new_plane_state;
-@@ -7704,7 +7705,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
- 		amdgpu_dm_commit_cursors(state);
- 
- 	/* update planes when needed */
--	for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
-+	for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
- 		struct drm_crtc *crtc = new_plane_state->crtc;
- 		struct drm_crtc_state *new_crtc_state;
- 		struct drm_framebuffer *fb = new_plane_state->fb;
-@@ -7927,7 +7928,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
- 						     bundle->surface_updates,
- 						     planes_count,
- 						     acrtc_state->stream,
--						     &bundle->stream_update);
-+						     &bundle->stream_update,
-+						     dc_state);
- 
- 		/**
- 		 * Enable or disable the interrupts on the backend.
-@@ -8263,13 +8265,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
- 		struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);
- 		struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state);
- 		struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc);
--		struct dc_surface_update surface_updates[MAX_SURFACES];
-+		struct dc_surface_update dummy_updates[MAX_SURFACES];
- 		struct dc_stream_update stream_update;
- 		struct dc_info_packet hdr_packet;
- 		struct dc_stream_status *status = NULL;
- 		bool abm_changed, hdr_changed, scaling_changed;
- 
--		memset(&surface_updates, 0, sizeof(surface_updates));
-+		memset(&dummy_updates, 0, sizeof(dummy_updates));
- 		memset(&stream_update, 0, sizeof(stream_update));
- 
- 		if (acrtc) {
-@@ -8326,15 +8328,16 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
- 		 * To fix this, DC should permit updating only stream properties.
- 		 */
- 		for (j = 0; j < status->plane_count; j++)
--			surface_updates[j].surface = status->plane_states[j];
-+			dummy_updates[j].surface = status->plane_states[0];
- 
- 
- 		mutex_lock(&dm->dc_lock);
- 		dc_commit_updates_for_stream(dm->dc,
--						surface_updates,
-+						     dummy_updates,
- 						     status->plane_count,
- 						     dm_new_crtc_state->stream,
--						     &stream_update);
-+						     &stream_update,
-+						     dc_state);
- 		mutex_unlock(&dm->dc_lock);
- 	}
- 
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
-index c9aede2f783d3..8f8a13c7cf73d 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
-@@ -2697,7 +2697,8 @@ void dc_commit_updates_for_stream(struct dc *dc,
- 		struct dc_surface_update *srf_updates,
- 		int surface_count,
- 		struct dc_stream_state *stream,
--		struct dc_stream_update *stream_update)
-+		struct dc_stream_update *stream_update,
-+		struct dc_state *state)
- {
- 	const struct dc_stream_status *stream_status;
- 	enum surface_update_type update_type;
-@@ -2716,12 +2717,6 @@ void dc_commit_updates_for_stream(struct dc *dc,
- 
- 
- 	if (update_type >= UPDATE_TYPE_FULL) {
--		struct dc_plane_state *new_planes[MAX_SURFACES];
--
--		memset(new_planes, 0, sizeof(new_planes));
--
--		for (i = 0; i < surface_count; i++)
--			new_planes[i] = srf_updates[i].surface;
- 
- 		/* initialize scratch memory for building context */
- 		context = dc_create_state(dc);
-@@ -2730,21 +2725,15 @@ void dc_commit_updates_for_stream(struct dc *dc,
- 			return;
- 		}
- 
--		dc_resource_state_copy_construct(
--				dc->current_state, context);
-+		dc_resource_state_copy_construct(state, context);
- 
--		/*remove old surfaces from context */
--		if (!dc_rem_all_planes_for_stream(dc, stream, context)) {
--			DC_ERROR("Failed to remove streams for new validate context!\n");
--			return;
--		}
-+		for (i = 0; i < dc->res_pool->pipe_count; i++) {
-+			struct pipe_ctx *new_pipe = &context->res_ctx.pipe_ctx[i];
-+			struct pipe_ctx *old_pipe = &dc->current_state->res_ctx.pipe_ctx[i];
- 
--		/* add surface to context */
--		if (!dc_add_all_planes_for_stream(dc, stream, new_planes, surface_count, context)) {
--			DC_ERROR("Failed to add streams for new validate context!\n");
--			return;
-+			if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state)
-+				new_pipe->plane_state->force_full_update = true;
- 		}
--
- 	}
- 
- 
-diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
-index a4f7ec888c676..80b67b860091e 100644
---- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
-+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
-@@ -294,7 +294,8 @@ void dc_commit_updates_for_stream(struct dc *dc,
- 		struct dc_surface_update *srf_updates,
- 		int surface_count,
- 		struct dc_stream_state *stream,
--		struct dc_stream_update *stream_update);
-+		struct dc_stream_update *stream_update,
-+		struct dc_state *state);
- /*
-  * Log the current stream state.
-  */
--- 
-cgit 1.2.3-1.el7
-
diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 283e2ec85e43..0c01d11ba9ea 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.2
-revision=2
+version=5.11.3
+revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- 7a6d20308aed903a81a67e76e7c6cd294fb7cbb87f887e2168097da865def8ba"
+ 5d0c5b8636d71789a8c1b702c76d95f8426ac0899ede9aa8925671ef29423023"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From f5a1f6abaa4f447675cd478cfb848d3c13c925e4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 1 Mar 2021 00:03:24 +0100
Subject: [PATCH 2548/3458] grub: remove slub_debug/page_poison from defaults

---
 srcpkgs/grub/files/grub.default | 2 +-
 srcpkgs/grub/template           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grub/files/grub.default b/srcpkgs/grub/files/grub.default
index 5cd1fd2fd526..8e8231603ebd 100644
--- a/srcpkgs/grub/files/grub.default
+++ b/srcpkgs/grub/files/grub.default
@@ -6,7 +6,7 @@ GRUB_DEFAULT=0
 #GRUB_HIDDEN_TIMEOUT_QUIET=false
 GRUB_TIMEOUT=5
 GRUB_DISTRIBUTOR="Void"
-GRUB_CMDLINE_LINUX_DEFAULT="loglevel=4 slub_debug=P page_poison=1"
+GRUB_CMDLINE_LINUX_DEFAULT="loglevel=4"
 # Uncomment to use basic console
 #GRUB_TERMINAL_INPUT="console"
 # Uncomment to disable graphical terminal
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 21321d001c9c..009b1e48822e 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=4
+revision=5
 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"

From 63d716facbeb2a624d8b8453c71a36132172e885 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Mar 2021 00:33:01 +0100
Subject: [PATCH 2549/3458] pinephone-kernel: rebuild for hardening

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

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6d..b201e6b993c5 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -1,7 +1,7 @@
 # Template file for 'pinephone-kernel'
 pkgname=pinephone-kernel
 version=5.10.12
-revision=1
+revision=2
 _tag=orange-pi-5.10-20210130-2109
 wrksrc="linux-${_tag}"
 short_desc="Linux kernel and modules (${version%.*} series)"

From 29d249a5c754f734640db08d39b6f3b6ea1d0316 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Mar 2021 00:32:33 +0100
Subject: [PATCH 2550/3458] pinebookpro-kernel: rebuild for hardening

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

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762a..0d0c0e66604f 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,7 +1,7 @@
 # Template file for 'pinebookpro-kernel'
 pkgname=pinebookpro-kernel
 version=5.10.9
-revision=1
+revision=2
 archs="aarch64*"
 wrksrc="linux-${version}"
 short_desc="Linux kernel for Pinebook Pro"

From 1bff3d91cc79afefc3f8e17f79ac6bbeeba36137 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 1 Mar 2021 00:01:29 +0100
Subject: [PATCH 2551/3458] pinephone-uboot: drom slub_debug/page_poison

---
 srcpkgs/pinephone-uboot/files/uboot.default | 2 +-
 srcpkgs/pinephone-uboot/template            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pinephone-uboot/files/uboot.default b/srcpkgs/pinephone-uboot/files/uboot.default
index e0955f552c23..2fee8db656e4 100644
--- a/srcpkgs/pinephone-uboot/files/uboot.default
+++ b/srcpkgs/pinephone-uboot/files/uboot.default
@@ -8,4 +8,4 @@
 ROCKER_ARGS=yes
 
 # Regular cmdline for configured kernel
-CMDLINE="console=tty0 console=ttyS0,115200 rootwait loglevel=4 slub_debug=P page_poison=1"
+CMDLINE="console=tty0 console=ttyS0,115200 rootwait loglevel=4"
diff --git a/srcpkgs/pinephone-uboot/template b/srcpkgs/pinephone-uboot/template
index aaee84f998b7..e594d838f2b9 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=2
+revision=3
 archs="aarch64*"
 create_wrksrc=yes
 hostmakedepends="flex cross-or1k-none-elf-gcc dtc python3 python3-devel bc swig"

From 819acabf2f5c1087f45f1342d54685e9e0b0f9aa Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 1 Mar 2021 00:01:59 +0100
Subject: [PATCH 2552/3458] pinebookpro-uboot: drop slub_debug/page_poison

---
 srcpkgs/pinebookpro-uboot/files/kernel.d/uboot | 2 +-
 srcpkgs/pinebookpro-uboot/template             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pinebookpro-uboot/files/kernel.d/uboot b/srcpkgs/pinebookpro-uboot/files/kernel.d/uboot
index c7914c454fed..f184ced22d53 100755
--- a/srcpkgs/pinebookpro-uboot/files/kernel.d/uboot
+++ b/srcpkgs/pinebookpro-uboot/files/kernel.d/uboot
@@ -14,7 +14,7 @@ cat > /boot/boot.txt <<EOF
 setenv macaddr da 19 c8 7a 6d f4
 
 part uuid \${devtype} \${devnum}:\${bootpart} uuid
-setenv bootargs console=ttyS2,1500000 console=tty1 root=PARTUUID=${partuuid} rootwait video=eDP-1:1920x1080@60 loglevel=4 slub_debug=P page_poison=1
+setenv bootargs console=ttyS2,1500000 console=tty1 root=PARTUUID=${partuuid} rootwait video=eDP-1:1920x1080@60 loglevel=4
 setenv fdtfile rockchip/rk3399-pinebook-pro.dtb
 
 if load \${devtype} \${devnum}:\${bootpart} \${kernel_addr_r} $(bootstrip /boot/vmlinux-${kver}); then
diff --git a/srcpkgs/pinebookpro-uboot/template b/srcpkgs/pinebookpro-uboot/template
index 4aff7de9e65c..2f497adcd5be 100644
--- a/srcpkgs/pinebookpro-uboot/template
+++ b/srcpkgs/pinebookpro-uboot/template
@@ -2,7 +2,7 @@
 pkgname=pinebookpro-uboot
 reverts="20200212_1 20200212_2"
 version=0.0.20200212
-revision=3
+revision=4
 _commit_uboot=365495a329c8e92ca4c134562d091df71b75845e
 _commit_atf=22d12c4148c373932a7a81e5d1c59a767e143ac2
 archs="aarch64*"

From 793723db4c15ef1b16432b5a4871a08a7b408258 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Thu, 4 Mar 2021 17:10:28 -0700
Subject: [PATCH 2553/3458] python3-youtube-search: add missing checkdepends

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

diff --git a/srcpkgs/python3-youtube-search/template b/srcpkgs/python3-youtube-search/template
index 349e80f46991..7de7b44f8b8f 100644
--- a/srcpkgs/python3-youtube-search/template
+++ b/srcpkgs/python3-youtube-search/template
@@ -1,13 +1,14 @@
 # Template file for 'python3-youtube-search'
 pkgname=python3-youtube-search
 version=2.1.0
-revision=1
+revision=2
 _gitver=86af3e73bd340f37be56f2be6a5ff706b16e454e
 create_wrksrc=yes
 build_wrksrc="youtube-search-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urllib3"
+checkdepends="python3-wheel python3-pip $depends"
 short_desc="Python3 library for searching YouTube"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 9b07871a62601e3b8e13e3e23b3a47ce2b1b6d86 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 4 Mar 2021 13:33:09 +0300
Subject: [PATCH 2554/3458] ytmdl: update to 2021.03.04

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

diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index 500686b1e46a..46cccd3fbbcb 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,7 +1,7 @@
 # Template file for 'ytmdl'
 pkgname=ytmdl
-version=2021.01.14
-revision=2
+version=2021.03.04
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama
@@ -15,7 +15,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/ytmdl"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0783af6edc20a5e5635774a62bff9c20a81ebe4f6a71b939566724b279f6c4a5
+checksum=c04d109ffa89958aedb0d2a7b4bcab1421cbc372cb176611f95a86d2dd39f1f2
 
 do_check() {
 	:

From 98bfdfe47622cf0f5752a5e870d8bcee66cd97eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 01:22:27 -0300
Subject: [PATCH 2555/3458] ninja: also install plain text manual.

Not generating a manpage because it fails with:
    asciidoc: FAILED: manual.asciidoc: line 3: missing backend conf file: manpage.conf
---
 srcpkgs/ninja/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ninja/template b/srcpkgs/ninja/template
index 88d4245a9f4e..7bc78d268c03 100644
--- a/srcpkgs/ninja/template
+++ b/srcpkgs/ninja/template
@@ -1,7 +1,7 @@
 # Template file for 'ninja'
 pkgname=ninja
 version=1.10.2
-revision=1
+revision=2
 hostmakedepends="python3 asciidoc"
 short_desc="Small build system with a focus on speed"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -34,6 +34,7 @@ do_check() {
 do_install() {
 	vbin ninja
 	vdoc doc/manual.html
+	vdoc doc/manual.asciidoc
 	vinstall misc/bash-completion 644 usr/share/bash-completion/completions ninja
 	vinstall misc/zsh-completion 644 usr/share/zsh/site-functions _ninja
 }

From a25d717abed97fbfda94e2f500aa4c9deb286009 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Thu, 4 Mar 2021 22:17:19 -0700
Subject: [PATCH 2556/3458] motif: remove unnecessary symlink

---
 srcpkgs/motif-demos | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 srcpkgs/motif-demos

diff --git a/srcpkgs/motif-demos b/srcpkgs/motif-demos
deleted file mode 120000
index 446f9d048ba5..000000000000
--- a/srcpkgs/motif-demos
+++ /dev/null
@@ -1 +0,0 @@
-motif
\ No newline at end of file

From 40c007dfe144aa976a18b1ad1d97ccb099b7be8b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 5 Mar 2021 00:25:33 -0500
Subject: [PATCH 2557/3458] tg_owt: fix protobuf in hostmakedepends

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

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb616..27a211f23820 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -8,7 +8,7 @@ _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
-hostmakedepends="pkg-config yasm protobuf25"
+hostmakedepends="pkg-config yasm protobuf"
 makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"

From 50633aaae0bb56434d07014c1301b1a579fcc0fc Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 5 Mar 2021 17:44:23 +1100
Subject: [PATCH 2558/3458] Revert "common/gnu-configure-args: set exec_prefix
 to ${prefix}"

This reverts commit c96738a6e92d4916a0c513a15202315699fb2a12.

This breaks grub-install currently; a temporary rollback until it is
properly fixed.
---
 common/environment/configure/gnu-configure-args.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c3ab67a78555..dafbf5dc110c 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -18,7 +18,6 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
 # This is to make sure 32-bit and 64-bit libs can coexist when looking
 # up things (the opposite-libdir is always symlinked as libNN)
 export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
-export configure_args+=" --exec-prefix=\${prefix}"
 
 _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
 

From 30d4f643ee3275f848fcdbe9235454af9f54cc28 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 5 Mar 2021 17:46:53 +1100
Subject: [PATCH 2559/3458] grub: rebuild without problematic exec_prefix to
 ${prefix} commit.

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

diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 009b1e48822e..69cea9ae19a3 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.04
-revision=5
+revision=6
 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"

From a7f7857797c4b58f8700b61aa9246e20bbf33a4a Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 2560/3458] New package: openssl-1.1.1j

---
 common/shlibs                          |  2 +
 srcpkgs/libcrypto1.1                   |  1 +
 srcpkgs/libssl1.1                      |  1 +
 srcpkgs/openssl-c_rehash               |  1 +
 srcpkgs/openssl-devel                  |  1 +
 srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
 srcpkgs/openssl/patches/ppc64.patch    | 96 ++++++++++++++++++++++++++
 srcpkgs/openssl/template               | 86 +++++++++++++++++++++++
 8 files changed, 205 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 120000 srcpkgs/openssl-c_rehash
 create mode 120000 srcpkgs/openssl-devel
 create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl/template

diff --git a/common/shlibs b/common/shlibs
index c836cc1a3775..702dbad4f291 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1760,6 +1760,8 @@ 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.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 000000000000..fc538edfef4a
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 000000000000..fc538edfef4a
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 000000000000..fc538edfef4a
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 000000000000..fc538edfef4a
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 000000000000..b1e1d627c8a5
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old	2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c	2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 000000000000..bbb4a6f464f9
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 000000000000..eb9ca1efba18
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,86 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1j
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
+conf_files="/etc/ssl/openssl.cnf"
+replaces="openssl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+	hostmakedepends="perl"
+	build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl-c_rehash_package() {
+	short_desc+=" - c_rehash utility"
+	depends="openssl perl"
+	pkg_install() {
+		vmove usr/bin/c_rehash
+	}
+}
+
+openssl-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 2824f0bc50e98b4a8ac62f67813c60554edff1cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 2561/3458] ca-certificates: rebuild for openssl

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

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0f..854e76a613cd 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,12 +1,12 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
 version=20210119
-revision=1
+revision=2
 bootstrap=yes
 conf_files="/etc/ca-certificates.conf"
 wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl<=2.0_1 run-parts"
 short_desc="Common CA certificates for SSL/TLS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ 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
-	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 2777ca991309c211572acec2296d061189614917 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 2562/3458] xbps: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 702dbad4f291..b71a2d87f3ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1086,7 +1086,7 @@ libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
 libminiupnpc.so.17 miniupnpc-2.1_1
-libxbps.so.5 libxbps-0.59_1
+libxbps.so.5 libxbps-0.59.1_4
 libatf-c.so.1 atf-libs-0.21_1
 libatf-c++.so.2 atf-libs-0.21_1
 libvdeplug.so.3 libvde2-2.3.2_1
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc5..16bf4155e7b9 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
 
 hostmakedepends="pkgconf"
 checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
 depends="ca-certificates xbps-triggers"
 
 make_dirs="/etc/xbps.d 0755 root root"

From 4f006dbcf00c3e3f52691c3495aa70686801d3f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 2563/3458] libarchive: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index b71a2d87f3ba..64a0f25dd6a5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -49,7 +49,7 @@ 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
+libarchive.so.13 libarchive-3.5.1_2
 libcc1.so.0 gcc-6.2.1_1
 libcc1plugin.so.0 gcc-6.2.1_1
 libitm.so.1 libitm-4.7.3_1
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c6057..605cac399d34 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
 version=3.5.1
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
 hostmakedepends="pkgconf"
 makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"

From 447cb304ac50bd8b5cdfa4049bb32456f154118e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 2564/3458] libressl-netcat: remove, will be moved to libtls.

---
 common/shlibs             |  2 +-
 srcpkgs/libressl-netcat   |  1 -
 srcpkgs/libressl/template | 13 +------------
 3 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/libressl-netcat

diff --git a/common/shlibs b/common/shlibs
index 64a0f25dd6a5..25cdcdfbe971 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3448,7 +3448,7 @@ 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.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
 libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
deleted file mode 120000
index cab5b6fcb519..000000000000
--- a/srcpkgs/libressl-netcat
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d2..731168709b80 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
 version=3.1.5
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libressl-netcat_package() {
-	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
-	alternatives="
-	 nc:nc:/usr/bin/libressl-nc
-	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
-	pkg_install() {
-		vbin apps/nc/.libs/nc libressl-nc
-		vman apps/nc/nc.1 libressl-nc.1
-	}
-}

From 11341023b10e7d5a70a33c54f6187587dfb613d1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 2565/3458] New package: libtls-3.2.4

---
 srcpkgs/libressl-netcat |  1 +
 srcpkgs/libtls-devel    |  1 +
 srcpkgs/libtls/template | 95 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/libtls/update   |  1 +
 4 files changed, 98 insertions(+)
 create mode 120000 srcpkgs/libressl-netcat
 create mode 120000 srcpkgs/libtls-devel
 create mode 100644 srcpkgs/libtls/template
 create mode 100644 srcpkgs/libtls/update

diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
new file mode 120000
index 000000000000..fc098467c593
--- /dev/null
+++ b/srcpkgs/libressl-netcat
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 000000000000..fc098467c593
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 000000000000..6fc7d91a357c
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,95 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+homepage="http://www.libressl.org/"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.2.0"
+replaces="libtls20>0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+	checksum+=" e1c76178c4deb1cd20a0cd7ba553d6607f8131acb2e0844223f797e42f0d6f60"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+	build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	# disable ssp
+	i686-musl) configure_args+=" --disable-hardening";;
+	# on armv5 always disable asm as it's not supported
+	armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+	_regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+	hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+	[ -z "$build_option_asm" ] && return 0
+	mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+	[ -z "$_regen_build" ] && return 0
+	if [ "$build_option_asm" ]; then
+		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+	fi
+	autoreconf -if
+}
+
+do_install() {
+	make -C tls install DESTDIR="$DESTDIR"
+	make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+	vlicense COPYING
+	if [ "$build_option_asm" ]; then
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+	fi
+	#find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+	short_desc+=" - development files"
+	depends="libtls-${version}_${revision}"
+	pkg_install() {
+		vinstall include/tls.h 644 usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vinstall libtls.pc 644 usr/lib/pkgconfig
+		for m in man/tls_*; do vman $m; done
+	}
+}
+
+libressl-netcat_package() {
+	short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+	alternatives="
+	 nc:nc:/usr/bin/libressl-nc
+	 nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+	pkg_install() {
+		vbin apps/nc/.libs/nc libressl-nc
+		vman apps/nc/nc.1 libressl-nc.1
+	}
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 000000000000..a5d5038a8320
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"

From 8c3697be3a00256df3a705655f9b5386165693ac Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 2566/3458] catgirl: rebuild for libtls-3.2.4.

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

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 4a93282dc541..6ddf5e3bb620 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From a6e29f6ee91de331ad06ee82a151446912271c66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 2567/3458] litterbox: rebuild for libtls-3.2.4.

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

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df6..ac855d9474ba 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.7
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
 short_desc="IRC logger"
 maintainer="Allen Sobot <chilledfrogs@disroot.org>"
 license="GPL-3.0-or-later"

From c025a0936211c65b4a07de7cb1996f24928e1b57 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 2568/3458] pounce: rebuild for libtls-3.2.4.

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

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 63b55178a178..4e33113d349b 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=2.3
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 short_desc="Multi-client, TLS-only IRC bouncer"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 410b4a27cc549647c2523067bb552176d1e97b8b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 2569/3458] openntpd: rebuild for libtls-3.2.4.

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

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac6..b7e7db5c41f3 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f4900603e4be55b8befb60f5f8655c0c3a1648c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 28 Feb 2021 16:10:02 +0100
Subject: [PATCH 2570/3458] acme-client: remove, unmaintained upstream.

---
 srcpkgs/acme-client/INSTALL.msg   |  1 -
 srcpkgs/acme-client/template      | 25 -------------------------
 srcpkgs/acme-client/update        |  1 -
 srcpkgs/removed-packages/template |  3 ++-
 4 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/acme-client/INSTALL.msg
 delete mode 100644 srcpkgs/acme-client/template
 delete mode 100644 srcpkgs/acme-client/update

diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg
deleted file mode 100644
index a799d36a2837..000000000000
--- a/srcpkgs/acme-client/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-NOTE: acme-client uses new default directories since version 0.1.12
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
deleted file mode 100644
index d583ddfa4768..000000000000
--- a/srcpkgs/acme-client/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'acme-client'
-pkgname=acme-client
-version=0.1.16
-revision=5
-_distver=VERSION_${version//./_}
-wrksrc=acme-client-portable-${_distver}
-build_style=gnu-makefile
-make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel"
-short_desc="A secure ACME client"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
-license="ISC"
-homepage="https://kristaps.bsd.lv/acme-client/"
-distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
-checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
-
-CFLAGS="-fcommon -DHAVE_CONFIG_H"
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
-esac
-
-post_install() {
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update
deleted file mode 100644
index d56d0ea5fd72..000000000000
--- a/srcpkgs/acme-client/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='VERSION_\K[\d_]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a8a42aa0a31..a3859c3ed895 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=34
+revision=35
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  Platinum9-theme<=0.0.0.20170720_3
  XorCurses<=0.2.2_1
+ acme-client<=0.1.16_5
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2

From 556cefd3a9f94672be692c5100358a87f5e3665e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 2571/3458] libressl: remove package

---
 common/shlibs                                 |   2 -
 srcpkgs/libcrypto46                           |   1 -
 srcpkgs/libressl-devel                        |   1 -
 .../fail-instead-of-trying-fallback.patch     |  21 ----
 srcpkgs/libressl/template                     | 109 ------------------
 srcpkgs/libressl/update                       |   1 -
 srcpkgs/libssl48                              |   1 -
 srcpkgs/libtls20                              |   1 -
 8 files changed, 137 deletions(-)
 delete mode 120000 srcpkgs/libcrypto46
 delete mode 120000 srcpkgs/libressl-devel
 delete mode 100644 srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
 delete mode 100644 srcpkgs/libressl/template
 delete mode 100644 srcpkgs/libressl/update
 delete mode 120000 srcpkgs/libssl48
 delete mode 120000 srcpkgs/libtls20

diff --git a/common/shlibs b/common/shlibs
index 25cdcdfbe971..75c5ee1c2cd5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3447,9 +3447,7 @@ 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.46 libcrypto46-3.1.1_1
 libtls.so.20 libtls-3.2.4_1
-libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
 libfstrcmp.so.0 libfstrcmp-0.7.D001_1
diff --git a/srcpkgs/libcrypto46 b/srcpkgs/libcrypto46
deleted file mode 120000
index cab5b6fcb519..000000000000
--- a/srcpkgs/libcrypto46
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl-devel b/srcpkgs/libressl-devel
deleted file mode 120000
index cab5b6fcb519..000000000000
--- a/srcpkgs/libressl-devel
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
deleted file mode 100644
index 9df423ed7a21..000000000000
--- a/srcpkgs/libressl/patches/fail-instead-of-trying-fallback.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-<chris2> so, current flow for getentropy is
-<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
-<chris2> 2) use /dev/urandom
-<chris2> 3) use sysctl (glibc only)
-<chris2> 4) use terrible fallback
-<chris2> and with a one-line patch it can instead kill itself after 3
-<chris2> so that should only affect processes running without /dev/urandom on old kernels
-<chris2> probably no harm else
-<xtraeme> +1
-
---- crypto/compat/getentropy_linux.c.orig
-+++ crypto/compat/getentropy_linux.c
-@@ -162,7 +162,7 @@
- 	 * sysctl ABI, or consider providing a new failsafe API which
- 	 * works in a chroot or when file descriptors are exhausted.
- 	 */
--#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
-+#define FAIL_INSTEAD_OF_TRYING_FALLBACK
- #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
- 	raise(SIGKILL);
- #endif
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
deleted file mode 100644
index 731168709b80..000000000000
--- a/srcpkgs/libressl/template
+++ /dev/null
@@ -1,109 +0,0 @@
-# Template file for 'libressl'
-pkgname=libressl
-version=3.1.5
-revision=3
-bootstrap=yes
-build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
-short_desc="Version of the TLS/crypto stack forked from OpenSSL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="OpenSSL, ISC"
-#changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
-homepage="http://www.libressl.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=2c13ddcec5081c0e7ba7f93d8370a91911173090f1922007e1d90de274500494
-provides="openssl-${version}_${revision}"
-replaces="openssl>=0"
-conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
-_lssl_asm_ver="1.1.0"
-
-build_options="asm"
-desc_option_asm="Use platform assembly for faster crypto"
-
-if [ "$build_option_asm" ]; then
-	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
-	checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
-fi
-
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	# disable ssp
-	i686-musl) configure_args+=" --disable-hardening";;
-	# on armv5 always disable asm as it's not supported
-	armv5*) configure_args+=" --disable-asm";;
-esac
-
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
-post_extract() {
-	[ -z "$build_option_asm" ] && return 0
-	mv ../libressl-portable-asm-${_lssl_asm_ver} .
-}
-
-pre_configure() {
-	[ -z "$_regen_build" ] && return 0
-	if [ "$build_option_asm" ]; then
-		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
-	fi
-	autoreconf -if
-}
-
-post_install() {
-	# Use CA file from ca-certificates instead.
-	rm -f ${DESTDIR}/etc/ssl/cert.pem
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
-
-	vlicense COPYING
-	if [ "$build_option_asm" ]; then
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
-		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
-	fi
-	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
-}
-
-libcrypto46_package() {
-	short_desc+=" - crypto library"
-	pkg_install() {
-		vmove usr/lib/libcrypto.so.*
-	}
-}
-
-libssl48_package() {
-	short_desc+=" - SSL/TLS library"
-	pkg_install() {
-		vmove usr/lib/libssl.so.*
-	}
-}
-
-libtls20_package() {
-	short_desc+=" - new TLS library"
-	pkg_install() {
-		vmove usr/lib/libtls.so.*
-	}
-}
-
-libressl-devel_package() {
-	short_desc+=" - development files"
-	depends="libressl-${version}_${revision}
-	 libcrypto46-${version}_${revision}
-	 libssl48-${version}_${revision}
-	 libtls20-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share/man/man3
-	}
-}
diff --git a/srcpkgs/libressl/update b/srcpkgs/libressl/update
deleted file mode 100644
index a5d5038a8320..000000000000
--- a/srcpkgs/libressl/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*.0 *.1"
diff --git a/srcpkgs/libssl48 b/srcpkgs/libssl48
deleted file mode 120000
index cab5b6fcb519..000000000000
--- a/srcpkgs/libssl48
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file
diff --git a/srcpkgs/libtls20 b/srcpkgs/libtls20
deleted file mode 120000
index cab5b6fcb519..000000000000
--- a/srcpkgs/libtls20
+++ /dev/null
@@ -1 +0,0 @@
-libressl
\ No newline at end of file

From 748867b35daba6118a28e13d8f53ef4fb8f9503c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 2572/3458] s6-networking: change libressl buildoption to
 libtls

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

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index de517c3f3a34..963cbaa3e9d3 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
 version=2.4.1.0
 revision=1
 build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if libtls libtls-devel) skalibs-devel
  s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08
 
-build_options="bearssl libressl"
+build_options="bearssl libtls"
 build_options_default="bearssl"
 desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_libtls="Use LibreSSL as SSL library"
+vopt_conflict bearssl libtls
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
 s6-networking-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision} skalibs-devel
-	 $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+	 $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From a9a13d85a98d0c71acc64db6d8c04e58dcf25a90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 2573/3458] libasr: drop unused LibreSSL makedepends

upstream stopped using it with the release of 1.0.3
---
 srcpkgs/libasr/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c3..fdd5986a740b 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,6 @@ version=1.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel"
 short_desc="Simple and portable asynchronous resolver library"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From 1004b0e23d254a62998229a4476268817bf4f629 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 2574/3458] ifuse: drop unused LibreSSL makedepends

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

diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297b..95c48dbe8cd1 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="fuse-devel libimobiledevice-devel"
 depends="usbmuxd"
 short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fe446ea5a27aa7a5b73a5ccec1c2c74d1661348d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 2575/3458] amp: cleanup depends

---
 srcpkgs/amp/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf1..f62a206c1fd5 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,6 @@ revision=1
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
 short_desc="Complete text editor for your terminal"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="GPL-3.0-or-later"

From bc42af7ca2010761fbe9c0aabee06feacaa2a4e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 2576/3458] android-tools: drop unsued LibreSSL dep

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

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 65a59d774079..b394a98c10bc 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=2
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-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>"

From 6d23b4218723935bf8e7a34867a5b31a759b2878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 2577/3458] openldap: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 75c5ee1c2cd5..06599ccb8398 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -685,6 +685,14 @@ libevent_core-2.1.so.7 libevent-2.1.11_1
 libevent_extra-2.1.so.7 libevent-2.1.11_1
 libevent_pthreads-2.1.so.7 libevent-2.1.11_1
 libevent_openssl-2.1.so.7 libevent-2.1.11_1
+liblber-2.4.so.2 libldap-2.4.57_2
+libldap-2.4.so.2 libldap-2.4.57_2
+libldap_r-2.4.so.2 libldap-2.4.57_2
+libevent-2.1.so.7 libevent-2.1.12_2
+libevent_core-2.1.so.7 libevent-2.1.12_2
+libevent_extra-2.1.so.7 libevent-2.1.12_2
+libevent_pthreads-2.1.so.7 libevent-2.1.12_2
+libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.3.9_1
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index 850a60b132c5..ba4e3cee2e63 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
 # Template file for 'openldap'
 pkgname=openldap
 version=2.4.57
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--prefix=/usr
  --libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
  --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod
  --disable-static --with-yielding_select=yes --enable-modules"
 hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
 depends="openldap-tools>=${version}_${revision}"
 conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
 short_desc="OpenLDAP (Lightweight Directory Access Protocol)"

From ff711280e3587bbee42f64ce7a31b89b214f35ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 2578/3458] mit-krb5: rebuild against OpenSSL

---
 common/shlibs             | 14 ++++++++++++++
 srcpkgs/mit-krb5/template |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 06599ccb8398..300c7ad187d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -572,6 +572,20 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
+libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
+libmysqlclient.so.18 libmariadbclient-10.1.48_2
+libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
+libgssrpc.so.4 mit-krb5-libs-1.18.3_2
+libk5crypto.so.3 mit-krb5-libs-1.18.3_2
+libkadm5clnt_mit.so.12 mit-krb5-libs-1.18.3_2
+libkadm5srv_mit.so.12 mit-krb5-libs-1.18.3_2
+libkdb5.so.10 mit-krb5-libs-1.18.3_2
+libkrb5.so.3 mit-krb5-libs-1.18.3_2
+libkrad.so.0 mit-krb5-libs-1.18.3_2
+libkrb5support.so.0 mit-krb5-libs-1.18.3_2
+libkdb_ldap.so.1 mit-krb5-libs-1.18.3_2
+libverto.so.0 mit-krb5-libs-1.18.3_2
+libverto-k5ev.so.0 mit-krb5-libs-1.18.3_2
 libmenu-cache.so.3 menu-cache-1.0.0_1
 libupower-glib.so.3 libupower-glib3-0.99.3_1
 libcanberra.so.0 libcanberra-0.23_1
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe6..fa18e58b7333 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
 # also update srcpkgs/libgssglue/files/gssapi_mech.conf
 pkgname=mit-krb5
 version=1.18.3
-revision=1
+revision=2
 wrksrc="krb5-${version}"
 build_style=gnu-configure
 hostmakedepends="e2fsprogs-devel flex perl pkg-config"

From 21c0b8585c73c219dc27e4a690bbb589769a6878 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 2579/3458] python3: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 300c7ad187d9..2c5838c71200 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,8 +1756,8 @@ libportaudio.so.2 portaudio-19.20140130_1
 libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
-libpython3.so python3-3.8.0_1
-libpython3.9.so.1.0 python3-3.9.0_1
+libpython3.so python3-3.9.2_2
+libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index fa8b19a95196..9fa79661ba83 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
 #
 pkgname=python3
 version=3.9.2
-revision=1
+revision=2
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
 hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
 checkdepends="$depends iana-etc tzdata"

From 404222b798264525df3ebdca9b0d938641462c46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 2580/3458] postgresql13: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 2c5838c71200..eb11bd2bd67f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -553,10 +553,10 @@ libKF5PurposeWidgets.so.5 purpose-5.48.0_1
 libKF5Purpose.so.5 purpose-5.48.0_1
 libKF5PulseAudioQt.so.2 pulseaudio-qt-1.1.0_1
 libReviewboardHelpers.so.5 purpose-5.48.0_1
-libecpg_compat.so.3 postgresql-libs-8.4.2_1
-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
+libecpg_compat.so.3 postgresql-libs-13.2_2
+libecpg.so.6 postgresql-libs-13.2_2
+libpgtypes.so.3 postgresql-libs-13.2_2
+libpq.so.5 postgresql-libs-13.2_2
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.47_1
 libmysqlclient.so.18 libmariadbclient-10.1.47_1
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17bb..3c0b8fb730b9 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.2
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 1544697bb2c1730d5566781706b1af2d267ddfe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 2581/3458] FreeRADIUS: rebuild against OpenSSL

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

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed1..9aacb4ecc354 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=3
+revision=4
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
  libmariadbclient-devel postgresql-libs-devel json-c-devel"
 short_desc="World's most popular RADIUS Server"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 81ffdd00bd12729d794c0ed2f48da80c17474753 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 10:24:14 +0100
Subject: [PATCH 2582/3458] Ice: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index eb11bd2bd67f..0eb8906d6dd6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -983,22 +983,22 @@ libmcpp.so.0 libmcpp-2.7.2_1
 libjitterentropy.so.3 jitterentropy-3.0.0_1
 libkdecorations2.so.5 kdecoration-5.8.4_1
 libkdecorations2private.so.8 kdecoration-5.21.0_1
-libGlacier2.so.37 libIce-3.7.5_1
-libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_1
-libIce.so.37 libIce-3.7.5_1
-libIceSSL.so.37 libIce-3.7.5_1
-libIceUtil.so.37 libIce-3.7.5_1
-libIceStormService.so.37 libIce-3.7.5_1
-libIceStorm.so.37 libIce-3.7.5_1
-libFreeze.so.37 libIce-3.7.5_1
-libSlice.so.37 libIce-3.7.5_1
-libIceBox.so.37 libIce-3.7.5_1
-libIceGrid.so.37 libIce-3.7.5_1
-libIcePatch2.so.37 libIce-3.7.5_1
-libIceDB.so.37 libIce-3.7.5_1
-libIceXML.so.37 libIce-3.7.5_1
-libIceDiscovery.so.37 libIce-3.7.5_1
-libIceLocatorDiscovery.so.37 libIce-3.7.5_1
+libGlacier2.so.37 libIce-3.7.5_2
+libGlacier2CryptPermissionsVerifier.so.37 libIce-3.7.5_2
+libIce.so.37 libIce-3.7.5_2
+libIceSSL.so.37 libIce-3.7.5_2
+libIceUtil.so.37 libIce-3.7.5_2
+libIceStormService.so.37 libIce-3.7.5_2
+libIceStorm.so.37 libIce-3.7.5_2
+libFreeze.so.37 libIce-3.7.5_2
+libSlice.so.37 libIce-3.7.5_2
+libIceBox.so.37 libIce-3.7.5_2
+libIceGrid.so.37 libIce-3.7.5_2
+libIcePatch2.so.37 libIce-3.7.5_2
+libIceDB.so.37 libIce-3.7.5_2
+libIceXML.so.37 libIce-3.7.5_2
+libIceDiscovery.so.37 libIce-3.7.5_2
+libIceLocatorDiscovery.so.37 libIce-3.7.5_2
 libkdecorations2private.so.8 kdecoration-5.20.90_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index b9092cd56396..6c3e6971874d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,14 +1,14 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.7.5
-revision=1
+revision=2
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
  USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared"
 make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- libressl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
 maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="GPL-2.0-only, custom:ICE"

From 9665fe783fd624188251477dda032b0799afd2a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 2583/3458] libssh2: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 0eb8906d6dd6..ff855a744cec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1083,7 +1083,7 @@ libcups.so.2 libcups-1.5.3_1
 libcupsimage.so.2 libcups-1.5.3_1
 libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
-libssh2.so.1 libssh2-1.4.1_1
+libssh2.so.1 libssh2-1.9.0_3
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
 libsnmp.so.40 libnet-snmp-5.9_1
 libnetsnmp.so.40 libnet-snmp-5.9_1
diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9c..0291b28c4a18 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
 # Template file for 'libssh2'
 pkgname=libssh2
 version=1.9.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 short_desc="Library implementing the SSH2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 1542d44c4b5496d319ef94402bb0fe4333a8e799 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 2584/3458] libevent: rebuild against OpenSSL

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

diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f34..546c43aec747 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
 # Template file for 'libevent'
 pkgname=libevent
 version=2.1.12
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-stable"
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 62ef3d2b40ed5290641cbe88bad27d5e4b1d4e0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 2585/3458] nghttp2: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index ff855a744cec..5b9818e85d02 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2211,7 +2211,7 @@ libquazip5.so.1 quazip-0.7.3_2
 libjreen-qt5.so.1 jreen-1.3.0_1
 libzen.so.0 libzen-0.4.31_1
 libmediainfo.so.0 libmediainfo-0.7.75_1
-libnghttp2.so.14 nghttp2-1.0.2_1
+libnghttp2.so.14 nghttp2-1.43.0_2
 librom1394.so.0 libavc1394-0.5.4_1
 libavc1394.so.0 libavc1394-0.5.4_1
 libiec61883.so.0 libiec61883-1.2.0_1
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 89e0b6b8af93..a4ec485e23e4 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,12 +1,12 @@
 # Template file for 'nghttp2'
 pkgname=nghttp2
 version=1.43.0
-revision=1
+revision=2
 build_style=gnu-configure
 # build system errors out if python isn't available
 configure_args="--disable-python-bindings"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
  libev-devel c-ares-devel"
 checkdepends="libcppunit-devel"
 short_desc="HTTP/2 C Library"

From d91236b6c46589446d8d20d8c8234c5e4f2e9261 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 2586/3458] curl: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 5b9818e85d02..85756b58e235 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -361,7 +361,7 @@ libfreebl3.so nss-3.12.4_1
 libnssdbm3.so nss-3.12.4_1
 libnssckbi.so nss-3.12.4_1
 libnss3.so nss-3.12.4_1
-libcurl.so.4 libcurl-7.19_1
+libcurl.so.4 libcurl-7.75.0_2
 libdaemon.so.0 libdaemon-0.14_1
 libavahi-common.so.3 avahi-libs-0.6.25_1
 libavahi-core.so.7 avahi-libs-0.6.25_1
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c7345..48a5fa405969 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.75.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
 checkdepends="perl python3 stunnel nghttp2 groff"

From 0bb7ee0ff0c35c7684e9eeb3b49272054f642cab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 2587/3458] rhash: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 85756b58e235..b214472a3746 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2942,6 +2942,8 @@ libqalculate.so.21 libqalculate-3.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
+libostree-1.so.1 libostree-2020.8_2
+librhash.so.0 rhash-1.4.1_2
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f97551069..fddde4439ce1 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -1,13 +1,13 @@
 # Template file for 'rhash'
 pkgname=rhash
 version=1.4.1
-revision=1
+revision=2
 wrksrc="RHash-${version}"
 build_style=configure
 configure_args="--enable-openssl --disable-openssl-runtime
  --prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for computing hash sums and creating magnet links"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="0BSD"

From ef0f0453c1c897ca0ee724f74e7520b989dd4407 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 2588/3458] LGOGDownloader: rebuild against OpenSSL

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

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e9..a17a764df38d 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.7
-revision=4
+revision=5
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"

From dbc917fc080ac3248fdb0b238e63db892fa65ae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 2589/3458] MEGAsdk: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index b214472a3746..41ae6088b79f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3081,7 +3081,7 @@ libvted-3.so.0 libvted-3.7.0_2
 libpeasd-3.so.0 libpeasd-3.7.0_2
 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2
 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2
-libmega.so.30703 MEGAsdk-3.7.3c_1
+libmega.so.30703 MEGAsdk-3.7.3c_2
 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1
 libgpod.so.4 libgpod-0.8.3_1
 libi2c.so.0 i2c-tools-4.0_1
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b2920645..e9cbeb70f5db 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
 # Template file for 'MEGAsdk'
 pkgname=MEGAsdk
 version=3.7.3c
-revision=1
+revision=2
 wrksrc="sdk-${version}"
 build_style=gnu-configure
 configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
 make_build_args='LIBTOOLFLAGS="--tag=CXX"'
 hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
  zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
  libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
 checkdepends="gtest-devel"

From f533beacb27a7fbfeb710f5845eda3ad4bdc61c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 2590/3458] ppp: rebuild against OpenSSL

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

diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc78..5986bd713fd6 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
 # When update this package
 pkgname=ppp
 version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
 short_desc="PPP (Point-to-Point Protocol) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"

From 5f4dddd1a2479bcc92ae9c0922a09737f28e7b1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 2591/3458] NetworkManager-l2tp: rebuild against OpenSSL

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d2673..51e24d1465ee 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
 # Template file for 'NetworkManager-l2tp'
 pkgname=NetworkManager-l2tp
 version=1.8.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--runstatedir=/run"
 hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
  libsecret-devel nss-devel ppp-devel"
 depends="strongswan xl2tpd ppp"
 short_desc="NetworkManager VPN plugin for L2TP/IPsec"

From ccde5d11177d6ce0bea39c7f3cd0ec7a25cfcf50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 2592/3458] NetworkManager-openconnect: rebuild against OpenSSL

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

diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f7..aa80daaa0055 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
 depends="openconnect"
 short_desc="NetworkManager VPN plugin for OpenConnect"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 9711e062c419393cefc18f3ba8b1bbf723ea66b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 2593/3458] libzip: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 41ae6088b79f..5a88568ee98f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,7 +1233,7 @@ libtinyxml.so.0 tinyxml-2.6.2_1
 libtinyxml2.so.8 tinyxml2-8.0.0_1
 libbluray.so.2 libbluray-1.0.0_1
 libnfs.so.13 libnfs-4.0.0_1
-libzip.so.5 libzip-1.2_1
+libzip.so.5 libzip-1.7.3_2
 libluajit-5.1.so.2 LuaJIT-2.0.0_1
 libOSMesa.so.8 libOSMesa-9.1_1
 libtaginfo.so.1 libtaginfo-0.1.3_1
diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b2..1104e1a8b3b6 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
 # Template file for 'libzip'
 pkgname=libzip
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
 short_desc="C library for reading, creating, and modifying zip archives"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 4adbb608d60a5d98082eee494558e3a36e645518 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 2594/3458] OpenRCT2: rebuild against OpenSSL

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

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa555..b8ea8849863e 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=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -16,7 +16,7 @@ configure_args="
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
  libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"

From 32f3abce261ef4f3279d8bd3d797eaa5f5c2207b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 2595/3458] VirtualGL: rebuild against OpenSSL

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

diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af371..bf25920d2cb7 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
 version=2.6.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
  -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
  -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
 makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
 short_desc="Run remote OpenGL applications with full acceleration"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From af298599c449f6239b3db0d9d9cafc94f7b7a181 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 2596/3458] aircrack-ng: rebuild against OpenSSL

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

diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e5..604bcefb5a34 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'aircrack-ng'
 pkgname=aircrack-ng
 version=1.6
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
 short_desc="Complete suite of tools to assess WiFi network security"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"

From 17144176e21d84079031b20f16d1b2ee9d839d71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 2597/3458] alpine: rebuild against OpenSSL

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

diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb9..8721a772a330 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
 # Template file for 'alpine'
 pkgname=alpine
 version=2.24
-revision=1
+revision=2
 _githash=3165f59b344fb4d56d161541f294754d56bcb372
 _gitshort="${_githash:0:7}"
 wrksrc="${pkgname}-${_gitshort}"

From b3d77b4e96389c2643e2a9a4888e0b02438311a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 2598/3458] git: rebuild against OpenSSL

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

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9002f487b6af..b24e3e483950 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
 version=2.30.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"

From cacfadaf1da4882d24187a0603b397e526b552a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 2599/3458] libgit2: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 5a88568ee98f..292a1ba1020f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1360,7 +1360,7 @@ libunwind-ppc64.so.8 libunwind-1.2.1_1
 libunwind-setjmp.so.0 libunwind-1.4_1
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
 libmicrodns.so.0 libmicrodns-0.1.0_1
-libgit2.so.1.0 libgit2-1.0.0_1
+libgit2.so.1.0 libgit2-1.0.1_3
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eba..2722bd6553f7 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
 # Template file for 'libgit2'
 pkgname=libgit2
 version=1.0.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
 maintainer="q66 <daniel@octaforge.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"

From ca84c094fdf9d259ea15f415ce25d0088d36c787 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 2600/3458] cargo: rebuild against OpenSSL

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

diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c2..9c9781d1fc47 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=0.49.0
-revision=1
+revision=2
 wrksrc="cargo-${version}"
 build_helper=rust
 hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"

From 27464632d56471d2b69dfbae80a9b13d61eee279 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Mar 2021 13:14:47 +0100
Subject: [PATCH 2601/3458] libtls: clean up template

---
 srcpkgs/libtls/template | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 6fc7d91a357c..cd3d70faa028 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -4,7 +4,8 @@ version=3.2.4
 revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
-#configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm)"
+hostmakedepends="automake libtool"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="OpenSSL, ISC"
@@ -18,17 +19,13 @@ replaces="libtls20>0"
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
+build_options_default="asm"
+
 if [ "$build_option_asm" ]; then
 	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
 	checksum+=" e1c76178c4deb1cd20a0cd7ba553d6607f8131acb2e0844223f797e42f0d6f60"
 fi
 
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	# disable ssp
 	i686-musl) configure_args+=" --disable-hardening";;
@@ -36,21 +33,12 @@ case "$XBPS_TARGET_MACHINE" in
 	armv5*) configure_args+=" --disable-asm";;
 esac
 
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
 post_extract() {
 	[ -z "$build_option_asm" ] && return 0
 	mv ../libressl-portable-asm-${_lssl_asm_ver} .
 }
 
 pre_configure() {
-	[ -z "$_regen_build" ] && return 0
 	if [ "$build_option_asm" ]; then
 		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
 	fi

From 4dfbe5b731b66a2c6cafb0d8c31d36947bd3e20a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 14:06:48 +0100
Subject: [PATCH 2602/3458] openssl: openssl replaces libressl

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

diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index eb9ca1efba18..53d7f3abf022 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,7 +1,7 @@
 # Template file for 'openssl'
 pkgname=openssl
 version=1.1.1j
-revision=1
+revision=2
 bootstrap=yes
 build_style=configure
 configure_script="./Configure"
@@ -19,7 +19,7 @@ homepage="https://www.openssl.org"
 distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
 checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
 conf_files="/etc/ssl/openssl.cnf"
-replaces="openssl>=0"
+replaces="libressl>=0"
 
 build_options=asm
 

From 2ba2861758d795ca3bde9462ef29955517c685eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 2603/3458] mariadb: build against bundled OpenSSL for now

this version is EOL and should be updated soon to a newer version
---
 common/shlibs            | 11 +++++++++--
 srcpkgs/mariadb/template |  8 ++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 292a1ba1020f..df2d1079a154 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -558,8 +558,8 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint-1.5.so.1 libmypaint-1.5.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.47_1
-libmysqlclient.so.18 libmariadbclient-10.1.47_1
+libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
+libmysqlclient.so.18 libmariadbclient-10.1.48_2
 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
@@ -1606,6 +1606,13 @@ libdovecot-sql.so.0 dovecot-2.2.11_2
 libdovecot-storage.so.0 dovecot-2.2.11_2
 libdovecot-lda.so.0 dovecot-2.2.11_2
 libmysqld.so.18 libmariadbclient-5.5.36_1
+libdovecot.so.0 dovecot-2.3.13_3
+libdovecot-login.so.0 dovecot-2.3.13_3
+libdovecot-compression.so.0 dovecot-2.3.13_3
+libdovecot-sql.so.0 dovecot-2.3.13_3
+libdovecot-storage.so.0 dovecot-2.3.13_3
+libdovecot-lda.so.0 dovecot-2.3.13_3
+libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3e..437ff757b383 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.1.48
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -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_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
  -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
  -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
  pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"

From 4eabaa8fa1ad9affc5fe9adda74a8353e483cc2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 2604/3458] pulseaudio: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index df2d1079a154..bc07f1f30ed0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -750,11 +750,11 @@ libsndfile.so.1 libsndfile-1.0.20_1
 libspeex.so.1 libspeex-1.1_1
 libspeexdsp.so.1 speexdsp-1.2rc2_1
 libasyncns.so.0 libasyncns-0.8_1
-libpulse.so.0 libpulseaudio-1.0_1
-libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
-libpulse-simple.so.0 libpulseaudio-1.0_1
-libpulsecommon-14.2.so libpulseaudio-14.2_1
-libpulsecore-14.2.so libpulseaudio-14.2_1
+libpulse.so.0 libpulseaudio-14.2_2
+libpulse-mainloop-glib.so.0 libpulseaudio-14.2_2
+libpulse-simple.so.0 libpulseaudio-14.2_2
+libpulsecommon-14.2.so libpulseaudio-14.2_2
+libpulsecore-14.2.so libpulseaudio-14.2_2
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 6819c2c1b700..01ddc8ed7322 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=1
+revision=2
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
 hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
 depends="rtkit"

From 8601b6671efe24adf00a6d2f80d906f57d33d2d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 2605/3458] python: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index bc07f1f30ed0..24d173501e53 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -183,7 +183,7 @@ libgettextpo.so.0 gettext-libs-0.17_1
 libtextstyle.so.0 gettext-libs-0.20.1_1
 libattr.so.1 attr-2.4.43_1
 libacl.so.1 acl-2.2.47_1
-libpython2.7.so.1.0 python-2.7_1
+libpython2.7.so.1.0 python-2.7.18_3
 libffi.so.7 libffi-3.3_1
 libffcall.so.0 ffcall-2.1_1
 libavcall.so.1 ffcall-2.1_1
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c9..fc52e87228ea 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
 #
 pkgname=python
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"

From 12a67eb4a0f1ebad40c31387dcfde07f93f0ab74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 2606/3458] ruby: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 24d173501e53..b098b2439d0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -435,7 +435,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.88 ntfs-3g-2017.3.23_1
-libruby.so.2.7 ruby-2.7.1_1
+libruby.so.2.7 ruby-2.7.2_3
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
 libksgrd.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172b..f260af814c68 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,13 +3,13 @@ _ruby_abiver=2.7.0
 
 pkgname=ruby
 version=2.7.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
 checkdepends="tzdata"
 short_desc="Ruby programming language"

From 7fc749d19c044a951ea77d4fc6fdc1b0c3199a85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 2607/3458] qt5: rebuild against OpenSSL

---
 common/shlibs                                 | 154 +++----
 .../patches/qtnetwork-5.15.0-libressl.patch   | 420 ------------------
 srcpkgs/qt5/template                          |  10 +-
 3 files changed, 81 insertions(+), 503 deletions(-)
 delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/common/shlibs b/common/shlibs
index b098b2439d0f..21c1f0ef4731 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1925,87 +1925,87 @@ libgltf-0.1.so.1 libgltf-0.1.0_1
 libabw-0.1.so.1 libabw-0.1.0_1
 libcmis-0.5.so.5 libcmis-0.5.0_1
 libcmis-c-0.5.so.5 libcmis-0.5.0_1
-libQt5Bluetooth.so.5 qt5-connectivity-5.15.0_1
-libQt53DAnimation.so.5 qt5-3d-5.15.0_1
-libQt53DCore.so.5 qt5-3d-5.15.0_1
-libQt53DInput.so.5 qt5-3d-5.15.0_1
-libQt53DLogic.so.5 qt5-3d-5.15.0_1
-libQt53DRender.so.5 qt5-3d-5.15.0_1
-libQt53DQuick.so.5 qt5-3d-5.15.0_1
-libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
-libQt53DQuickRender.so.5 qt5-3d-5.15.0_1
-libQt53DQuickScene2D.so.5 qt5-3d-5.15.0_1
-libQt53DExtras.so.5 qt5-3d-5.15.0_1
-libQt53DQuickExtras.so.5 qt5-3d-5.15.0_1
-libQt53DQuickAnimation.so.5 qt5-3d-5.15.0_1
-libQt53DQuickInput.so.5 qt5-3d-5.15.0_1
-libQt5Charts.so.5 qt5-charts-5.15.0_1
-libQt5DataVisualization.so.5 qt5-datavis3d-5.15.0_1
-libQt5Gamepad.so.5 qt5-gamepad-5.15.0_1
-libQt5Nfc.so.5 qt5-connectivity-5.15.0_1
+libQt5Bluetooth.so.5 qt5-connectivity-5.15.2_3
+libQt53DAnimation.so.5 qt5-3d-5.15.2_3
+libQt53DCore.so.5 qt5-3d-5.15.2_3
+libQt53DInput.so.5 qt5-3d-5.15.2_3
+libQt53DLogic.so.5 qt5-3d-5.15.2_3
+libQt53DRender.so.5 qt5-3d-5.15.2_3
+libQt53DQuick.so.5 qt5-3d-5.15.2_3
+libQt53DQuickInput.so.5 qt5-3d-5.15.2_3
+libQt53DQuickRender.so.5 qt5-3d-5.15.2_3
+libQt53DQuickScene2D.so.5 qt5-3d-5.15.2_3
+libQt53DExtras.so.5 qt5-3d-5.15.2_3
+libQt53DQuickExtras.so.5 qt5-3d-5.15.2_3
+libQt53DQuickAnimation.so.5 qt5-3d-5.15.2_3
+libQt53DQuickInput.so.5 qt5-3d-5.15.2_3
+libQt5Charts.so.5 qt5-charts-5.15.2_3
+libQt5DataVisualization.so.5 qt5-datavis3d-5.15.2_3
+libQt5Gamepad.so.5 qt5-gamepad-5.15.2_3
+libQt5Nfc.so.5 qt5-connectivity-5.15.2_3
 libQt5WebView.so.5 qt5-webview-5.15.0_1
-libQt5Qml.so.5 qt5-declarative-5.15.0_1
-libQt5QmlDevTools.so.5 qt5-declarative-5.15.0_1
-libQt5Quick.so.5 qt5-declarative-5.15.0_1
-libQt5QuickTest.so.5 qt5-declarative-5.15.0_1
-libQt5QuickWidgets.so.5 qt5-declarative-5.15.0_1
-libQt5QuickParticles.so.5 qt5-declarative-5.15.0_1
-libQt5QuickShapes.so.5 qt5-declarative-5.15.0_1
-libQt5QmlModels.so.5 qt5-declarative-5.15.0_1
-libQt5QmlWorkerScript.so.5 qt5-declarative-5.15.0_1
-libQt5QuickControls2.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5Positioning.so.5 qt5-location-5.15.0_1
-libQt5Location.so.5 qt5-location-5.15.0_1
-libQt5PositioningQuick.so.5 qt5-location-5.15.0_1
-libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.15.0_1
-libQt5Multimedia.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaGstTools.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaQuick.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.15.0_1
-libQt5MultimediaWidgets.so.5 qt5-multimedia-5.15.0_1
-libQt5NetworkAuth.so.5 qt5-networkauth-5.15.0_1
-libQt5Purchasing.so.5 qt5-purchasing-5.15.0_1
-libQt5RemoteObjects.so.5 qt5-remoteobjects-5.15.0_1
-libqgsttools_p.so.1 qt5-multimedia-5.15.0_1
-libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.15.0_1
-libQt5Scxml.so.5 qt5-scxml-5.15.0_1
-libQt5Script.so.5 qt5-script-5.15.0_1
-libQt5ScriptTools.so.5 qt5-script-5.15.0_1
-libQt5Sensors.so.5 qt5-sensors-5.15.0_1
-libQt5SerialBus.so.5 qt5-serialbus-5.15.0_1
-libQt5SerialPort.so.5 qt5-serialport-5.15.0_1
-libQt5Svg.so.5 qt5-svg-5.15.0_1
-libQt5CLucene.so.5 qt5-tools-5.15.0_1
-libQt5Help.so.5 qt5-tools-5.15.0_1
-libQt5Designer.so.5 qt5-tools-5.15.0_1
-libQt5DesignerComponents.so.5 qt5-tools-5.15.0_1
-libQt5WaylandClient.so.5 qt5-wayland-5.15.0_1
-libQt5WaylandCompositor.so.5 qt5-wayland-5.15.0_1
-libQt5WebChannel.so.5 qt5-webchannel-5.15.0_1
+libQt5Qml.so.5 qt5-declarative-5.15.2_3
+libQt5QmlDevTools.so.5 qt5-declarative-5.15.2_3
+libQt5Quick.so.5 qt5-declarative-5.15.2_3
+libQt5QuickTest.so.5 qt5-declarative-5.15.2_3
+libQt5QuickWidgets.so.5 qt5-declarative-5.15.2_3
+libQt5QuickParticles.so.5 qt5-declarative-5.15.2_3
+libQt5QuickShapes.so.5 qt5-declarative-5.15.2_3
+libQt5QmlModels.so.5 qt5-declarative-5.15.2_3
+libQt5QmlWorkerScript.so.5 qt5-declarative-5.15.2_3
+libQt5QuickControls2.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5QuickTemplates2.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5Positioning.so.5 qt5-location-5.15.2_3
+libQt5Location.so.5 qt5-location-5.15.2_3
+libQt5PositioningQuick.so.5 qt5-location-5.15.2_3
+libQt5VirtualKeyboard.so.5 qt5-virtualkeyboard-5.15.2_3
+libQt5Multimedia.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaGstTools.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaQuick.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaQuick_p.so.5 qt5-multimedia-5.15.2_3
+libQt5MultimediaWidgets.so.5 qt5-multimedia-5.15.2_3
+libQt5NetworkAuth.so.5 qt5-networkauth-5.15.2_3
+libQt5Purchasing.so.5 qt5-purchasing-5.15.2_3
+libQt5RemoteObjects.so.5 qt5-remoteobjects-5.15.2_3
+libqgsttools_p.so.1 qt5-multimedia-5.15.2_3
+libQt5LabsTemplates.so.5 qt5-quickcontrols2-5.15.2_3
+libQt5Scxml.so.5 qt5-scxml-5.15.2_3
+libQt5Script.so.5 qt5-script-5.15.2_3
+libQt5ScriptTools.so.5 qt5-script-5.15.2_3
+libQt5Sensors.so.5 qt5-sensors-5.15.2_3
+libQt5SerialBus.so.5 qt5-serialbus-5.15.2_3
+libQt5SerialPort.so.5 qt5-serialport-5.15.2_3
+libQt5Svg.so.5 qt5-svg-5.15.2_3
+libQt5CLucene.so.5 qt5-tools-5.15.2_3
+libQt5Help.so.5 qt5-tools-5.15.2_3
+libQt5Designer.so.5 qt5-tools-5.15.2_3
+libQt5DesignerComponents.so.5 qt5-tools-5.15.2_3
+libQt5WaylandClient.so.5 qt5-wayland-5.15.2_3
+libQt5WaylandCompositor.so.5 qt5-wayland-5.15.2_3
+libQt5WebChannel.so.5 qt5-webchannel-5.15.2_3
 libQt5WebEngineCore.so.5 qt5-webengine-5.15.0_1
 libQt5WebEngine.so.5 qt5-webengine-5.15.0_1
 libQt5WebEngineWidgets.so.5 qt5-webengine-5.15.0_1
-libQt5WebSockets.so.5 qt5-websockets-5.15.0_1
-libQt5X11Extras.so.5 qt5-x11extras-5.15.0_1
-libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.15.0_1
-libQt5Core.so.5 qt5-core-5.15.0_1
-libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.15.0_1
-libQt5Network.so.5 qt5-network-5.15.0_1
-libQt5Sql.so.5 qt5-sql-5.15.0_1
-libQt5Xml.so.5 qt5-xml-5.15.0_1
-libQt5Gui.so.5 qt5-gui-5.15.0_1
-libQt5Widgets.so.5 qt5-widgets-5.15.0_1
-libQt5Test.so.5 qt5-test-5.15.0_1
-libQt5DBus.so.5 qt5-dbus-5.15.0_1
-libQt5Concurrent.so.5 qt5-concurrent-5.15.0_1
-libQt5OpenGL.so.5 qt5-opengl-5.15.0_1
-libQt5PrintSupport.so.5 qt5-printsupport-5.15.0_1
-libQt5XcbQpa.so.5 qt5-gui-5.15.0_1
-libQt5EglDeviceIntegration.so.5 qt5-gui-5.15.0_1
-libQt5EglFsKmsSupport.so.5 qt5-gui-5.15.0_1
-libQt5TextToSpeech.so.5 qt5-speech-5.15.0_1
-libQt5Bodymovin.so.5 qt5-lottie-5.15.0_1
+libQt5WebSockets.so.5 qt5-websockets-5.15.2_3
+libQt5X11Extras.so.5 qt5-x11extras-5.15.2_3
+libQt5XmlPatterns.so.5 qt5-xmlpatterns-5.15.2_3
+libQt5Core.so.5 qt5-core-5.15.2_3
+libQt5EglFSDeviceIntegration.so.5 qt5-gui-5.15.2_3
+libQt5Network.so.5 qt5-network-5.15.2_3
+libQt5Sql.so.5 qt5-sql-5.15.2_3
+libQt5Xml.so.5 qt5-xml-5.15.2_3
+libQt5Gui.so.5 qt5-gui-5.15.2_3
+libQt5Widgets.so.5 qt5-widgets-5.15.2_3
+libQt5Test.so.5 qt5-test-5.15.2_3
+libQt5DBus.so.5 qt5-dbus-5.15.2_3
+libQt5Concurrent.so.5 qt5-concurrent-5.15.2_3
+libQt5OpenGL.so.5 qt5-opengl-5.15.2_3
+libQt5PrintSupport.so.5 qt5-printsupport-5.15.2_3
+libQt5XcbQpa.so.5 qt5-gui-5.15.2_3
+libQt5EglDeviceIntegration.so.5 qt5-gui-5.15.2_3
+libQt5EglFsKmsSupport.so.5 qt5-gui-5.15.2_3
+libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
+libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
 libQt5WebKit.so.5 qt5-webkit-5.6.0_1
 libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
 libx265.so.192 x265-3.4_1
diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c66..000000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslkey_openssl.cpp           |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h        | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
-         return;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
-     if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
-         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
- 
-     const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CTX_get_security_level)
-     RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
-     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
-     RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83ff..613170928016 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-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
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
  unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
 depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,9 +28,7 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
 
-# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
-CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
+CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
 LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
 
@@ -1059,7 +1057,7 @@ qt5-tools_package() {
 }
 
 qt5-devel_package() {
-	depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+	depends="zlib-devel openssl-devel libXext-devel libXrender-devel
 		fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
 		dbus-devel icu-devel cups-devel
 		qt5-gui-${version}_${revision}

From 4f67e4a52112a2de7f873b6669807540ce4eee13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 2608/3458] android-file-transfer-linux: rebuild against
 OpenSSL

---
 srcpkgs/android-file-transfer-linux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 655713bfbbed..13a20ee4b7ab 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
 version=4.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"

From 7c9067d6721ae353da1836cd7fb35d1691b797be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 2609/3458] apr-util: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 21c1f0ef4731..d6655c20fdd7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -709,7 +709,7 @@ libevent_pthreads-2.1.so.7 libevent-2.1.12_2
 libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
-libaprutil-1.so.0 apr-util-1.3.9_1
+libaprutil-1.so.0 apr-util-1.6.1_11
 libnetpgp.so.0 libnetpgp-20100313_1
 libmj.so.0 libmj-20140211_1
 libmca_common_sm.so.40 libopenmpi-3.0.1_1
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e45..21336257c6c9 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=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -10,7 +10,7 @@ configure_args="
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --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
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
 short_desc="Apache Portable Runtime Utility Library"

From 2a6b33b57e27fcf8b3e98e9a7908f12831981d17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 2610/3458] apache: rebuild against OpenSSL

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

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90d..54d12f3a57b5 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.46
-revision=1
+revision=2
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
 makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 15ab8f66c033831d5f726e81ac70c131d4a0807b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 2611/3458] apk-tools: rebuild against OpenSSL

---
 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 633ac417326d..26bcb662e9fb 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
 version=2.12.3
-revision=1
+revision=2
 build_style=gnu-makefile
 # Link libapk statically
 make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
 hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 3bebed9a770edf6f33293a959cb6acce5a2354f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 2612/3458] argyllcms: rebuild against OpenSSL

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

diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b475..5fb8294254f7 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=2.1.2
-revision=2
+revision=3
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
  libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
 short_desc="ICC compatible color management system"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 56e918889715b5d41624cae57d1b54447e5106f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 2613/3458] aria2: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index d6655c20fdd7..65be002f132c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3103,7 +3103,7 @@ libtecla.so.1 libtecla-1.6.3_1
 libtecla_r.so.1 libtecla-1.6.3_1
 libzim.so.6 libzim-6.0.1_1
 libkiwix.so.9 kiwix-lib-9.0.1_1
-libaria2.so.0 libaria2-1.33.1_3
+libaria2.so.0 libaria2-1.35.0_3
 librpm.so.9 librpm-4.15.0_1
 librpmsign.so.9 librpmsign-4.15.0_1
 librpmbuild.so.9 librpmbuild-4.15.0_1
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e9588..bacfa29e25e7 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.35.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
  --with-bashcompletiondir=/usr/share/bash-completion/completions
  --enable-libaria2"
 hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
  zlib-devel"
 depends="ca-certificates"
 checkdepends="libcppunit-devel"

From bd73b2f89b5954dc8b7f5f1c48e72bf6e621452d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 2614/3458] attic: rebuild against OpenSSL

---
 srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
 srcpkgs/attic/template             |  4 +-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/attic/patches/openssl.diff

diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 000000000000..c289a1dc267c
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b3593..153c0341edcb 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=19
+revision=20
 wrksrc="Attic-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fdb56d4b3410611a1b336839d9d0e0a70827af6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 2615/3458] axel: rebuild against OpenSSL

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

diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782af..9fbfb8237b69 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
 # Template file for 'axel'
 pkgname=axel
 version=2.17.10
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"

From bb2363966b2bd622791d9fa47a950800b9a8e12d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 2616/3458] bacula-common: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 65be002f132c..1e4262505a99 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2973,16 +2973,16 @@ 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
-libbaccfg-9.4.2.so bacula-common-9.4.2_1
-libbacfind-9.4.2.so bacula-common-9.4.2_1
-libbacsql-9.4.2.so bacula-common-9.4.2_1
-libbaccats-9.4.2.so bacula-common-9.4.2_1
-libbacsd-9.4.2.so bacula-common-9.4.2_1
-libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_1
-libbaccats-postgresql-9.4.2.so bacula-common-postgresql-9.4.2_1
-libbaccats-mysql-9.4.2.so bacula-common-mariadb-9.4.2_1
-bpipe-fd.so bacula-fd-9.0.4_1
+libbac-9.4.2.so bacula-common-9.4.2_4
+libbaccfg-9.4.2.so bacula-common-9.4.2_4
+libbacfind-9.4.2.so bacula-common-9.4.2_4
+libbacsql-9.4.2.so bacula-common-9.4.2_4
+libbaccats-9.4.2.so bacula-common-9.4.2_4
+libbacsd-9.4.2.so bacula-common-9.4.2_4
+libbaccats-sqlite3-9.4.2.so bacula-common-9.4.2_4
+libbaccats-postgresql-9.4.2.so bacula-common-postgresql-9.4.2_4
+libbaccats-mysql-9.4.2.so bacula-common-mariadb-9.4.2_4
+bpipe-fd.so bacula-fd-9.4.2_4
 libnftables.so.1 libnftables-0.9.1_1
 libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda31..9a787a247770 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
  --enable-smartalloc --sysconfdir=/etc/bacula
  --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
 makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
 short_desc="Bacula - A Network Backup Tool (common libs)"
 maintainer="Matthias Fulz <mfulz@olznet.de>"
 license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"

From c5980be505285b39ebf03b1f7a9022a3d59496ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 2617/3458] badvpn: rebuild against OpenSSL

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

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a91402..3b35580d8b34 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD"

From 453e310c10dce74f09daa3ad4e6e6e1321f6959a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 2618/3458] re: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 1e4262505a99..c2241b6cd70e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3405,7 +3405,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
 libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
-libre.so re-0.5.8_1
+libre.so re-1.1.0_2
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b465436..3bef9dc2b477 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,14 +1,14 @@
 # Template file for 're'
 pkgname=re
 version=1.1.0
-revision=1
+revision=2
 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 USE_ZLIB=yes"
 make_install_args="$make_build_args"
 make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Portable library for real-time communications"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"

From c483d7dc131e2f0c269f89d0976936dcd1735bfa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 2619/3458] baresip: rebuild against OpenSSL

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

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index d6020b6dfcc4..7b8adf6f4e08 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,7 +1,7 @@
 # Template file for 'baresip'
 pkgname=baresip
 version=1.0.0
-revision=1
+revision=2
 build_style=gnu-makefile
 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
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
 make_install_args="$make_build_args"
 make_use_env=1
 hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
  $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel

From cd6b74e1fe79b1d3301b66bcc2086e38dd19622e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 2620/3458] barrier: rebuild against OpenSSL

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

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab57..f36a9914585c 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
 version=2.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"

From 5a311993c5c4847f770c5029720aff383fdf8535 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 2621/3458] u-boot-tools: rebuild against OpenSSL

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

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e4..afb4625abc13 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,13 +1,13 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
 version=2021.01
-revision=1
+revision=2
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
 make_build_target="tools envtools"
 hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Das U-Boot tools"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From fa145e702869b081774cbdc600b5bee119bd1d35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 2622/3458] bind: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index c2241b6cd70e..50b574961717 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1035,13 +1035,13 @@ libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
 libtirpc.so.3 libtirpc-1.0.2_1
 libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9-9.16.12.so bind-libs-9.16.12_1
-libdns-9.16.12.so bind-libs-9.16.12_1
-libirs-9.16.12.so bind-libs-9.16.12_1
-libisc-9.16.12.so bind-libs-9.16.12_1
-libisccc-9.16.12.so bind-libs-9.16.12_1
-libisccfg-9.16.12.so bind-libs-9.16.12_1
-libns-9.16.12.so bind-libs-9.16.12_1
+libbind9-9.16.12.so bind-libs-9.16.12_2
+libdns-9.16.12.so bind-libs-9.16.12_2
+libirs-9.16.12.so bind-libs-9.16.12_2
+libisc-9.16.12.so bind-libs-9.16.12_2
+libisccc-9.16.12.so bind-libs-9.16.12_2
+libisccfg-9.16.12.so bind-libs-9.16.12_2
+libns-9.16.12.so bind-libs-9.16.12_2
 libplist-2.0.so.3 libplist-2.2.0_1
 libplist++-2.0.so.3 libplist++-2.2.0_1
 libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index f7eb103ce98c..9ec3bc2241a7 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
 version=9.16.12
-revision=1
+revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
  --with-libidn2 --disable-backtrace
  $(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
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
 checkdepends="python3-pytest"
 short_desc="Berkeley Internet Name Domain server"

From 8501dc0b98f407b440376db2557d6066e3098f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 2623/3458] bitchx: rebuild against OpenSSL

---
 srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
 srcpkgs/bitchx/template                  |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch

diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 000000000000..f062675dc67e
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date:   Fri Mar 17 00:38:46 2017 +1100
+
+    Add support for OpenSSL 1.1.0 to configure script
+    
+    OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+    
+    Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+     yes|check)
+ 
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+   ;
+   return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_crypto_SSLeay=yes
++  ac_cv_lib_crypto_ERR_get_error=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+ 
+ fi
+ 
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ 
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+     yes|check)
+-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+       fi
+       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d45..f4746e263f89 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="A simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 

From 073ecbe740aa242b9fafa7322114c3c509e23305 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 2624/3458] bitcoin: rebuild against OpenSSL

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

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632ae..3506a68aaeb2 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.19.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"

From 973ff5d9a542437ad3f82568bc38b55d87abc1f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 2625/3458] blindfold: rebuild against OpenSSL

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

diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adbc..ee605e767102 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI gitignore file generator"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 10498ea1b542161b4561c04c60a23b2b9914b4a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:20 +0100
Subject: [PATCH 2626/3458] boinc: rebuild against OpenSSL

---
 common/shlibs          | 12 ++++++------
 srcpkgs/boinc/template |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 50b574961717..a9d450b7955e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2438,12 +2438,12 @@ libcsound64.so.6.0 csound-6.05.0_1
 libcsnd6.so.6.0 csound-6.05.0_1
 libfko.so.3 libfko-2.6.9_1
 libvterm.so.0 libvterm-0.0.20151005_1
-libboinc_opencl.so.7 boinc-7.6.2_1
-libboinc_api.so.7 boinc-7.6.2_1
-libboinc_graphics2.so.7 boinc-7.6.2_1
-libboinc_opencl.so.7 boinc-nox-7.6.2_1
-libboinc_api.so.7 boinc-nox-7.6.2_1
-libboinc_graphics2.so.7 boinc-nox-7.6.2_1
+libboinc_opencl.so.7 boinc-7.16.16_2
+libboinc_api.so.7 boinc-7.16.16_2
+libboinc_graphics2.so.7 boinc-7.16.16_2
+libboinc_opencl.so.7 boinc-nox-7.16.16_2
+libboinc_api.so.7 boinc-nox-7.16.16_2
+libboinc_graphics2.so.7 boinc-nox-7.16.16_2
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 2b305f859216..d3fde8b73b6b 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
 version=7.16.16
-revision=1
+revision=2
 _majorver=${version%.*}
 wrksrc=boinc-client_release-${_majorver}-${version}
 build_style=gnu-configure

From 8be4dfdb559bbc447479be197e5555a560b89bee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 2627/3458] borg: rebuild against OpenSSL

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

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d790556..157b87f7486e 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.15
-revision=1
+revision=2
 wrksrc="borgbackup-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
 makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
 depends="python3-llfuse python3-setuptools"
 short_desc="Deduplicating backup program with compression and encryption"

From 10bd2f5dc8dddeab642a240dd31ad1edd132f0b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 2628/3458] botan: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index a9d450b7955e..04b513078f57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2835,7 +2835,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.16 botan-2.16.0_1
+libbotan-2.so.16 botan-2.16.0_3
 libswipl.so.8 swi-prolog-8.0.0_1
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab87..ee196bbe4eec 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
 # Template file for 'botan'
 pkgname=botan
 version=2.16.0
-revision=2
+revision=3
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
 pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-2-Clause"

From 4b7f53ef9f7272822228ba9f7259f8048527da49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 2629/3458] burp2-server: rebuild against OpenSSL

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

diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e6..237555ce0e59 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
 
 pkgname=burp2-server
 version=2.2.18
-revision=4
+revision=5
 wrksrc="burp-${version}"
 build_style=gnu-configure
 make_install_target=install-all
 configure_args="--sysconfdir=/etc/burp"
 hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
  yajl-devel zlib-devel"
 # unique binary for both client and server: server depends on client package.
 depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
 burp2-client_package() {
 	short_desc="${_desc} - Client"
 	# openssl binary needed by burp_ca script
-	depends="libressl"
+	depends="openssl"
 	conf_files="/etc/burp/burp.conf"
 	# burp2-client (v2.x) does not work with burp-server (v1.x):
 	# give a chance to no break everything by refusing upgrade

From b8a7058d4dda66c1ae8a06145102b15c7b3a267f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 2630/3458] butt: rebuild against OpenSSL

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

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa5..8777ef98880f 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,11 +1,11 @@
 # Template file for 'butt'
 pkgname=butt
 version=0.1.27
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"

From b81776f67bb627e296ce9ff854cab033e4db8c8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 2631/3458] c-client: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/1006_openssl1.1_autoverify.patch  | 58 +++++++++++++++++++
 srcpkgs/c-client/template                     |  4 +-
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch

diff --git a/common/shlibs b/common/shlibs
index 04b513078f57..edb3aa8735ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2383,7 +2383,7 @@ libdwarf.so.1 libdwarf-20160613_1
 libmemcached.so.11 libmemcached-1.0.18_1
 libhashkit.so.2 libmemcached-1.0.18_1
 libmemcachedutil.so.2 libmemcached-1.0.18_1
-libc-client.so.1 c-client-2007f_1
+libc-client.so.1 c-client-2007f_4
 libonig.so.5 oniguruma-6.8.1_1
 liblo10k1.so.0 alsa-tools-1.0.29_1
 libgflags.so.2.2 gflags-2.1.2_1
diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
new file mode 100644
index 000000000000..a8552ff26875
--- /dev/null
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- src/osdep/unix/ssl_unix.c
++++ src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ \f
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ \f
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee4673..bf65dc7277be 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -1,9 +1,9 @@
 # Template file for 'c-client'
 pkgname=c-client
 version=2007f
-revision=3
+revision=4
 wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
 short_desc="IMAP client library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="Apache-2.0"

From 0c0db511b93be05096759b668a34bb68717d5cfb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 2632/3458] podofo: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index edb3aa8735ec..a0131c592842 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2545,7 +2545,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.7 libpodofo-0.9.7_1
+libpodofo.so.0.9.7 libpodofo-0.9.7_2
 libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1
 libIrcModel.so.3 libcommuni-3.4.0_1
diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19cc..2fdc03e3153c 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -1,10 +1,10 @@
 # Template file for 'podofo'
 pkgname=podofo
 version=0.9.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
 short_desc="Library to work with the PDF file format"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From 4acdcdbe989e4395ac5bd3f33d4fe7351844c1ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 2633/3458] calibre: rebuild against OpenSSL

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 7a3d542de69b..166f5d9c9ecf 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.9.0
-revision=2
+revision=3
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 84ca5e73c4cbe20829626963208ce7e6730acd69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 2634/3458] cargo-aoc: rebuild against OpenSSL

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

diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee80..023401daa9e0 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-aoc'
 pkgname=cargo-aoc
 version=0.3.2
-revision=2
+revision=3
 build_wrksrc=cargo-aoc
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI helper tool for advent of code in rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From bad636d9136136e6a1aae1e3b91e524b0c4ead12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 2635/3458] cargo-crev: rebuild against OpenSSL

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

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd3..cd177eac2907 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
 version=0.18.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path ./cargo-crev"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cryptographically verifiable code review system for cargo"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"

From 9faac5b8698073eb126f07cc875471f0e4a313db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 2636/3458] cargo-deny: rebuild against OpenSSL

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

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64f..56fbd4eba258 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
 version=0.8.2
-revision=1
+revision=2
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 90f9ed682feab163ace41681cd5733df1f7c6edc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 2637/3458] cargo-edit: rebuild against OpenSSL

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

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c72..90e5b108429a 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for managing cargo dependencies from the command line"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From f2c58524a6ed16b1c461ac0fadbfb1716088a47b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 2638/3458] cargo-geiger: rebuild against OpenSSL

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

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff52..24a3e3a35e55 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
 version=0.10.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 5626e855461f30cbf0dfb9eacb71f229a02679e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 2639/3458] cargo-outdated: rebuild against OpenSSL

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

diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5ac..5105eb05af5f 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
 # Template file for 'cargo-outdated'
 pkgname=cargo-outdated
 version=0.9.9
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
 short_desc="Cargo subcommand for displaying when dependencies are out of date"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"

From 11de7f576af82fdb9962286634160f26fa58ef6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 2640/3458] castor: rebuild against OpenSSL

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

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a4353..6c6c5b1dc8e2 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
 # Template file for 'castor'
 pkgname=castor
 version=0.8.16
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
 short_desc="Graphical client for plain-text protocols written in Rust with GTK"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From b1cc00b3049dae586aaedb4be8318ecae3df52a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 2641/3458] cbang: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index a0131c592842..00135736429e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3834,7 +3834,7 @@ libcbor.so.0.8 libcbor-0.8.0_1
 libfido2.so.1 libfido2-1.3.0_1
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
-libcbang0.so cbang-1.3.3_1
+libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
 libopenvdb.so.7.0 openvdb-7.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d5436..c4b45f44f2e6 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
 # Template file for 'cbang'
 pkgname=cbang
 version=1.6.0
-revision=2
+revision=3
 build_style=scons
 make_build_args="sharedlib=1 staticlib=1"
 make_install_args="${make_build_args}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only"

From 04412a393dbf410a1ca749bf03f09fc5f32af7cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 2642/3458] cgit: rebuild against OpenSSL

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

diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c79424..719df688847f 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
  CGIT_DATA_PATH=/usr/share/webapps/cgit
  CGIT_SCRIPT_PATH=/usr/libexec/cgit"
 hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checkdepends="perl"
 short_desc="Hyperfast web frontend for git repositories written in C"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 33ac1f8b93474c81b4c5b19aa39423befd7d2a52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 2643/3458] chatterino2: rebuild against OpenSSL

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

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad1462..7aec8859d726 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
 version=2.2.2
-revision=1
+revision=2
 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156
 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be

From 320926c1471baed075847499eb2d878859c10af6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 2644/3458] chntpw: drop libressl dep

the pacakge would require to explicetly add DOCRYPT to CFLAGS to use
OpenSSL/LibreSSL
---
 srcpkgs/chntpw/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c3..75289c85961f 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,6 @@ version=140201
 revision=1
 build_style=gnu-makefile
 hostmakedepends="unzip"
-makedepends="libressl-devel"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 92a1cbce7f8a2396d3064171ce7106d12a97d810 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 2645/3458] nim: rebuild against OpenSSL

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

diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e455109..c22afd64371b 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -1,14 +1,14 @@
 # Template file for 'nim'
 pkgname=nim
 version=1.4.2
-revision=1
+revision=2
 _cversion=0.20.0
 _nimbleversion=0.12.0
 _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
 create_wrksrc=yes
 build_wrksrc="Nim-$version"
 hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
 short_desc="Nim programming language"
 maintainer="allan <mail@may.mooo.com>"
 license="MIT"

From 825b5fa81efef0e8e0282397c665593a46c89b8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 2646/3458] choosenim: rebuild against OpenSSL

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

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc79..e2fb62b08d8a 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -1,9 +1,9 @@
 # Template file for 'choosenim'
 pkgname=choosenim
 version=0.7.4
-revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+revision=3
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
 short_desc="Nim toolchain installer"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
 	esac
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
 	LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
-	LDFLAGS+=" -lrt -ldl"
+	LDFLAGS+=" -lrt -ldl -lpthread"
 	: >nim.cfg
 	if [ -z "$CROSS_BUILD" ]; then
 		cat >>nim.cfg <<-EOF

From 381b89fdad060635d6c354ed652f90e2c4fb9344 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:21 +0100
Subject: [PATCH 2647/3458] clamav: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/clamav/template | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 00135736429e..3d3913b314df 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2199,10 +2199,10 @@ libsfml-system.so.2.5 SFML-2.5.0_1
 libsfml-window.so.2.5 SFML-2.5.0_1
 libsfml-audio.so.2.5 SFML-2.5.0_1
 libsfml-graphics.so.2.5 SFML-2.5.0_1
-libclamav.so.9 clamav-0.101.0_1
-libclamunrar.so.9 clamav-0.101.0_1
-libclamunrar_iface.so.9 clamav-0.101.0_1
-libfreshclam.so.2 clamav-0.102.0_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index ebb89548c285..e65ed2c9ed8e 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.1
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From acb7d5f04854bc7afb6336e7b192453034b1edb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 2648/3458] cloudfuse: rebuild against OpenSSL

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

diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba8598..3a354656e3cb 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudfuse'
 pkgname=cloudfuse
 version=1.0
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel libcurl-devel fuse-devel"

From f5b31bf853c96a286723b13d8bc2634b59d1112b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 2649/3458] cmusfm: rebuild against OpenSSL

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

diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee16..6361f832d745 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
 # Template file for 'cmusfm'
 pkgname=cmusfm
 version=0.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-libnotify"
 hostmakedepends="automake pkg-config"

From 4397cfcbbbd62a704251074317efe99b315adf1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 2650/3458] coWPAtty: rebuild against OpenSSL

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

diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee6072..2bcf90c8457b 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
 pkgname=coWPAtty
 _pkgname=cowpatty
 version=4.8
-revision=3
+revision=4
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-makefile
 make_use_env=1
 make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 short_desc="WPA-PSK dictionary attack"
 maintainer="nexolight <snow.dream.ch@gmail.com>"
 license="GPL-2.0-only"

From ac83ef4c0580bc1129f2fab951b3d592816fd61f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 2651/3458] libesmtp: rebuild against OpenSSL

---
 common/shlibs                          |  2 +-
 srcpkgs/libesmtp/patches/openssl.patch | 50 ++++++++++++++++++++++++++
 srcpkgs/libesmtp/template              |  4 +--
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/libesmtp/patches/openssl.patch

diff --git a/common/shlibs b/common/shlibs
index 3d3913b314df..e57dc1682faa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1345,7 +1345,7 @@ libre2.so.7 re2-2020.06.01_1
 libminizip.so.1 minizip-1.2.7_1
 libsrtp2.so.1 libsrtp-2.1.0_1
 libjsoncpp.so.24 jsoncpp-1.9.4_1
-libesmtp.so.6 libesmtp-1.0.6_4
+libesmtp.so.6 libesmtp-1.0.6_21
 libcaca.so.0 libcaca-0.99.beta18_3
 libcaca++.so.0 libcaca-0.99.beta18_3
 libunwind.so.8 libunwind-1.1_1
diff --git a/srcpkgs/libesmtp/patches/openssl.patch b/srcpkgs/libesmtp/patches/openssl.patch
new file mode 100644
index 000000000000..9244e3900598
--- /dev/null
+++ b/srcpkgs/libesmtp/patches/openssl.patch
@@ -0,0 +1,50 @@
+--- configure	2021-02-13 22:19:40.127583919 +0100
++++ -	2021-02-13 22:25:30.535900276 +0100
+@@ -11896,9 +11896,9 @@
+ 
+ fi
+ if test x$with_openssl != xno ; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then :
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -11913,27 +11913,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=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_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = x""yes; then :
+ 
+ 				with_openssl=yes
+ 				LIBS="-lssl -lcrypto $LIBS"
diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4ec..6b9d05b03b27 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
 # Template file for 'libesmtp'
 pkgname=libesmtp
 version=1.0.6
-revision=20
+revision=21
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 3831dd6774b3ed399006ac367af83f25478228fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 2652/3458] net-snmp: rebuild against OpenSSL

---
 common/shlibs             | 12 ++++++------
 srcpkgs/net-snmp/template |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e57dc1682faa..73d6f042be79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1085,12 +1085,12 @@ libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
 libssh2.so.1 libssh2-1.9.0_3
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
-libsnmp.so.40 libnet-snmp-5.9_1
-libnetsnmp.so.40 libnet-snmp-5.9_1
-libnetsnmpagent.so.40 libnet-snmp-5.9_1
-libnetsnmpmibs.so.40 libnet-snmp-5.9_1
-libnetsnmptrapd.so.40 libnet-snmp-5.9_1
-libnetsnmphelpers.so.40 libnet-snmp-5.9_1
+libsnmp.so.40 libnet-snmp-5.9_2
+libnetsnmp.so.40 libnet-snmp-5.9_2
+libnetsnmpagent.so.40 libnet-snmp-5.9_2
+libnetsnmpmibs.so.40 libnet-snmp-5.9_2
+libnetsnmptrapd.so.40 libnet-snmp-5.9_2
+libnetsnmphelpers.so.40 libnet-snmp-5.9_2
 libieee1284.so.3 libieee1284-0.2.10_1
 libsane.so.1 libsane-1.0.22_1
 libfltk.so.1.3 fltk-1.3.0_1
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2b..3abdceb0eca9 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
 # Template file for 'net-snmp'
 pkgname=net-snmp
 version=5.9
-revision=1
+revision=2
 hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
  libsensors-devel pcre-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
 }
 
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision} libressl-devel"
+	depends="libnet-snmp>=${version}_${revision} openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config

From a02bfa52d293b44c74fbad552a2d9195424289f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 2653/3458] collectd: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 73d6f042be79..bb2d85614cb9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2390,7 +2390,7 @@ libgflags.so.2.2 gflags-2.1.2_1
 libgflags_nothreads.so.2.2 gflags-2.1.2_1
 libswmhack.so.0.0 spectrwm-2.7.2_1
 libchardet.so.1 libchardet-1.0.4_1
-libcollectdclient.so.1 libcollectdclient-5.5.0_1
+libcollectdclient.so.1 libcollectdclient-5.12.0_3
 libpinktrace_0.9.so.9 pinktrace-0.9.1_1
 libsyd_1.0.so.0 sydbox-1.0.2_1
 libcsync.so.0 csync-0.50.0_1
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f9..fe20b20de328 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable prometheus write_prometheus)"
 conf_files="/etc/collectd.conf"
 hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
  libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
  libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
  $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)

From a41f2f55723e6f521a1a4afe5d4ed7c9f9b171fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 2654/3458] coturn: rebuild against OpenSSL

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

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 0da549c66d1b..077ef7a3600a 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,11 +1,11 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
  postgresql-libs-devel libmariadbclient-devel"
 short_desc="Server Implementation of TURN and STUN"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 0c4f0d253f108bdc46c6064217e130377f9b84d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 2655/3458] python-M2Crypto: rebuild against OpenSSL

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

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a8..4c684d18f576 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=5
+revision=6
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
 depends="python-typing"
 short_desc="Python2 crypto and SSL toolkit"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2a6fb27dbee1ddb2b8c95a13700b99263f8f47b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 2656/3458] crda: change build host dep to openssl

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

diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 45d4bac06028..e8082064f764 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=1
 _dbname=wireless-regdb
 _dbversion=2020.11.20
 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
 makedepends="libnl-devel libgcrypt-devel"
 depends="iw"
 short_desc="Central Regulatory Domain Agent for wireless networks"

From db385f99c1b5a35535e228abd2ee0791c3c4776f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 2657/3458] srcpkgs: rebuild against OpenSSL

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

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb843..ccd1f994c15a 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From f21cbe6a3658423803cfcc45bf5318a06593e193 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 2658/3458] cryptsetup: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index bb2d85614cb9..252332f7efae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1052,7 +1052,7 @@ libcss.so.0 libcss-0.1.1_1
 libhubbub.so.0 libhubbub-0.1.1_1
 liblutok.so.3 lutok-0.4_1
 libmtdev.so.1 mtdev-1.1.2_1
-libcryptsetup.so.12 libcryptsetup-2.0.0_1
+libcryptsetup.so.12 libcryptsetup-2.3.4_2
 libgusb.so.2 libgusb-0.1.3_1
 libmash-0.2.so.0 mash-0.2.0_4
 libbytesize.so.1 libbytesize-1.2_1
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c409..a852d5ce618b 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
 # Template file for 'cryptsetup'
 pkgname=cryptsetup
 version=2.3.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
  --enable-cryptsetup-reencrypt --enable-libargon2"
 make_check_args="-C tests"
 hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
  libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
 checkdepends="procps-ng which jq tar xz xxd"
 short_desc="Setup virtual encryption devices under Linux dm-crypt"

From fe40342105a730558b474895c8074aa1f53d071a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 2659/3458] crystal: rebuild against OpenSSL

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

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19d..1e5ad3257337 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
 short_desc="Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
 license="Apache-2.0"

From 78a859747378b869d5798a8c9c09d44311957daf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 2660/3458] cyrus-sasl: rebuild against OpenSSL

---
 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 48221b0789f2..585ac7a0e94a 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=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
  --with-mysql=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
  mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
  libmariadbclient-devel"
 depends="libsasl>=${version}"

From 55d942eec88f79c685935f988a16f0b09edad550 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 2661/3458] dillo: rebuild against OpenSSL

---
 .../dillo/patches/fix-FTBFS-with-gcc-10.patch | 80 +++++++++++++++++++
 .../patches/fix-OpenSSL-1.1-detection.patch   | 66 +++++++++++++++
 .../fix-duckduckgo-shortcut-in-dillorc.patch  | 16 ++++
 srcpkgs/dillo/template                        |  6 +-
 4 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
 create mode 100644 srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
 create mode 100644 srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch

diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
new file mode 100644
index 000000000000..1ab52f8f5bf7
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch
@@ -0,0 +1,80 @@
+Description: Fix FTBFS with gcc-10
+Bug-Debian: https://bugs.debian.org/957136
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
+Author: Axel Beckert <abe@debian.org>
+Forwarded: no
+
+--- dpid/dpid.h
++++ dpid/dpid.h
+@@ -25,10 +25,10 @@
+ 
+ /*! \TODO: Should read this from dillorc */
+ #define SRS_NAME "dpid.srs"
+-char *srs_name;
++extern char *srs_name;
+ 
+ /*! dpid's service request socket file descriptor */
+-int srs_fd;
++extern int srs_fd;
+ 
+ /*! plugin state information
+  */
+@@ -49,19 +49,19 @@
+ };
+ 
+ /*! Number of available plugins */
+-int numdpis;
++extern int numdpis;
+ 
+ /*! Number of sockets being watched */
+-int numsocks;
++extern int numsocks;
+ 
+ /*! State information for each plugin. */
+-struct dp *dpi_attr_list;
++extern struct dp *dpi_attr_list;
+ 
+ /*! service served for each plugin  */
+-Dlist *services_list;
++extern Dlist *services_list;
+ 
+ /*! Set of sockets watched for connections */
+-fd_set sock_set;
++extern fd_set sock_set;
+ 
+ /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
+ extern volatile sig_atomic_t caught_sigchld;
+--- dpid/main.c
++++ dpid/main.c
+@@ -31,6 +31,17 @@
+ #include "../dpip/dpip.h"
+ 
+ sigset_t mask_sigchld;
++char *srs_name;
++int srs_fd;
++int numdpis;
++int numsocks;
++struct dp *dpi_attr_list;
++Dlist *services_list;
++fd_set sock_set;
++enum {
++   no_errors,
++   dpid_srs_addrinuse /* dpid service request socket address already in use */
++} dpi_errno;
+ 
+ 
+ /* Start a dpi filter plugin after accepting the pending connection
+--- dpid/dpid_common.h
++++ dpid/dpid_common.h
+@@ -38,10 +38,7 @@
+ 
+ 
+ /*! Error codes for dpid */
+-enum {
+-   no_errors,
+-   dpid_srs_addrinuse /* dpid service request socket address already in use */
+-} dpi_errno;
++extern enum dpi_errno;
+ 
+ /*! Intended for identifying dillo plugins
+  * and related files
diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
new file mode 100644
index 000000000000..40f7066dffad
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch
@@ -0,0 +1,66 @@
+Description: Fix OpenSSL 1.1 detection and access to now opaque structures.
+Bug-Debian: https://bugs.debian.org/845035
+Author: Axel Beckert <abe@debian.org>
+Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html
+
+--- configure	2015-06-30 16:07:22.000000000 +0200
++++ -	2021-02-26 22:19:38.871826383 +0100
+@@ -6002,9 +6002,9 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
++if ${ac_cv_lib_ssl_SSL_new+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6018,27 +6018,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++char SSL_new ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++return SSL_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_ssl_SSL_library_init=yes
++  ac_cv_lib_ssl_SSL_new=yes
+ else
+-  ac_cv_lib_ssl_SSL_library_init=no
++  ac_cv_lib_ssl_SSL_new=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_ssl_SSL_library_init" >&5
+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
+-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
+   ssl_ok=yes
+ else
+   ssl_ok=no
+--- dpi/https.c
++++ dpi/https.c
+@@ -476,7 +476,7 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
+-         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++         if ((cn = strstr(X509_get_subject_name((X509 *) remote_cert), "/CN=")) == NULL) {
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
new file mode 100644
index 000000000000..702ade447f9c
--- /dev/null
+++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch
@@ -0,0 +1,16 @@
+Description: Fix DuckDuckGo shortcut to make result links working
+Bug-Debian: https://bugs.debian/org/924357
+Forwarded: no
+Author: liftof+dbug@gmail.com
+
+--- dillorc
++++ dillorc
+@@ -157,7 +157,7 @@
+ # You can enable multiple search_url strings at once and select from among
+ # them at runtime, with the first being the default.
+ # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
+-search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
++search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s&kd=-1"
+ search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
+ search_url="Free Dictionary http://www.thefreedictionary.com/%s"
+ search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c84..d2bdc4bf77e8 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,19 +1,17 @@
 # Template file for 'dillo'
 pkgname=dillo
 version=3.0.5
-revision=12
+revision=13
 build_style=gnu-configure
 configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
 conf_files="/etc/dillo/dillorc
  /etc/dillo/domainrc
  /etc/dillo/dpidrc
  /etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
 short_desc="Small and light graphical web browser"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.dillo.org/download/"
 distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2"
 checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
-
-CFLAGS="-fcommon"

From f81a2338a9ded552b8bbe889edea2efa221c4f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 2662/3458] dkms: rebuild against OpenSSL

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

diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a8..32b0211981f8 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'dkms'
 pkgname=dkms
 version=2.8.4
-revision=1
+revision=2
 conf_files="/etc/dkms/framework.conf"
 depends="bash kmod gcc make coreutils"
 short_desc="Dynamic Kernel Modules System"
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 if [ "$CROSS_BUILD" ]; then
-	depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+	depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
 fi
 
 do_install() {

From a2146788a0181623929642b000219d0840008cf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 2663/3458] dma: rebuild against OpenSSL

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

diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bcc..71892496013f 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
 # Template file for 'dma'
 pkgname=dma
 version=0.13
-revision=2
+revision=3
 conf_files="/etc/dma/*.conf"
 make_dirs="/var/spool/dma 2775 root mail"
 hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 065e81c1d01d70ad9a1c1b5b1009f5e51da5d558 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 2664/3458] dmg2img: rebuild against OpenSSL

---
 .../0001-openssl-1.1-compatibility.patch      | 219 ++++++++++++++++++
 srcpkgs/dmg2img/template                      |   4 +-
 2 files changed, 221 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch

diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
new file mode 100644
index 000000000000..c5769dfc12f9
--- /dev/null
+++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch
@@ -0,0 +1,219 @@
+From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001
+From: Peter Wu <peter@lekensteyn.nl>
+Date: Tue, 2 May 2017 15:53:38 +0200
+Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility
+
+Allocate contexts from the heap on all OpenSSL versions, this is needed
+since OpenSSL 1.1.0. No attempt is done at addressing issues like global
+variables and fixing potential memleaks on error paths.
+
+Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g
+(Ubuntu 16.04), I have no test file.
+
+Fixes https://github.com/Lekensteyn/dmg2img/issues/4
+---
+ vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/vfdecrypt.c b/vfdecrypt.c
+index 56d3530..b1a36d3 100644
+--- vfdecrypt.c
++++ vfdecrypt.c
+@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) {
+   pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size);
+ }
+
+-HMAC_CTX hmacsha1_ctx;
++HMAC_CTX *hmacsha1_ctx;
+ AES_KEY aes_decrypt_key;
+ int CHUNK_SIZE=4096;  // default
+
+@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) {
+   unsigned int mdLen;
+
+   chunk_no = OSSwapHostToBigInt32(chunk_no);
+-  HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL);
+-  HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
+-  HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen);
++  HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL);
++  HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t));
++  HMAC_Final(hmacsha1_ctx, mdResult, &mdLen);
+   memcpy(iv, mdResult, CIPHER_BLOCKSIZE);
+ }
+
+@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) {
+ /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6
+  *    wrapped_key has to be 40 bytes in length.  */
+ int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) {
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1, *TEMP2, *CEKICV;
+   uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 };
+   int outlen, tmplen, i;
+
+-  EVP_CIPHER_CTX_init(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(wrapped_key_len);
+   TEMP2 = malloc(wrapped_key_len);
+   CEKICV = malloc(wrapped_key_len);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   /* reverse order of TEMP3 */
+   for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1];
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
+-  if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2);
++  if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) {
+     fprintf(stderr, "internal error (3) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (4) during key unwrap operation!\n");
+     return(-1);
+   }
+
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_reset(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++#endif
+
+   memcpy(unwrapped_key, CEKICV+4, outlen-4);
+   free(TEMP1);
+   free(TEMP2);
+   free(CEKICV);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  free(ctx);
++#endif
+   return(0);
+ }
+
+@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae
+ int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) {
+   /* derived key is a 3DES-EDE key */
+   uint8_t derived_key[192/8];
+-  EVP_CIPHER_CTX ctx;
++  EVP_CIPHER_CTX *ctx;
+   uint8_t *TEMP1;
+   int outlen, tmplen;
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  ctx = EVP_CIPHER_CTX_new();
++#else
++  ctx = malloc(sizeof(*ctx));
++#endif
++  if (!ctx) {
++    fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n");
++    return(-1);
++  }
++
+   PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20,
+ 			 PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key);
+
+   print_hex(derived_key, 192/8);
+
+-  EVP_CIPHER_CTX_init(&ctx);
++  EVP_CIPHER_CTX_init(ctx);
+   /* result of the decryption operation shouldn't be bigger than ciphertext */
+   TEMP1 = malloc(header->encrypted_keyblob_size);
+   /* uses PKCS#7 padding for symmetric key operations by default */
+-  EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
++  EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv);
+
+-  if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
++  if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) {
+     fprintf(stderr, "internal error (1) during key unwrap operation!\n");
+     return(-1);
+   }
+-  if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) {
++  if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) {
+     fprintf(stderr, "internal error (2) during key unwrap operation!\n");
+     return(-1);
+   }
+   outlen += tmplen;
+-  EVP_CIPHER_CTX_cleanup(&ctx);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  EVP_CIPHER_CTX_free(ctx);
++#else
++  EVP_CIPHER_CTX_cleanup(ctx);
++  free(ctx);
++#endif
+   memcpy(aes_key, TEMP1, 16);
+   memcpy(hmacsha1_key, TEMP1, 20);
+
+@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) {
+     CHUNK_SIZE = v2header.blocksize;
+   }
+
+-  HMAC_CTX_init(&hmacsha1_ctx);
+-  HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  hmacsha1_ctx = HMAC_CTX_new();
++#else
++  hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx));
++#endif
++  if (!hmacsha1_ctx) {
++    fprintf(stderr, "Out of memory: HMAC CTX!\n");
++    exit(1);
++  }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_reset(hmacsha1_ctx);
++#else
++  HMAC_CTX_init(hmacsha1_ctx);
++#endif
++  HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL);
+   AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key);
+
+   if (verbose >= 1) {
+@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) {
+   }
+
+   if (verbose)  fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++  HMAC_CTX_free(hmacsha1_ctx);
++#else
++  HMAC_CTX_cleanup(hmacsha1_ctx);
++  free(hmacsha1_ctx);
++#endif
+   return(0);
+ }
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428b..a14781b0c3b1 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
 # Template file for 'dmg2img'
 pkgname=dmg2img
 version=1.6.7
-revision=4
+revision=5
 build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="Convert Apple's compressed dmg to standard image disks"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From 7ea21cdd75864f03f2fb6a8852cb5a245f2f58cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 2665/3458] dovecot: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 252332f7efae..0ccaeb5c872f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1599,12 +1599,12 @@ libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
 libgtkhex-3.so.0 libgtkhex-3.10.0_1
 libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
 libdmraid.so.1 dmraid-1.0.0.rc16.3_5
-libdovecot.so.0 dovecot-2.2.11_2
-libdovecot-login.so.0 dovecot-2.2.11_2
-libdovecot-compression.so.0 dovecot-2.2.11_2
-libdovecot-sql.so.0 dovecot-2.2.11_2
-libdovecot-storage.so.0 dovecot-2.2.11_2
-libdovecot-lda.so.0 dovecot-2.2.11_2
+libdovecot.so.0 dovecot-2.3.13_3
+libdovecot-login.so.0 dovecot-2.3.13_3
+libdovecot-compression.so.0 dovecot-2.3.13_3
+libdovecot-sql.so.0 dovecot-2.3.13_3
+libdovecot-storage.so.0 dovecot-2.3.13_3
+libdovecot-lda.so.0 dovecot-2.3.13_3
 libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f25467..84819fd693b1 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=2
+revision=3
 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
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
  --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
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-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"

From 721c5d9ddbf6fb184898ae0724b4c25eb48eedea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 18:06:17 +0100
Subject: [PATCH 2666/3458] castor: update checksum

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

diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index 6c6c5b1dc8e2..18b116f0f5a6 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -10,7 +10,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"
 homepage="https://git.sr.ht/~julienxx/castor"
 distfiles="https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz"
-checksum=50414f498c3b6232efb00e883043854517290b842e0501c1d1eccfaf78be9ae3
+checksum=9a72ed66a10abd9d6fb44c02349f6c4035ff7d89397eb928c90f1465c3cccf7d
 
 post_install() {
 	make PREFIX=/usr DESTDIR="${DESTDIR}" copy-data

From bf28d05be03efa7e1c71850ca5f49fdf2817aa37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 18:54:06 +0100
Subject: [PATCH 2667/3458] libesmtp: change distfiles to sources.voidlinux.org

upstream homepage seems unexistant
---
 srcpkgs/libesmtp/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 6b9d05b03b27..6719b024796c 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -9,7 +9,8 @@ short_desc="Manage submission of emails using SMTP protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://brianstafford.info/libesmtp/"
-distfiles="http://brianstafford.info/libesmtp/libesmtp-${version}.tar.bz2"
+distfiles="https://sources.voidlinux.org/libesmtp-1.0.6/libesmtp-1.0.6.tar.bz2"
+#distfiles="http://brianstafford.info/libesmtp/libesmtp-${version}.tar.bz2"
 checksum=d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b
 
 libesmtp-devel_package() {

From 7be61a3f36494ff5e8b3acb260a2325eb8c03a8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 2668/3458] libsasl: remove libressl patch

---
 srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 srcpkgs/libsasl/patches/libressl.patch

diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b53..000000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- 	if (rc != LDAP_OPT_SUCCESS) {
--		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+		syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- 	}
- 
- 	rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
- 
- 	int rc, i, tlen = 0;
- 	char *text;
--	EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+	EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
- 
- 	if (enc_ctx == NULL)
- 		return LAK_NOMEM;
- 
- 	text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- 	if (text == NULL) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		return LAK_NOMEM;
- 	}
- 
- 	EVP_DecodeInit(enc_ctx);
- 	rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- 	if (rc < 0) {
--		EVP_ENCODE_CTX_free(enc_ctx);
-+		free(enc_ctx);
- 		free(text);
- 		return LAK_FAIL;
- 	}
- 	tlen += i;
- 	EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
- 
--	EVP_ENCODE_CTX_free(enc_ctx);
-+	free(enc_ctx);
- 
- 	*ret = text;
- 	if (rlen != NULL)

From 30872a30c1831e264bf3eba6f02083c6417750d5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 4 Mar 2021 09:38:45 +0100
Subject: [PATCH 2669/3458] minikube: update to 1.18.0.

fix crossbuild (fails due to kubernetes), remove git clone.
---
 srcpkgs/minikube/template | 41 ++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index 7103acd25f62..a091708aa979 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,11 @@
 # Template file for 'minikube'
 pkgname=minikube
-version=1.13.0
+version=1.18.0
 revision=1
-archs="x86_64* ppc64le*"
-build_wrksrc=src/k8s.io/minikube
 build_style=go
-go_import_path=k8s.io/minikube
-hostmakedepends="git go-bindata python pkg-config"
+build_helper=qemu
+go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+hostmakedepends="go-bindata python pkg-config git"
 makedepends="libvirt-devel"
 depends="kubectl"
 short_desc="Tool to make it easy to run Kubernetes locally"
@@ -14,15 +13,8 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="Apache-2.0"
 homepage="https://github.com/kubernetes/minikube"
 changelog="https://raw.githubusercontent.com/kubernetes/minikube/master/CHANGELOG.md"
-
-do_fetch() {
-	# We must clone it instead of downloading the tarball because the build
-	# process expects the directory to be a git repository
-	rm -rf $wrksrc
-	mkdir -p $wrksrc/src/k8s.io
-	git clone -b v${version} https://github.com/kubernetes/minikube \
-		$wrksrc/src/k8s.io/minikube
-}
+distfiles="https://github.com/kubernetes/minikube/archive/v$version.tar.gz"
+checksum="c3f0f60607bca0c2f1a118d6d5ce313ac0c6e56b5f9621cb00ca17271aceaff6"
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
@@ -30,21 +22,18 @@ pre_configure() {
 	esac
 }
 
-do_build() {
-	export GOPATH="$wrksrc"
-
-	make
-	make out/docker-machine-driver-kvm2
-
-	out/minikube completion bash > completion.bash
-	out/minikube completion zsh | sed -n '/#compdef/,$p' > completion.zsh
+pre_build() {
+	make pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
 }
 
 do_install() {
-	vbin out/minikube
-	vbin out/docker-machine-driver-kvm2
-	vinstall completion.bash 644 usr/share/bash-completion/completions minikube
-	vinstall completion.zsh 644 usr/share/zsh/site-functions _minikube
+	vbin $GOPATH/bin/minikube
+	vbin $GOPATH/bin/kvm docker-machine-driver-kvm2
+
+	for shell in bash zsh fish; do
+		vtargetrun $GOPATH/bin/minikube completion $shell > completion.$shell
+		vcompletion completion.$shell $shell
+	done
 }
 
 docker-machine-driver-kvm2_package() {

From d54fdc882da345630391cd805512ab7348ceb0dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 2670/3458] dovecot-plugin-pigeonhole: rebuild against OpenSSL

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

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2ae..7b40b63aaac8 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
 version=0.5.13
-revision=1
+revision=2
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
 configure_args="--prefix=/usr
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
 make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
  LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
 hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
 short_desc="Sieve implementation for Dovecot"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"

From 859b182cbf79ec80baf8fa5ee9187a9bb51501b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 2671/3458] dpdk: rebuild against OpenSSL

---
 common/shlibs         | 268 +++++++++++++++++++++---------------------
 srcpkgs/dpdk/template |   6 +-
 2 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0ccaeb5c872f..e3adbd8b667d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3658,140 +3658,140 @@ libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.9.0_1
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
-librte_lpm.so.2 dpdk-19.08_1
-librte_sched.so.3 dpdk-19.08_1
-librte_eal.so.11 dpdk-19.08_1
-librte_pci.so.1 dpdk-19.08_1
-librte_gro.so.1 dpdk-19.08_1
-librte_jobstats.so.1 dpdk-19.08_1
-librte_bpf.so.1 dpdk-19.08_1
-librte_ip_frag.so.1 dpdk-19.08_1
-librte_port.so.3 dpdk-19.08_1
-librte_latencystats.so.1 dpdk-19.08_1
-librte_pipeline.so.3 dpdk-19.08_1
-librte_distributor.so.1 dpdk-19.08_1
-librte_pmd_vmxnet3.so.1 dpdk-19.08_1
-librte_pmd_dpaa_sec.so.1 dpdk-19.08_1
-librte_common_octeontx.so.1 dpdk-19.08_1
-librte_pmd_iavf.so.1 dpdk-19.08_1
-librte_pmd_octeontx_event.so.1 dpdk-19.08_1
-librte_pmd_ring.so.2 dpdk-19.08_1
-librte_rawdev_skeleton.so.1 dpdk-19.08_1
-librte_pmd_qat.so.1 dpdk-19.08_1
-librte_pmd_hinic.so.1 dpdk-19.08_1
-librte_bus_vmbus.so.2 dpdk-19.08_1
-librte_pmd_null.so.2 dpdk-19.08_1
-librte_pmd_bbdev_null.so.1 dpdk-19.08_1
-librte_common_dpaax.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_event.so.2 dpdk-19.08_1
-librte_pmd_bnxt.so.2 dpdk-19.08_1
-librte_bus_ifpga.so.2 dpdk-19.08_1
-librte_pmd_pcap.so.1 dpdk-19.08_1
-librte_pmd_kni.so.1 dpdk-19.08_1
-librte_pmd_enetc.so.1 dpdk-19.08_1
-librte_pmd_atlantic.so.1 dpdk-19.08_1
-librte_mempool_stack.so.1 dpdk-19.08_1
-librte_pmd_opdl_event.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_1
-librte_pmd_avp.so.1 dpdk-19.08_1
-librte_pmd_cxgbe.so.1 dpdk-19.08_1
-librte_pmd_crypto_scheduler.so.1 dpdk-19.08_1
-librte_pmd_openssl.so.1 dpdk-19.08_1
-librte_pmd_octeontx2_event.so.1 dpdk-19.08_1
-librte_pmd_sfc.so.1 dpdk-19.08_1
-librte_pmd_i40e.so.2 dpdk-19.08_1
-librte_pmd_e1000.so.1 dpdk-19.08_1
-librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_1
-librte_rawdev_ioat.so.1 dpdk-19.08_1
-librte_pmd_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_sw_event.so.1 dpdk-19.08_1
-librte_mempool_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_1
-librte_rawdev_ntb.so.1 dpdk-19.08_1
-librte_pmd_memif.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_sec.so.2 dpdk-19.08_1
-librte_pmd_failsafe.so.1 dpdk-19.08_1
-librte_pmd_thunderx.so.1 dpdk-19.08_1
-librte_pmd_octeontx.so.1 dpdk-19.08_1
-librte_pmd_dpaa.so.1 dpdk-19.08_1
-librte_pmd_caam_jr.so.1 dpdk-19.08_1
-librte_pmd_virtio.so.1 dpdk-19.08_1
-librte_pmd_octeontx_compress.so.1 dpdk-19.08_1
-librte_pmd_zlib.so.1 dpdk-19.08_1
-librte_bus_pci.so.2 dpdk-19.08_1
-librte_pmd_bond.so.2 dpdk-19.08_1
-librte_pmd_ice.so.1 dpdk-19.08_1
-librte_pmd_skeleton_event.so.1 dpdk-19.08_1
-librte_mempool_ring.so.1 dpdk-19.08_1
-librte_pmd_octeontx2.so.1 dpdk-19.08_1
-librte_mempool_octeontx.so.1 dpdk-19.08_1
-librte_pmd_ark.so.1 dpdk-19.08_1
-librte_pmd_null_crypto.so.1 dpdk-19.08_1
-librte_pmd_ena.so.1 dpdk-19.08_1
-librte_pmd_axgbe.so.1 dpdk-19.08_1
-librte_common_cpt.so.1 dpdk-19.08_1
-librte_pmd_af_packet.so.1 dpdk-19.08_1
-librte_pmd_vhost.so.2 dpdk-19.08_1
-librte_pmd_softnic.so.1 dpdk-19.08_1
-librte_pmd_nfp.so.1 dpdk-19.08_1
-librte_bus_fslmc.so.2 dpdk-19.08_1
-librte_bus_dpaa.so.2 dpdk-19.08_1
-librte_pmd_fm10k.so.1 dpdk-19.08_1
-librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_1
-librte_mempool_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_ipn3ke.so.1 dpdk-19.08_1
-librte_pmd_vdev_netvsc.so.1 dpdk-19.08_1
-librte_mempool_dpaa.so.1 dpdk-19.08_1
-librte_pmd_bnx2x.so.1 dpdk-19.08_1
-librte_pmd_enic.so.1 dpdk-19.08_1
-librte_pmd_ixgbe.so.2 dpdk-19.08_1
-librte_common_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_liquidio.so.1 dpdk-19.08_1
-librte_pmd_netvsc.so.2 dpdk-19.08_1
-librte_mempool_bucket.so.1 dpdk-19.08_1
-librte_pmd_virtio_crypto.so.1 dpdk-19.08_1
-librte_pmd_ccp.so.1 dpdk-19.08_1
-librte_bus_vdev.so.2 dpdk-19.08_1
-librte_pmd_tap.so.1 dpdk-19.08_1
-librte_pmd_octeontx_crypto.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_1
-librte_pmd_dsw_event.so.1 dpdk-19.08_1
-librte_pmd_dpaa_event.so.1 dpdk-19.08_1
-librte_pmd_ifc.so.1 dpdk-19.08_1
-librte_stack.so.1 dpdk-19.08_1
-librte_kvargs.so.1 dpdk-19.08_1
-librte_security.so.2 dpdk-19.08_1
-librte_bitratestats.so.2 dpdk-19.08_1
-librte_rcu.so.1 dpdk-19.08_1
-librte_gso.so.1 dpdk-19.08_1
-librte_efd.so.1 dpdk-19.08_1
-librte_cmdline.so.2 dpdk-19.08_1
-librte_telemetry.so.1 dpdk-19.08_1
-librte_pdump.so.3 dpdk-19.08_1
-librte_eventdev.so.7 dpdk-19.08_1
-librte_vhost.so.4 dpdk-19.08_1
-librte_net.so.1 dpdk-19.08_1
-librte_meter.so.3 dpdk-19.08_1
-librte_acl.so.2 dpdk-19.08_1
-librte_mempool.so.5 dpdk-19.08_1
-librte_table.so.3 dpdk-19.08_1
-librte_power.so.1 dpdk-19.08_1
-librte_reorder.so.1 dpdk-19.08_1
-librte_ring.so.2 dpdk-19.08_1
-librte_ethdev.so.12 dpdk-19.08_1
-librte_bbdev.so.1 dpdk-19.08_1
-librte_ipsec.so.1 dpdk-19.08_1
-librte_timer.so.1 dpdk-19.08_1
-librte_cfgfile.so.2 dpdk-19.08_1
-librte_member.so.1 dpdk-19.08_1
-librte_compressdev.so.1 dpdk-19.08_1
-librte_mbuf.so.5 dpdk-19.08_1
-librte_hash.so.2 dpdk-19.08_1
-librte_flow_classify.so.1 dpdk-19.08_1
-librte_metrics.so.1 dpdk-19.08_1
-librte_cryptodev.so.8 dpdk-19.08_1
-librte_rawdev.so.1 dpdk-19.08_1
-librte_kni.so.2 dpdk-19.08_1
+librte_lpm.so.2 dpdk-19.08_5
+librte_sched.so.3 dpdk-19.08_5
+librte_eal.so.11 dpdk-19.08_5
+librte_pci.so.1 dpdk-19.08_5
+librte_gro.so.1 dpdk-19.08_5
+librte_jobstats.so.1 dpdk-19.08_5
+librte_bpf.so.1 dpdk-19.08_5
+librte_ip_frag.so.1 dpdk-19.08_5
+librte_port.so.3 dpdk-19.08_5
+librte_latencystats.so.1 dpdk-19.08_5
+librte_pipeline.so.3 dpdk-19.08_5
+librte_distributor.so.1 dpdk-19.08_5
+librte_pmd_vmxnet3.so.1 dpdk-19.08_5
+librte_pmd_dpaa_sec.so.1 dpdk-19.08_5
+librte_common_octeontx.so.1 dpdk-19.08_5
+librte_pmd_iavf.so.1 dpdk-19.08_5
+librte_pmd_octeontx_event.so.1 dpdk-19.08_5
+librte_pmd_ring.so.2 dpdk-19.08_5
+librte_rawdev_skeleton.so.1 dpdk-19.08_5
+librte_pmd_qat.so.1 dpdk-19.08_5
+librte_pmd_hinic.so.1 dpdk-19.08_5
+librte_bus_vmbus.so.2 dpdk-19.08_5
+librte_pmd_null.so.2 dpdk-19.08_5
+librte_pmd_bbdev_null.so.1 dpdk-19.08_5
+librte_common_dpaax.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_event.so.2 dpdk-19.08_5
+librte_pmd_bnxt.so.2 dpdk-19.08_5
+librte_bus_ifpga.so.2 dpdk-19.08_5
+librte_pmd_pcap.so.1 dpdk-19.08_5
+librte_pmd_kni.so.1 dpdk-19.08_5
+librte_pmd_enetc.so.1 dpdk-19.08_5
+librte_pmd_atlantic.so.1 dpdk-19.08_5
+librte_mempool_stack.so.1 dpdk-19.08_5
+librte_pmd_opdl_event.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_5
+librte_pmd_avp.so.1 dpdk-19.08_5
+librte_pmd_cxgbe.so.1 dpdk-19.08_5
+librte_pmd_crypto_scheduler.so.1 dpdk-19.08_5
+librte_pmd_openssl.so.1 dpdk-19.08_5
+librte_pmd_octeontx2_event.so.1 dpdk-19.08_5
+librte_pmd_sfc.so.1 dpdk-19.08_5
+librte_pmd_i40e.so.2 dpdk-19.08_5
+librte_pmd_e1000.so.1 dpdk-19.08_5
+librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_5
+librte_rawdev_ioat.so.1 dpdk-19.08_5
+librte_pmd_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_sw_event.so.1 dpdk-19.08_5
+librte_mempool_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_5
+librte_rawdev_ntb.so.1 dpdk-19.08_5
+librte_pmd_memif.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_sec.so.2 dpdk-19.08_5
+librte_pmd_failsafe.so.1 dpdk-19.08_5
+librte_pmd_thunderx.so.1 dpdk-19.08_5
+librte_pmd_octeontx.so.1 dpdk-19.08_5
+librte_pmd_dpaa.so.1 dpdk-19.08_5
+librte_pmd_caam_jr.so.1 dpdk-19.08_5
+librte_pmd_virtio.so.1 dpdk-19.08_5
+librte_pmd_octeontx_compress.so.1 dpdk-19.08_5
+librte_pmd_zlib.so.1 dpdk-19.08_5
+librte_bus_pci.so.2 dpdk-19.08_5
+librte_pmd_bond.so.2 dpdk-19.08_5
+librte_pmd_ice.so.1 dpdk-19.08_5
+librte_pmd_skeleton_event.so.1 dpdk-19.08_5
+librte_mempool_ring.so.1 dpdk-19.08_5
+librte_pmd_octeontx2.so.1 dpdk-19.08_5
+librte_mempool_octeontx.so.1 dpdk-19.08_5
+librte_pmd_ark.so.1 dpdk-19.08_5
+librte_pmd_null_crypto.so.1 dpdk-19.08_5
+librte_pmd_ena.so.1 dpdk-19.08_5
+librte_pmd_axgbe.so.1 dpdk-19.08_5
+librte_common_cpt.so.1 dpdk-19.08_5
+librte_pmd_af_packet.so.1 dpdk-19.08_5
+librte_pmd_vhost.so.2 dpdk-19.08_5
+librte_pmd_softnic.so.1 dpdk-19.08_5
+librte_pmd_nfp.so.1 dpdk-19.08_5
+librte_bus_fslmc.so.2 dpdk-19.08_5
+librte_bus_dpaa.so.2 dpdk-19.08_5
+librte_pmd_fm10k.so.1 dpdk-19.08_5
+librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_5
+librte_mempool_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_ipn3ke.so.1 dpdk-19.08_5
+librte_pmd_vdev_netvsc.so.1 dpdk-19.08_5
+librte_mempool_dpaa.so.1 dpdk-19.08_5
+librte_pmd_bnx2x.so.1 dpdk-19.08_5
+librte_pmd_enic.so.1 dpdk-19.08_5
+librte_pmd_ixgbe.so.2 dpdk-19.08_5
+librte_common_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_liquidio.so.1 dpdk-19.08_5
+librte_pmd_netvsc.so.2 dpdk-19.08_5
+librte_mempool_bucket.so.1 dpdk-19.08_5
+librte_pmd_virtio_crypto.so.1 dpdk-19.08_5
+librte_pmd_ccp.so.1 dpdk-19.08_5
+librte_bus_vdev.so.2 dpdk-19.08_5
+librte_pmd_tap.so.1 dpdk-19.08_5
+librte_pmd_octeontx_crypto.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_5
+librte_pmd_dsw_event.so.1 dpdk-19.08_5
+librte_pmd_dpaa_event.so.1 dpdk-19.08_5
+librte_pmd_ifc.so.1 dpdk-19.08_5
+librte_stack.so.1 dpdk-19.08_5
+librte_kvargs.so.1 dpdk-19.08_5
+librte_security.so.2 dpdk-19.08_5
+librte_bitratestats.so.2 dpdk-19.08_5
+librte_rcu.so.1 dpdk-19.08_5
+librte_gso.so.1 dpdk-19.08_5
+librte_efd.so.1 dpdk-19.08_5
+librte_cmdline.so.2 dpdk-19.08_5
+librte_telemetry.so.1 dpdk-19.08_5
+librte_pdump.so.3 dpdk-19.08_5
+librte_eventdev.so.7 dpdk-19.08_5
+librte_vhost.so.4 dpdk-19.08_5
+librte_net.so.1 dpdk-19.08_5
+librte_meter.so.3 dpdk-19.08_5
+librte_acl.so.2 dpdk-19.08_5
+librte_mempool.so.5 dpdk-19.08_5
+librte_table.so.3 dpdk-19.08_5
+librte_power.so.1 dpdk-19.08_5
+librte_reorder.so.1 dpdk-19.08_5
+librte_ring.so.2 dpdk-19.08_5
+librte_ethdev.so.12 dpdk-19.08_5
+librte_bbdev.so.1 dpdk-19.08_5
+librte_ipsec.so.1 dpdk-19.08_5
+librte_timer.so.1 dpdk-19.08_5
+librte_cfgfile.so.2 dpdk-19.08_5
+librte_member.so.1 dpdk-19.08_5
+librte_compressdev.so.1 dpdk-19.08_5
+librte_mbuf.so.5 dpdk-19.08_5
+librte_hash.so.2 dpdk-19.08_5
+librte_flow_classify.so.1 dpdk-19.08_5
+librte_metrics.so.1 dpdk-19.08_5
+librte_cryptodev.so.8 dpdk-19.08_5
+librte_rawdev.so.1 dpdk-19.08_5
+librte_kni.so.2 dpdk-19.08_5
 libredwg.so.0 libredwg-0.9_1
 libgcj-tools.so.17 libgcj-6.5.0_1
 libgcj_bc.so.1 libgcj-6.5.0_1
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 698676095074..9a2ca615b25e 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=4
+revision=5
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
 }
 
 dpdk-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/dpdk-pdump

From 3409ae779a140f23e63efbd8d05ab201748bf53c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 2672/3458] easyrsa: rebuild against OpenSSL

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

diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb470556430..b4145ca7dbae 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,9 +1,9 @@
 # Template file for 'easyrsa'
 pkgname=easyrsa
 version=3.0.8
-revision=1
+revision=2
 wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
 short_desc="Simple shell based CA utility"
 maintainer="Adam Gausmann <agausmann@fastmail.com>"
 license="GPL-2.0-only"

From 4bb51c89cbd4e5425c558fa1cff685336895a37b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 2673/3458] ecryptfs-utils: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl-1.1.x.patch               | 76 +++++++++++++++++++
 srcpkgs/ecryptfs-utils/template               |  4 +-
 3 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch

diff --git a/common/shlibs b/common/shlibs
index e3adbd8b667d..c62565d20c2a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1116,7 +1116,7 @@ libvdemgmt.so.0 libvde2-2.3.2_1
 libvdehist.so.0 libvde2-2.3.2_1
 libvdesnmp.so.0 libvde2-2.3.2_1
 libsbc.so.1 sbc-1.0_1
-libecryptfs.so.1 libecryptfs-104_1
+libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
 libxar.so.1 xar-1.5.2_1
 libmikmod.so.3 libmikmod-3.1.12_1
diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 000000000000..5c3e419a91d1
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++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;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00fd..3d25252fffe5 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'ecryptfs-utils'
 pkgname=ecryptfs-utils
 version=111
-revision=8
+revision=9
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin
  --with-pamdir=/usr/lib/security --enable-gpg --enable-gui
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
 depends="gettext"
 _desc="Ecryptfs cryptographic filesystem"
 short_desc="${_desc} - utilities"

From c0773feb254649be6d9e36a7529c453b2eba2d99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 2674/3458] efitools: rebuild against OpenSSL

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

diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053f..83dc738ccbee 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
 # Template file for 'efitools'
 pkgname=efitools
 version=1.9.2
-revision=4
+revision=5
 archs="x86_64* i686* arm* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
 short_desc="Tools to manipulate EFI secure boot platforms"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"

From 52546c58125ec5ff281cf2f5dfdd44df81c2fbd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 2675/3458] efl: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index c62565d20c2a..eb8ec6a12377 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1482,42 +1482,42 @@ libvlc_xcb_events.so.0 libvlc-3.0.2_1
 libcmocka.so.0 cmocka-1.1.1_1
 libbtrfs.so.0 libbtrfs-3.12_1
 libbtrfsutil.so.1 libbtrfsutil-5.4_1
-libecore_audio.so.1 efl-1.12.0_1
-libecore_con.so.1 efl-1.12.0_1
-libecore_evas.so.1 efl-1.12.0_1
-libecore_file.so.1 efl-1.12.0_1
-libecore_imf_evas.so.1 efl-1.12.0_1
-libecore_imf.so.1 efl-1.12.0_1
-libecore_input_evas.so.1 efl-1.12.0_1
-libecore_input.so.1 efl-1.12.0_1
-libecore_ipc.so.1 efl-1.12.0_1
-libecore.so.1 efl-1.12.0_1
-libecore_x.so.1 efl-1.12.0_1
-libecore_wl2.so.1 efl-1.24.2_1
-libecore_drm2.so.1 efl-1.24.2_1
-libedje.so.1 efl-1.12.0_1
-libeet.so.1 efl-1.12.0_1
-libeeze.so.1 efl-1.12.0_1
-libefreet_mime.so.1 efl-1.12.0_1
-libefreet.so.1 efl-1.12.0_1
-libefreet_trash.so.1 efl-1.12.0_1
-libeina.so.1 efl-1.12.0_1
-libeio.so.1 efl-1.12.0_1
-libeldbus.so.1 efl-1.12.0_1
-libelput.so.1 efl-1.24.2_1
-libembryo.so.1 efl-1.12.0_1
-libemotion.so.1 efl-1.12.0_1
-libeo.so.1 efl-1.12.0_1
-libethumb_client.so.1 efl-1.12.0_1
-libethumb.so.1 efl-1.12.0_1
-libevas.so.1 efl-1.12.0_1
-libefl.so.1 efl-1.12.0_1
-libefl_canvas_wl.so.1 efl-1.24.2_1
-libelua.so.1 efl-1.13.0_1
-libelocation.so.1 efl-1.13.0_1
-libelementary.so.1 efl-1.18.0_1
-libector.so.1 efl-1.18.1_1
-libemile.so.1 efl-1.18.1_1
+libecore_audio.so.1 efl-1.25.1_2
+libecore_con.so.1 efl-1.25.1_2
+libecore_evas.so.1 efl-1.25.1_2
+libecore_file.so.1 efl-1.25.1_2
+libecore_imf_evas.so.1 efl-1.25.1_2
+libecore_imf.so.1 efl-1.25.1_2
+libecore_input_evas.so.1 efl-1.25.1_2
+libecore_input.so.1 efl-1.25.1_2
+libecore_ipc.so.1 efl-1.25.1_2
+libecore.so.1 efl-1.25.1_2
+libecore_x.so.1 efl-1.25.1_2
+libecore_wl2.so.1 efl-1.25.1_2
+libecore_drm2.so.1 efl-1.25.1_2
+libedje.so.1 efl-1.25.1_2
+libeet.so.1 efl-1.25.1_2
+libeeze.so.1 efl-1.25.1_2
+libefreet_mime.so.1 efl-1.25.1_2
+libefreet.so.1 efl-1.25.1_2
+libefreet_trash.so.1 efl-1.25.1_2
+libeina.so.1 efl-1.25.1_2
+libeio.so.1 efl-1.25.1_2
+libeldbus.so.1 efl-1.25.1_2
+libelput.so.1 efl-1.25.1_2
+libembryo.so.1 efl-1.25.1_2
+libemotion.so.1 efl-1.25.1_2
+libeo.so.1 efl-1.25.1_2
+libethumb_client.so.1 efl-1.25.1_2
+libethumb.so.1 efl-1.25.1_2
+libevas.so.1 efl-1.25.1_2
+libefl.so.1 efl-1.25.1_2
+libefl_canvas_wl.so.1 efl-1.25.1_2
+libelua.so.1 efl-1.25.1_2
+libelocation.so.1 efl-1.25.1_2
+libelementary.so.1 efl-1.25.1_2
+libector.so.1 efl-1.25.1_2
+libemile.so.1 efl-1.25.1_2
 libcjs.so.0 cjs-2.0.0_1
 libmuffin.so.0 muffin-2.0.5_1
 libmuffin-cogl-pango-0.so muffin-4.0.5_1
@@ -1883,9 +1883,9 @@ libfontembed.so.1 libcups-filters-1.17.5_1
 libjemalloc.so.2 jemalloc-4.0.0_1
 liblucene++.so.0 Lucene++-3.0.6_1
 liblucene++-contrib.so.0 Lucene++-3.0.6_1
-libeolian.so.1 efl-1.11.2_2
-libecore_avahi.so.1 efl-1.11.2_2
-libephysics.so.1 efl-1.11.2_2
+libeolian.so.1 efl-1.25.1_2
+libecore_avahi.so.1 efl-1.25.1_2
+libephysics.so.1 efl-1.25.1_2
 libgunicode.so.5 fontforge-2.0.20190317_1
 libgutils.so.3 fontforge-2.0.20190317_1
 libgioftp.so.2 fontforge-2.0.20140101_3
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bbc..16918622db96 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
  $(vopt_bool glib glib)"
 hostmakedepends="pkg-config gettext"
 makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
  fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
  libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
  avahi-libs-devel eudev-libudev-devel bullet-devel

From 60cb57931612882cf0513f441a873d9328c948c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 2676/3458] eggdrop: rebuild against OpenSSL

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

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e4298..7790a5d6dafe 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
 version=1.8.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
 short_desc="Internet relay chat (IRC) bot"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"

From cc12a2254a4ce8ebe3acb3d37d4ed0683732b4c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 2677/3458] eid-mw: rebuild against OpenSSL

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

diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b9..0734bdb13018 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
 # Template file for 'eid-mw'
 pkgname=eid-mw
 version=4.4.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
  gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
 depends="pcsc-acsccid pcsc-ccid pcsc-tools"
 short_desc="Middleware for Belgian eID"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 9e4dcb1cf166289753fb3746f69749197ba0b474 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 2678/3458] eiskaltdcpp-qt: rebuild against OpenSSL

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

diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465a..618fa29772dc 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
 version=2.4.1
-revision=1
+revision=2
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 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 lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-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"

From 40cce03b3abd3ffddf85671c7651c775841a5e61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 2679/3458] ejabberd: rebuild against OpenSSL

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

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc4..be10fd98a2ea 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
 version=20.07
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
  --enable-redis --enable-elixir $(vopt_enable sqlite)"
 conf_files="/etc/ejabberd/*"
 hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
  $(vopt_if sqlite sqlite-devel) gd-devel"
 depends="erlang"
 short_desc="Robust and massively scalable XMPP platform"

From e936353b02c49a1ab56b2cc9c9b9e0c39a4c0a59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 2680/3458] elinks: rebuild against OpenSSL

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

diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8e..ec37f315d050 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
 # Template file for 'elinks'
 pkgname=elinks
 version=0.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
 short_desc="Full-Featured Text WWW Browser"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 70bf838900090bc84ddd85c0fcf1162f173fdc67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 2681/3458] elog: rebuild against OpenSSL

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

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a81619928..b22afbbe9b1a 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
 version=3.1.4.1
-revision=3
+revision=4
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
 system_accounts="elog"
 short_desc="Logbook system to manage notes through a Web interface"
 maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"

From 18bfeace5088fef7df24cf3cd75d15fcfd823608 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 2682/3458] encfs: rebuild against OpenSSL

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

diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197cc..d041dace80d3 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.9.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
 depends="perl" # for encfssh
 short_desc="Encrypted filesystem in user-space"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e1c52523a455bb98024df57dfe6d3dfb246d2746 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 2683/3458] erlang: rebuild against OpenSSL

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd2..e8cb892fc971 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
 # Template file for 'erlang'
 pkgname=erlang
 version=23.2.6
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
 make_install_target="install install-docs"
 hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
 short_desc="Concurrent functional programming language developed by Ericsson"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 4c1813adb800c8fe6e9f32efc69c4ff18ffc827c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 2684/3458] ettercap: rebuild against OpenSSL

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

diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad577..7fe4c340a079 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
 # Template file for 'ettercap'
 pkgname=ettercap
 version=0.8.3.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
  libltdl-devel libnet-devel libpcap-devel pcre-devel"
 conf_files="/etc/${pkgname}/etter.conf"
 short_desc="Network sniffer/interceptor/logger for ethernet LANs"

From eaa5f0066c721ac2fdbaccc5cedf34888fc56535 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 2685/3458] facter: rebuild against OpenSSL

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

diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 9fca63a366b7..41a1a9d8ba3d 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
 # Template file for 'facter'
 pkgname=facter
 version=3.14.16
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"

From 0c327734dd00bf6637bd740cd8e698afa6db5ea9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 2686/3458] falkon: rebuild against OpenSSL

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

diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c06..1a5eb3cd60bc 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
 # Template file for 'falkon'
 pkgname=falkon
 version=3.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext pkg-config
  qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"

From bf9795850e4309517578896762c836ef340157fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 2687/3458] fbpdf: drop unused LibreSSL makedepends

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

diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e4..805f90a4ca17 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
 _gitshort="${_githash:0:7}"
 wrksrc="fbpdf-${_gitshort}"
 build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel
  gumbo-parser-devel mupdf-devel"
 short_desc="Small framebuffer PDF/DJVU viewer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From ad14694ab187652fa251e4d3d2c537aada4d29cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 2688/3458] fdm: rebuild against OpenSSL

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

diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b3..561f7f0b1cd4 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
 # Template file for 'fdm'
 pkgname=fdm
 version=2.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
 hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
 short_desc="Program to fetch and deliver mail"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"

From 7fcab8973578433b693653af6db178fb4c2fd86e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 2689/3458] fetchmail: rebuild against OpenSSL

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

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e121..a5afbb3c3b4a 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.16
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="fetchmailconf"
 short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From f53c9fc6f5d4618defdcaabc96d0468d61924076 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 2690/3458] ffsend: rebuild against OpenSSL

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

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1a..ea63f7192843 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
 # Template file for 'ffsend'
 pkgname=ffsend
 version=0.2.68
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Fully featured Firefox Send client"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"

From 346ce3d3b6571aaccc790500f1850264b7f6e5a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 20:05:49 +0100
Subject: [PATCH 2691/3458] elog: update to 3.1.4.3.

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

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index b22afbbe9b1a..a69acb5a98f6 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
 # Template file for 'elog'
 pkgname=elog
-version=3.1.4.1
-revision=4
+version=3.1.4.3
+revision=1
 _distver="${version:0:-2}-${version:(-1)}"
 wrksrc="$pkgname-${version%.*}"
 build_style=gnu-makefile
@@ -15,7 +15,7 @@ makedepends="openssl-devel"
 license="GPL-3.0-or-later"
 homepage="https://elog.psi.ch/elog/"
 distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"
-checksum=4bfa2bef6cfa20aba73c9c6c044a4c83f20cf03e7de3c0dda4a4477f28b7b72e
+checksum=e684917c6bbdfbafcbd9012dd5914bd5f3ee14f31f89e12ddb21bc4b41baba03
 
 do_install() {
 	vbin	elog

From 458be880571cb796771232588ecd9b75ca3e588a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 20:18:13 +0100
Subject: [PATCH 2692/3458] elog: actuallly commit all changes

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

diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index a69acb5a98f6..78c5e05253a7 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -3,7 +3,7 @@ pkgname=elog
 version=3.1.4.3
 revision=1
 _distver="${version:0:-2}-${version:(-1)}"
-wrksrc="$pkgname-${version%.*}"
+wrksrc="$pkgname-${_distver}"
 build_style=gnu-makefile
 CFLAGS="-Imxml"
 make_dirs="/var/lib/elog/logbooks 0750 elog elog"
@@ -18,17 +18,17 @@ distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"
 checksum=e684917c6bbdfbafcbd9012dd5914bd5f3ee14f31f89e12ddb21bc4b41baba03
 
 do_install() {
-	vbin	elog
-	vbin	elogd
-	vbin	elconv
-	vman	man/elog.1
-	vmkdir	usr/share/elog
-	vcopy	resources	usr/share/elog
-	vcopy	scripts		usr/share/elog
-	vcopy	themes		usr/share/elog
-	sed -i 	'/\[global\]/s/$/\nLogbook dir = \/var\/lib\/elog\/logbooks/' elogd.cfg
-	sed -i '/\[global\]/s/$/\nResource dir = \/usr\/share\/elog/' elogd.cfg
-	vmkdir	etc/elog
-	vinstall	elogd.cfg	0755	etc/elog
-	vsv	elogd
+	vbin elog
+	vbin elogd
+	vbin elconv
+	vman man/elog.1
+	vmkdir usr/share/elog
+	vcopy resources usr/share/elog
+	vcopy scripts	usr/share/elog
+	vcopy themes usr/share/elog
+	sed -i '/\[global\]/s/$/\nLogbook dir = \/var\/lib\/elog\/logbooks/' elogd.cfg.example
+	sed -i '/\[global\]/s/$/\nResource dir = \/usr\/share\/elog/' elogd.cfg.example
+	vmkdir etc/elog
+	vinstall elogd.cfg.example 0755 etc/elog elogd.cfg
+	vsv elogd
 }

From 8d5aac173f7abc011f1a05d19933124153f767ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 2693/3458] fossil: rebuild against OpenSSL

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

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c7..148b72480894 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
 # Template file for 'fossil'
 pkgname=fossil
 version=2.14
-revision=1
+revision=2
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
 hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From ce059fc452528f04ed1558bc56c44ef9bab55d3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 2694/3458] fractal: rebuild against OpenSSL

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

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd3..115057b6d424 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
 # Template file for 'fractal'
 pkgname=fractal
 version=4.2.2
-revision=2
+revision=3
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
  cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
  gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
  gmp-devel libsecret-devel libhandy-devel rust-std"

From 465d0172af4a3a409a8ec17bc84f1eb85e588a85 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 2695/3458] freerdp: rebuild against OpenSSL

---
 common/shlibs            | 26 +++++++++++++-------------
 srcpkgs/freerdp/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eb8ec6a12377..60efd454b8dd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1624,19 +1624,19 @@ libKF5Mime.so.5 kmime-17.12.1_1
 libKF5Kirigami2.so.5 kirigami2-5.47.0_1
 libtaskmanager.so.6 plasma-workspace-5.8.4_1
 libnotificationmanager.so.1 plasma-workspace-5.15.90_1
-libfreerdp-client2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr-tools2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp-core.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-kbd.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-utils.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-codec.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-gdi.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-cache.so.1.0 libfreerdp-1.0.2_2
-libuwac0.so.0 libfreerdp-2.2.0_1
+libfreerdp-client2.so.2 libfreerdp-2.2.0_3
+libfreerdp2.so.2 libfreerdp-2.2.0_3
+libwinpr2.so.2 libfreerdp-2.2.0_3
+libwinpr-tools2.so.2 libfreerdp-2.2.0_3
+libfreerdp-core.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-channels.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-rail.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-kbd.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-utils.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-codec.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3
+libuwac0.so.0 libfreerdp-2.2.0_3
 libcppunit-1.14.so.0 libcppunit-1.14.0_1
 libcalc.so.2.12.7.1 libcalc-2.12.7.1_1
 libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f9..07e4f2321011 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
 version=2.2.0
-revision=2
+revision=3
 wrksrc="FreeRDP-${version}"
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
 hostmakedepends="pkg-config xmlto wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
  libXcursor-devel libXinerama-devel  libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
  libxkbcommon-devel wayland-devel cairo-devel"
 short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
 
 freerdp-devel_package() {
 	short_desc+=" - development files"
-	depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+	depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

From c6876596abd3245c2b5cd6a2e1c573143e22686b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 2696/3458] freshplayerplugin: rebuild against OpenSSL

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

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca4..a6205c0ba98d 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 167421904e8203ccb75ff7c7e05056c8c2e0304c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 2697/3458] gambit: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 60efd454b8dd..a7b51545a88c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3639,7 +3639,7 @@ libbcc_bpf.so.0 bcc-0.10.0_1
 libde265.so.0 libde265-1.0.3_1
 libheif.so.1 libheif-1.4.0_1
 libuninameslist.so.1 libuninameslist-20190701_1
-libgambit.so.4 gambit-4.9.3_1
+libgambit.so.4 gambit-4.9.3_6
 liblog4cpp.so.5 log4cpp-1.1.3_1
 libnuspell.so.4 libnuspell-4.2.0_1
 liblog4c.so.3 log4c-1.2.4_1
diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a8..3f7ec840d264 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
 # Template file for 'gambit'
 pkgname=gambit
 version=4.9.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
  --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
  --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"

From 2e2d34bab132154d5a2094c8d9ca7a65428c3033 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 2698/3458] gatling: rebuild against OpenSSL

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

diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7f..d1d83c202269 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
 # Template file for 'gatling'
 pkgname=gatling
 version=0.15
-revision=9
+revision=10
 build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2"

From 0885c329e29b50ce34f735aed0f3e791bd5ac614 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 2699/3458] gcsf: rebuild against OpenSSL

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

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef9..7d4cc54bb192 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.25
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From 2db90915de21530395cafeceaa68380a9f4eb977 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 2700/3458] gemserv: rebuild against OpenSSL

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

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e0..c1dfb792740d 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
 # Template file for 'gemserv'
 pkgname=gemserv
 version=0.4.5
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Gemini server written in rust"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From f9138dc0e8ff8d421496a7b56bbe2776a28e9d63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 2701/3458] gerbil: rebuild against OpenSSL

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

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b0300..3d141bee627b 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
 # Template file for 'gerbil'
 pkgname=gerbil
 version=0.16
-revision=2
+revision=3
 hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"

From e6a54587b7d864fe023b4d4e8411d2d6b58eead7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 2702/3458] getdns: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/getdns/template | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a7b51545a88c..753d49a74af4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3510,10 +3510,10 @@ libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.1 libkdegames-19.12.3_1
 libidn2.so.0 libidn2-2.1.1_1
 libgmime-3.0.so.0 gmime3-3.2.3_1
-libgetdns.so.10 getdns-1.5.0_1
-libgetdns_ext_event.so.10 getdns-1.5.0_1
-libgetdns_ext_ev.so.10 getdns-1.5.0_1
-libgetdns_ext_uv.so.10 getdns-1.5.0_1
+libgetdns.so.10 getdns-1.5.1_7
+libgetdns_ext_event.so.10 getdns-1.5.1_7
+libgetdns_ext_ev.so.10 getdns-1.5.1_7
+libgetdns_ext_uv.so.10 getdns-1.5.1_7
 libzck.so.1 zchunk-1.0.2_2
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af8..c2ddfde9fbc7 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
 # Template file for 'getdns'
 pkgname=getdns
 version=1.5.1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-libev --with-libevent --with-libuv
  --with-ssl=${XBPS_CROSS_BASE}/usr"

From 20801053c2afcd9a5af5564fa420911518eb1b51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 2703/3458] gftp: rebuild against OpenSSL

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

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51df..bdbad8e9c2bb 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"

From b41cc32c8541f89fee0be0bc0603d50b74c14a04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 2704/3458] gip: rebuild against OpenSSL

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

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d1..83ebc476bc84 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
 # Template file for 'gip'
 pkgname=gip
 version=0.7.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool to get global IP address"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From d4765dcc4e1e18c4b35c1af3ce51e2adff9caa97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 2705/3458] git-brws: rebuild against OpenSSL

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

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d21..bb301c160201 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="CLI tool for opening web page of the hoster for a git remote"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 4f9ccb3163d780b05d7305ad6b94f8e68e85c118 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 2706/3458] git-crypt: rebuild against OpenSSL

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

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d451..0f81c8dc313c 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"

From 0dfa0dc41d48fad13df49d31e0d745571d9a61d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 2707/3458] git-series: rebuild against OpenSSL

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

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db0..53795ed697e7 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=12
+revision=13
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
 	cargo update --package libc --precise 0.2.55
 	cargo update --package url --precise 1.7.2
+	cargo update --package openssl-sys --precise 0.9.60
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 296b0e1e76132e8413cf9a9ce13d3bb24e860560 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 2708/3458] gitui: rebuild against OpenSSL

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

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d26688..41ebe9dd5640 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
 # Template file for 'gitui'
 pkgname=gitui
 version=0.11.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libxcb-devel libgit2-devel"

From da03301904672316fd7c2859557df46a9dd3e694 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 2709/3458] gkrellm: rebuild against OpenSSL

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

diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d3..f2c1721ac5ee 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
 # Template file for 'gkrellm'
 pkgname=gkrellm
 version=2.3.11
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
 short_desc="GTK2 based system monitor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0.or-later"

From fdc0f0308c76807e32c26041ddf13f7b7d2061fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 2710/3458] glusterfs: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 753d49a74af4..7d722d7a219c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1462,13 +1462,13 @@ libgdiplus.so.0 libgdiplus-2.10.9_1
 libmonosgen-2.0.so.1 mono-3.2.3_1
 libshout-idjc.so.3 libshout-idjc-2.3.1_1
 libmonoboehm-2.0.so.1 mono-3.2.3_1
-libglusterfs.so.0 libglusterfs-3.8.0_1
-libgfdb.so.0 libglusterfs-3.8.0_1
-libgfchangelog.so.0 libglusterfs-3.8.0_1
-libgfrpc.so.0 libglusterfs-3.8.0_1
-libgfxdr.so.0 libglusterfs-3.8.0_1
-libgfapi.so.0 libglusterfs-3.8.0_1
-libglusterd.so.0 libglusterfs-8.1_1
+libglusterfs.so.0 libglusterfs-8.3_2
+libgfdb.so.0 libglusterfs-8.3_2
+libgfchangelog.so.0 libglusterfs-8.3_2
+libgfrpc.so.0 libglusterfs-8.3_2
+libgfxdr.so.0 libglusterfs-8.3_2
+libgfapi.so.0 libglusterfs-8.3_2
+libglusterd.so.0 libglusterfs-8.3_2
 libsnapper.so.5 libsnapper-0.4.1_1
 libtsm.so.3 libtsm-3_1
 libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e11..158a5c5b7954 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=8.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
  ac_cv_file__etc_centos_release=no"
 pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
 hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
  liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
 # python is required by gsyncd.
 depends="python3"

From 73c9d21025d4871168d1f8d57d10184bd5581653 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 2711/3458] gnome-podcasts: rebuild against OpenSSL

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

diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b8..8f104462ae56 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-podcasts'
 pkgname=gnome-podcasts
 version=0.4.8
-revision=1
+revision=2
 wrksrc="podcasts-${version}"
 build_style=meson
 build_helper="rust"
 hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
 makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
 short_desc="Listen to your favorite podcasts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From d60c8b44eae137d28d8a0f7bebec175c677134df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 2712/3458] godot: drop unused libressl makedepends

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0d..9be5b1ab40a0 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
 hostmakedepends="pkg-config clang"
 makedepends="
  alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
  bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
  opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
  miniupnpc-devel pcre2-devel"
@@ -34,8 +34,8 @@ CFLAGS+=" -fPIE -fPIC"
 LDFLAGS+=" -pie"
 
 post_extract() {
-	sed -i -e "/openssl_version =/,+4d" platform/x11/detect.py
-	sed -i -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' platform/x11/crash_handler_x11.cpp
+	vsed -e 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
+		-i platform/x11/crash_handler_x11.cpp
 }
 
 pre_build() {

From 5f88436812334c50a61d42d70673ccb2d1f3ae1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 2713/3458] gogglesmm: rebuild against OpenSSL

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

diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c8915..29579786726d 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
 # Template file for 'gogglesmm'
 pkgname=gogglesmm
 version=1.2.1
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
 hostmakedepends="pkg-config desktop-file-utils"
 makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
  faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Music Manager and Player"

From 2a1088cf9798dd5f3d2f1f942df207b295d142c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 2714/3458] grpc: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 7d722d7a219c..38582b7adf50 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3600,18 +3600,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.15 grpc-1.36.0_1
-libgpr.so.15 grpc-1.36.0_1
-libgrpc++.so.1 grpc-1.19.1_1
-libgrpc++_alts.so.1 grpc-1.32.0_1
-libgrpc++_error_details.so.1 grpc-1.19.1_1
-libgrpc++_reflection.so.1 grpc-1.19.1_1
-libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.15 grpc-1.36.0_1
-libgrpc_plugin_support.so.1 grpc-1.32.0_1
-libgrpc_unsecure.so.15 grpc-1.36.0_1
-libgrpcpp_channelz.so.1 grpc-1.19.1_1
-libupb.so.15 grpc-1.36.0_1
+libaddress_sorting.so.15 grpc-1.36.0_2
+libgpr.so.15 grpc-1.36.0_2
+libgrpc++.so.1 grpc-1.36.0_2
+libgrpc++_alts.so.1 grpc-1.36.0_2
+libgrpc++_error_details.so.1 grpc-1.36.0_2
+libgrpc++_reflection.so.1 grpc-1.36.0_2
+libgrpc++_unsecure.so.1 grpc-1.36.0_2
+libgrpc.so.15 grpc-1.36.0_2
+libgrpc_plugin_support.so.1 grpc-1.36.0_2
+libgrpc_unsecure.so.15 grpc-1.36.0_2
+libgrpcpp_channelz.so.1 grpc-1.36.0_2
+libupb.so.15 grpc-1.36.0_2
 libircclient.so.1 libircclient-1.10_1
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a2d328497b0b..708cd5b6518a 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.36.0
-revision=2
+revision=3
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
  -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
  -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel libressl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
 makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
 short_desc="High performance, open source, general RPC framework"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 7a117c621dc09575c91da5693739289d3472b657 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 2715/3458] grub-customizer: rebuild against OpenSSL

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

diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e9..37a8467653f4 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
 # Template file for 'grub-customizer'
 pkgname=grub-customizer
 version=5.1.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
 depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"

From c989d80901309389d7ab2e4dd483e7643116f2bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 2716/3458] gsoap: rebuild against OpenSSL

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

diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805ed..c0cf0340566b 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
 # Template file for 'gsoap'
 pkgname=gsoap
 version=2.8.91
-revision=2
+revision=3
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
 configure_args="--enable-ipv6"
 hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"

From 9a08e5718b72c0de34ab32436b1f1b52488ce453 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 2717/3458] gst-plugins-bad1: rebuild against OpenSSL

---
 common/shlibs                     | 12 ++++++------
 srcpkgs/gst-plugins-bad1/template |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 38582b7adf50..689ac8be0d9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1155,12 +1155,12 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1
 libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1
-libgstphotography-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1
+libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0bc..f56e0b414b24 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.18.3
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
  -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
 hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
  orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
  gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
  libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
  faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel

From 268dc24a7460dc0187beeda88f75129cdb26526b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 2718/3458] gwenhywfar: rebuild against OpenSSL

---
 common/shlibs               | 10 +++++-----
 srcpkgs/gwenhywfar/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 689ac8be0d9c..4c4ca3fccd54 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1546,11 +1546,11 @@ libdom.so.0 libdom-0.0.1_1
 libslang.so.2 slang-2.2.4_1
 libtre.so.5 tre-0.8.0_1
 libktoblzcheck.so.1 ktoblzcheck-1.43_2
-libgwenhywfar.so.79 gwenhywfar-5.1.0_1
-libgwengui-gtk2.so.79 gwenhywfar-gtk-5.3.0_1
-libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.3.0_1
-libgwengui-cpp.so.79 gwenhywfar-5.3.0_1
-libgwengui-qt5.so.79 gwenhywfar-qt5-5.3.0_1
+libgwenhywfar.so.79 gwenhywfar-5.4.0_2
+libgwengui-gtk2.so.79 gwenhywfar-gtk-5.4.0_2
+libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.4.0_2
+libgwengui-cpp.so.79 gwenhywfar-5.4.0_2
+libgwengui-qt5.so.79 gwenhywfar-qt5-5.4.0_2
 libaqbanking.so.44 aqbanking-6.0.0_1
 libaqnone.so.35 aqbanking-5.6.10_1
 libaqhbci.so.24 aqbanking-5.7.8_1
diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706af..89adfe051249 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
 version=5.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-visibility --disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"

From e942eeec83869cecba8bf9ac5b15bca8079a1c91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 2719/3458] h2o: rebuild against OpenSSL

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

diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac28405..3b300024f05c 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=2.2.6
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
 depends="perl"
 short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d2fc9b5218266e2bbea7770082d470a280c9e102 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 2720/3458] haproxy: rebuild against OpenSSL

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

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f264..ff5411c3422b 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
 # Template file for 'haproxy'
 pkgname=haproxy
 version=2.3.5
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
 hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
 checkdepends="varnish"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"

From 4bf95f7ccae3daef3e47e69d212e88c0632d354c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 2721/3458] hcxdumptool: rebuild against OpenSSL

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

diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c959..e7835044f911 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxdumptool'
 pkgname=hcxdumptool
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Small tool to capture packets from wlan devices"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From b781d0b83519a7ed0d9953aeef00f4bd1ede9a34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 2722/3458] libnice: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 4c4ca3fccd54..49395b6d7543 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -823,7 +823,7 @@ libfolks.so.25 folks-0.14.0_1
 libfolks-dummy.so.25 folks-0.14.0_1
 libfolks-telepathy.so.25 folks-0.14.0_1
 libfolks-eds.so.25 folks-0.14.0_1
-libnice.so.10 libnice-0.1.0_1
+libnice.so.10 libnice-0.1.18_3
 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1
 libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73f..6ccfa29c6c8b 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
 # Template file for 'libnice'
 pkgname=libnice
 version=0.1.18
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
  -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
 short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a05c710de5770454c92c475e41cd07fd622a01f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 2723/3458] rtmpdump: rebuild with gnutls

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

diff --git a/common/shlibs b/common/shlibs
index 49395b6d7543..adabfd4f6786 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1103,7 +1103,7 @@ libpwquality.so.1 libpwquality-1.1.1_1
 libisl.so.10 isl-0.10_1
 libisl.so.19 isl15-0.19_1
 libcloog-isl.so.4 cloog-0.18.1_1
-librtmp.so.1 librtmp-2.4.20161210_1
+librtmp.so.1 librtmp-2.4.20161210_9
 libORBit-2.so.0 libORBit2-2.14.19_1
 libORBit-imodule-2.so.0 libORBit2-2.14.19_1
 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f186..911122cc807a 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
 # Template file for 'rtmpdump'
 pkgname=rtmpdump
 version=2.4.20161210
-revision=8
+revision=9
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 build_options="gnutls"
+build_options_default="gnutls"
 
 do_build() {
 	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}

From 3ce04af9dd841a912b617c544724cd31df65b49d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 2724/3458] unbound: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index adabfd4f6786..02c626464239 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3062,7 +3062,7 @@ libdockapp.so.3 libdockapp-0.7.2_1
 libkrdccore.so.5 krdc-17.04.3_1
 libArcus.so.3 libArcus-3.1.0_1
 libgutenprint.so.9 gutenprint-5.3.3_1
-libunbound.so.8 libunbound-1.10.0_2
+libunbound.so.8 libunbound-1.13.1_2
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3c..8cf9156a3c81 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
 # Template file for 'unbound'
 pkgname=unbound
 version=1.13.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
  --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
 }
 
 unbound-devel_package() {
-	depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+	depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 6783f2a8129cfb8d4b7c567b484f42bac84da7cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 2725/3458] hcxtools: rebuild against OpenSSL

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

diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f76..eac1ad48c1ec 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -1,9 +1,9 @@
 # Template file for 'hcxtools'
 pkgname=hcxtools
 version=6.1.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
 short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
 maintainer="Felix Hanley <felix@userspace.com.au>"
 license="MIT"

From b64b00ff84364556c6d17d8e03499784441c0d2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 2726/3458] hexchat: rebuild against OpenSSL

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

diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf170..90b8de48193a 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
 # Template file for 'hexchat'
 pkgname=hexchat
 version=2.14.3
-revision=4
+revision=5
 build_style=meson
 configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
  -Dwith-perl=/usr/bin/perl -Dwith-python=python3
  -Dwith-lua=$(vopt_if LuaJIT luajit lua)"
 hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-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 enchant2"

From f218f83416076f2fc069e228c924a1973d9fc3f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 2727/3458] hfsprogs: rebuild against OpenSSL

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

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cce..41bd475db09e 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"

From 06c2a596192b0cc97c1ed74892cfbf9a5ff52c75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 2728/3458] hitch: rebuild against OpenSSL

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

diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dcaa..2ccae03e3065 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
 # Template file for 'hitch'
 pkgname=hitch
 version=1.5.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
 checkdepends="lsof curl"
 short_desc="Libev-based high performance SSL/TLS proxy"
 maintainer="Jannis Christ <hello@jannis.ovh>"

From fa27e378fa4cd2a8e03d409c77cff81691950e49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 2729/3458] hostapd: rebuild against OpenSSL

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

diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9cef..20e16a32fc0f 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
 # Template file for 'hostapd'
 pkgname=hostapd
 version=2.9
-revision=2
+revision=3
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
 short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From a4397ca33056c5b41b671148611f86a91ea6a4f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 2730/3458] hplip: rebuild against OpenSSL

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

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8fa..397508c55a3f 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=4
+revision=5
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -21,7 +21,7 @@ configure_args="
 conf_files="/etc/hp/hplip.conf"
 make_dirs="/var/lib/hp 0755 root root"
 hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
  ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
  avahi-libs-devel"
 depends="python3-gobject python3-dbus desktop-file-utils

From 77394407537b43f2c21aa55428f0620f2e77a26d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 2731/3458] httpdirfs: rebuild against OpenSSL

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

diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec5..cbff9e7ae259 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
 # Template file for 'httpdirfs'
 pkgname=httpdirfs
 version=1.2.0
-revision=2
+revision=3
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
 makedepends="libcurl-devel fuse-devel gumbo-parser-devel

From 56f24d02d575dd782338e1bab49cdc6dccca65dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 2732/3458] httrack: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index 02c626464239..d6eaf862becf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2175,8 +2175,8 @@ libOpenImageIO.so.1.8 openimageio-1.8.12_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
 libpaper.so.1 libpaper-1.1.24_1
-libhtsjava.so.2 httrack-3.48.21_1
-libhttrack.so.2 httrack-3.48.21_1
+libhtsjava.so.2 httrack-3.49.2_7
+libhttrack.so.2 httrack-3.49.2_7
 libbg.so.2 bglibs-2.03_3
 libcvm-command.so.1 cvm-0.97_1
 libcvm-local.so.1 cvm-0.97_1
diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c9..090ec56ca85d 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
 short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From 7c8a2eb052e619675d71c7e2e159990b2e6a24f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 2733/3458] i2pd: rebuild against OpenSSL

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

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c52..de188117e817 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.33.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
  libatomic-devel"
 short_desc="Full-featured C++ implementation of I2P client"
 maintainer="Obosob <obosob@riseup.net>"

From 864aa694b521b71dba24741e51a4b329bb98a3e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 2734/3458] icecast: rebuild against OpenSSL

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

diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40df..920d6ffe9d31 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
 # Template file for 'icecast'
 pkgname=icecast
 version=2.4.4
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
  libtheora-devel libvorbis-devel libxslt-devel"
 short_desc="Free server software for streaming multimedia"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6bd48638535b51784fde404bf7f12d981b7fdb34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 2735/3458] icinga2: rebuild against OpenSSL

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

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04dd..3ad8943fb26d 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=4
+revision=5
 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 libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
  yajl-devel postgresql-libs-devel"
 depends="monitoring-plugins"
 conf_files="/etc/${pkgname}/*.conf

From 2c8a01d208650c619c2548f665fa4ba55d332495 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 2736/3458] imapfilter: rebuild against OpenSSL

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

diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e54..8f516f768c9b 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
 # Template file for 'imapfilter'
 pkgname=imapfilter
 version=2.6.12
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
 hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
 short_desc="Mail filtering utility"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 0fe733df921883e333b563392e8d6deab89b92ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 2737/3458] inadyn: rebuild against OpenSSL

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

diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be65..7b395277e93b 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
 # Template file for 'inadyn'
 pkgname=inadyn
 version=2.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-openssl"
 hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
 short_desc="Small DynDNS client with SSL/TLS support"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1324151edf89fbaa74577fbcb37e09fd62cbdf15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 2738/3458] inspircd: rebuild against OpenSSL

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

diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae07226..7a1f1477a97d 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
 # Template file for 'inspircd'
 pkgname=inspircd
 version=3.8.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"

From fe3bbec2daa083f72fa8fe56dd9eb53eb9acd972 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 2739/3458] ipmitool: rebuild against OpenSSL

---
 .../patches/ipmitool-openssl-1.1.patch        | 89 +++++++++++++++++++
 srcpkgs/ipmitool/template                     |  4 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch

diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 000000000000..18dd076cbd9a
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d06..eab8e525c878 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
 # Template file for 'ipmitool'
 pkgname=ipmitool
 version=1.8.18
-revision=7
+revision=8
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Command-line interface to IPMI-enabled devices"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD"

From 5f933f6505ec717929d18f6ed97502462434d149 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 2740/3458] ipmiutil: rebuild against OpenSSL

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

diff --git a/common/shlibs b/common/shlibs
index d6eaf862becf..5a7fd5cb93c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2603,7 +2603,7 @@ libbuffer.so opencollada-0.0.20160223_1
 libftoa.so opencollada-0.0.20160223_1
 libzlib.so opencollada-1.6.51_1
 libfbclient.so.2 libfbclient3-3.0.4.33054_1
-libipmiutil.so.1 ipmiutil-3.0.0_1
+libipmiutil.so.1 ipmiutil-3.1.3_4
 libqxmpp.so.3 qxmpp-1.2.0_1
 libunwind.so.1 llvm-libunwind-3.8.0_1
 libc++abi.so.1 libcxxabi-3.8.0_1
diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba9..6662a7f65d59 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
 # Template file for 'ipmiutil'
 pkgname=ipmiutil
 version=3.1.3
-revision=3
+revision=4
 archs="i686* x86_64* ppc*"
 build_style=gnu-configure
 configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Series of utilities that perform common IPMI management functions"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-2-Clause, BSD-3-Clause"

From 2f93d04803dc73e7b747764fe40a6a874cd05f1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 2741/3458] iputils: rebuild against OpenSSL

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

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f3583..a65a49c48e6a 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 6829ef4c9d4884cbac7ee5cf7b8ef755e6ba570f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 2742/3458] irssi: rebuild against OpenSSL

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

diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a84..4d8df6bfd24f 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
 hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
  libotr-devel perl"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"

From 3fc6061cf9587ca1af5a6a8189e79b0f947b48fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 2743/3458] isync: rebuild against OpenSSL

---
 srcpkgs/isync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57ce..003288d12030 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
 # Template file for 'isync'
 pkgname=isync
 version=1.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
 depends="ca-certificates"
 short_desc="IMAP and MailDir mailbox synchronizer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 0d62618828d278b697ece09e462b343eb7d2887a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 2744/3458] john: rebuild against OpenSSL

---
 srcpkgs/john/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4ccb..fc807f4e7c84 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
 # Template file for 'john'
 pkgname=john
 version=1.9.0
-revision=3
+revision=4
 _jumbover=1
 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
 build_wrksrc="src"
 build_style=gnu-configure
 configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
 short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-2.0-or-later with OpenSSL-exception"

From c859a27b70c548183b60817d7abaeb6a440fdfb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 2745/3458] kea: change botan build-option to use OpenSSL

---
 common/shlibs        | 40 ++++++++++++++++++++--------------------
 srcpkgs/kea/template |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5a7fd5cb93c9..bbfd167735f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2859,26 +2859,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.12 libkea-1.9.4_1
-libkea-asiolink.so.23 libkea-1.9.5_1
-libkea-cc.so.22 libkea-1.9.5_1
-libkea-cfgclient.so.22 libkea-1.9.4_1
-libkea-cryptolink.so.16 libkea-1.9.2_1
-libkea-database.so.21 libkea-1.9.5_1
-libkea-dhcp++.so.33 libkea-1.9.5_1
-libkea-dhcp_ddns.so.15 libkea-1.9.4_1
-libkea-dhcpsrv.so.43 libkea-1.9.5_1
-libkea-dns++.so.16 libkea-1.9.4_1
-libkea-eval.so.25 libkea-1.9.5_1
-libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.31 libkea-1.9.5_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.26 libkea-1.9.5_1
-libkea-stats.so.18 libkea-1.9.4_1
-libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.32 libkea-1.9.5_1
+libkea-asiodns.so.12 libkea-1.9.5_2
+libkea-asiolink.so.23 libkea-1.9.5_2
+libkea-cc.so.22 libkea-1.9.5_2
+libkea-cfgclient.so.22 libkea-1.9.5_2
+libkea-cryptolink.so.16 libkea-1.9.5_2
+libkea-database.so.21 libkea-1.9.5_2
+libkea-dhcp++.so.33 libkea-1.9.5_2
+libkea-dhcp_ddns.so.15 libkea-1.9.5_2
+libkea-dhcpsrv.so.43 libkea-1.9.5_2
+libkea-dns++.so.16 libkea-1.9.5_2
+libkea-eval.so.25 libkea-1.9.5_2
+libkea-exceptions.so.0 libkea-1.9.5_2
+libkea-hooks.so.31 libkea-1.9.5_2
+libkea-http.so.23 libkea-1.9.5_2
+libkea-log.so.18 libkea-1.9.5_2
+libkea-pgsql.so.18 libkea-1.9.5_2
+libkea-process.so.26 libkea-1.9.5_2
+libkea-stats.so.18 libkea-1.9.5_2
+libkea-util-io.so.0 libkea-1.9.5_2
+libkea-util.so.32 libkea-1.9.5_2
 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 5da5b0a3c817..aab6022e4957 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.9.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
 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 botan botan-devel openssl-devel)
  $(vopt_if mysql libmariadbclient-devel)
  $(vopt_if pgsql postgresql-libs-devel)"
 depends="libkea>=0"

From 2e0f2df9fb28eda16c386216113d2564df880a9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 2746/3458] keepalived: rebuild against OpenSSL

---
 srcpkgs/keepalived/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e19..7fd6b2b118e0 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
 # Template file for 'keepalived'
 pkgname=keepalived
 version=2.1.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha1"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
 short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 600b64054a876c68b6c39407e99be3919f85fea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 2747/3458] kicad: rebuild against OpenSSL

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e748797542..d7cc9e2ba7a4 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
  $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
 depends="wxPython4"
 short_desc="Electronic schematic and PCB design software"

From 64b156abae5e58b87ecafc7d988ac85ae5fe0e99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 2748/3458] kodi-addon-inputstream-rtmp: rebuild against
 OpenSSL

---
 srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d689..bee02ae906ef 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
 short_desc="RTMP input stream add-on for Kodi"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 1a6896622bde4ae1aad1c32a2096feaba39880ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 2749/3458] kodi-addon-vfs-sftp: rebuild against OpenSSL

---
 srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c3508..5ba4d6a33c3c 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
 wrksrc="vfs.sftp-${version}-${_kodi_release}"
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
 short_desc="VFS SFTP addon for Kodi"
 maintainer="Foxlet <foxlet@furcode.co>"
 license="GPL-2.0-or-later"

From 072b06572912aae33f1ec813123fcce81ae06771 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 2750/3458] kodi-rpi: rebuild against OpenSSL

---
 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 d69ef928f5bd..0b50f0f9f04a 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=4
+revision=5
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-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
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
  fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
  enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
  librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel

From 5bfe0012ee13cc373c50bb11ce8188f1c7c23422 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 2751/3458] kodi: rebuild against OpenSSL

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa3325753..bff11d8ae5ad 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=18.9
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
  libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-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
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
  libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
  enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel

From 5d8329124f0f157aa8037980c14bf1f62bb4a585 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 2752/3458] kore: rebuild against OpenSSL

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d23943496392..6c6e2d1378c2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
 # Template file for 'kore'
 pkgname=kore
 version=4.1.0
-revision=1
+revision=2
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
 hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"

From da5c75a6b1bce1f84bc2e019f267ceecddd9ce3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 2753/3458] kristall: rebuild against OpenSSL

---
 srcpkgs/kristall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12cf..1455af6d35bf 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
 # Template file for 'kristall'
 pkgname=kristall
 version=0.3
-revision=1
+revision=2
 build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"

From 6beba819a991e4a3d9edc4cc9d390a7a1b4ff509 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 2754/3458] kvirc: rebuild against OpenSSL

---
 srcpkgs/kvirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327eadd..41255b18e928 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
 # Template file for 'kvirc'
 pkgname=kvirc
 version=5.0.0
-revision=6
+revision=7
 wrksrc="KVIrc-$version"
 build_style=cmake
 configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
 hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
 qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
 qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="Qt-based IRC client"

From 5634a7eb06b0d1c8ee387dbb4341e5dbbacc685e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 2755/3458] lastpass-cli: rebuild against OpenSSL

---
 srcpkgs/lastpass-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a2..505360bc0398 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'lastpass-cli'
 pkgname=lastpass-cli
 version=1.3.3
-revision=3
+revision=4
 build_style=cmake
 make_install_target="install install-doc"
 hostmakedepends="asciidoc pkg-config"

From c95b0713c4a929377bb0d45bc7d7e1479b54c3cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 2756/3458] ldapvi: rebuild against OpenSSL

---
 srcpkgs/ldapvi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726b..1dda3c2ae6e8 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
 # Template file for 'ldapvi'
 pkgname=ldapvi
 version=1.7
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--with-sha"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From e2a58836c6a52c6b6dec75816fdbc4fe3c07b0c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 2757/3458] ldns: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/ldns/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bbfd167735f3..3db164b23121 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2028,7 +2028,7 @@ libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
 libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
-libldns.so.3 libldns-1.7.1_1
+libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d2..6be7b24bfd1d 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
 # Template file for 'ldns'
 pkgname=ldns
 version=1.7.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
  --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
 	}
 }
 libldns-devel_package() {
-	depends="libldns>=${version}_${revision} libressl-devel"
+	depends="libldns>=${version}_${revision} openssl-devel"
 	short_desc="Modern DNS/DNSSEC library -- development files"
 	pkg_install() {
 		vmove usr/bin/ldns-config

From 59636f7b70f3c58e0b23b60e746e9516e405ade4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 2758/3458] lftp: rebuild against OpenSSL

---
 ...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
 srcpkgs/lftp/template                         |  4 +--
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch

diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a1..000000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
--- 
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25a..322d64ba114f 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
 # Template file for 'lftp'
 pkgname=lftp
 version=4.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-modules --disable-rpath --without-included-regex
  --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
  --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
  expat-devel libidn-devel gettext-devel"
 short_desc="Sophisticated FTP/HTTP client"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9bb565d01d7e38188e795b072cfd41aa9e6d1821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 2759/3458] libbsd: drop unused LibreSSL makedepends

---
 srcpkgs/libbsd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec380235..19098cb84aaf 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,6 @@ pkgname=libbsd
 version=0.10.0
 revision=1
 build_style=gnu-configure
-makedepends="libressl-devel"
 short_desc="Provides useful functions commonly found on BSD system"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"

From 9b294a5fd46b254e16242f2070c6a62294e2e622 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 2760/3458] libetpan: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libetpan/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3db164b23121..71b37b289198 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2167,7 +2167,7 @@ libutf8proc.so.2 libutf8proc-2.2.0_1
 libnsutils.so.0 libnsutils-0.0.1_1
 libtoxcore.so.2 toxcore-0.2.0_1
 libgom-1.0.so.0 gom-0.3.0_1
-libetpan.so.20 libetpan-1.7.2_1
+libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
 libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1
diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9b..fb6c96eb33f2 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
 # Template file for 'libetpan'
 pkgname=libetpan
 version=1.9.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
  --with-zlib --with-sasl"
 hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
  libsasl-devel libcurl-devel"
 short_desc="Mail Framework library for C language"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"

From 90eb441b595536e2c27cd76f1203daeb1304f4b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 2761/3458] libevhtp: rebuild against OpenSSL

---
 srcpkgs/libevhtp/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8f..098a6daa0507 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libevhtp'
 pkgname=libevhtp
 version=1.2.18
-revision=1
+revision=2
 build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
+depends="${makedepends}"
 short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"

From 29d1bd3de3ac7167e05b10c9fc8c76df38433fb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 2762/3458] libfetch: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfetch/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 71b37b289198..86a55dd11ee7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -775,7 +775,7 @@ libenca.so.0 libenca-1.13_1
 libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
-libfetch.so.2 libfetch-2.34_8
+libfetch.so.2 libfetch-2.34_23
 libneon.so.27 neon-0.29.5_1
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc51..49ae77a163d9 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
 # Template file for 'libfetch'
 pkgname=libfetch
 version=2.34
-revision=22
+revision=23
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="File Transfer Library for URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 862c76378b0599abe52d18b0b4f8c7b923c4d489 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 2763/3458] libfido2: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/libfido2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86a55dd11ee7..e043a8077635 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3831,7 +3831,7 @@ libmpirxx.so.8 mpir-3.0.0_1
 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
+libfido2.so.1 libfido2-1.6.0_2
 libjanet.so.1.15 janet-1.15.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa5..a329477e1190 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.6.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
 short_desc="Library for FIDO 2.0, including communication with a device over USB"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"

From e5aee224f099dd56dd416740060ecc0699c8f11d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 2764/3458] libgda: rebuild against OpenSSL

---
 common/shlibs           | 8 ++++----
 srcpkgs/libgda/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e043a8077635..606ad8af346b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1417,10 +1417,10 @@ libmbim-glib.so.4 libmbim-1.10.0_1
 libmm-glib.so.0 libmm-glib-1.0.0_1
 libgpm.so.2 libgpm-1.20.7_1
 libgdl-3.so.5 gdl-3.8.1_1
-libgda-5.0.so.4 libgda-5.1.2_1
-libgda-report-5.0.so.4 libgda-5.1.2_1
-libgda-ui-5.0.so.4 libgda-5.1.2_1
-libgda-xslt-5.0.so.4 libgda-5.1.2_1
+libgda-5.0.so.4 libgda-5.2.9_4
+libgda-report-5.0.so.4 libgda-5.2.9_4
+libgda-ui-5.0.so.4 libgda-5.2.9_4
+libgda-xslt-5.0.so.4 libgda-5.2.9_4
 libamtk-5.so.0 amtk-5.0.0_1
 libdevhelp-3.so.6 devhelp-libs-3.30.0_1
 libunistring.so.2 libunistring-0.9.4_1
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaac..d9a79ff60b20 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
  --enable-system-sqlite"
 hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
 makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
  libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
  json-glib-devel readline-devel libmariadbclient-devel"
 conf_files="/etc/libgda-5.0/config"

From 51b0086bd6b61fccb3addf5b0e26a081abe87ae9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 2765/3458] libgdal: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/libgdal/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 606ad8af346b..8f68c39cc6ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2451,7 +2451,7 @@ libu2f-host.so.0 libu2f-host-1.0.0_1
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.0_1
+libgdal.so.26 libgdal-3.0.4_9
 libosgViewer.so.131 osg-3.4.1_1
 libosgShadow.so.131 osg-3.4.1_1
 libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63e..f921ca3fffc6 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=8
+revision=9
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From c0f3fa5c8f02c8b90a54cf083aac72e5d8c731c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 2766/3458] libimobiledevice: rebuild against OpenSSL

---
 common/shlibs                     | 2 +-
 srcpkgs/libimobiledevice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f68c39cc6ba..2036e362f3e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2025,7 +2025,7 @@ libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
 libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
-libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
+libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_2
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b71..a8bb2d08e09a 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
  libusb-devel libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ed03271171dba4e27233d0a491ea40fb55504806 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 2767/3458] libircclient: rebuild against OpenSSL

---
 common/shlibs                 | 2 +-
 srcpkgs/libircclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2036e362f3e1..ff74038f60ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3612,7 +3612,7 @@ libgrpc_plugin_support.so.1 grpc-1.36.0_2
 libgrpc_unsecure.so.15 grpc-1.36.0_2
 libgrpcpp_channelz.so.1 grpc-1.36.0_2
 libupb.so.15 grpc-1.36.0_2
-libircclient.so.1 libircclient-1.10_1
+libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
 libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
 libnitrokey.so.3 libnitrokey-3.4.1_1
diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc1994..ae9adf37d686 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
 # Template file for 'libircclient'
 pkgname=libircclient
 version=1.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="IRC client library"
 maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
 license="LGPL-3.0-or-later"

From 579fa1e83b7b1fc4fd48a31faa3bd4f941472e05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 2768/3458] libknet1: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/libknet1/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ff74038f60ef..84b81ceca4a3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3645,11 +3645,11 @@ 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
-libknet.so.1 libknet1-1.11_1
+libknet.so.1 libknet1-1.11_4
 libdrumstick-file.so.1 drumstick-1.1.2_1
 libdrumstick-alsa.so.1 drumstick-1.1.2_1
 libdrumstick-rt.so.1 drumstick-1.1.2_1
-libnozzle.so.1 libnozzle1-1.11_2
+libnozzle.so.1 libnozzle1-1.11_4
 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
 libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd9..bdd6d2b14db1 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
 # only libraries and development files now, if interested in kronosnetd update!
 pkgname=libknet1
 version=1.11
-revision=3
+revision=4
 wrksrc=kronosnet-${version}
 build_style=gnu-configure
 configure_args="--disable-dependency-tracking --disable-libknet-sctp
  --disable-kronosnetd --disable-poc --disable-static"
 hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
 makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
 short_desc="Kronosnet core switching implementation (libraries)"
 maintainer="Jiří Bělka <jirib79@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-only"

From cb9effb359694b7a9307374f62eb64affd21bdf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 2769/3458] libmowgli: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libmowgli/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 84b81ceca4a3..2e754681125b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1132,7 +1132,7 @@ libpathplan.so.4 graphviz-libs-2.28.0_6
 liblab_gamut.so.1 graphviz-libs-2.40.1_1
 libflowcanvas.so.5 flowcanvas-0.7.1_1
 liblash.so.1 ladish-1_1
-libmowgli-2.so.0 libmowgli-2.0.0_1
+libmowgli-2.so.0 libmowgli-2.1.3_8
 libgts-0.7.so.5 gts-0.7.6_1
 libguess.so.1 libguess-1.1_1
 libaudcore.so.5 audacious-3.9_1
diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d453..cf17648a4b75 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
 # Template file for 'libmowgli'
 pkgname=libmowgli
 version=2.1.3
-revision=7
+revision=8
 wrksrc="${pkgname}-2-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Performance and usability-oriented extensions to C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 96c8e68b14ac637bc333a836d2db151e17a5a4ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 2770/3458] libostree: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/libostree/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2e754681125b..b10aac6cc053 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2947,7 +2947,7 @@ libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
-libostree-1.so.1 libostree-2017.3_1
+libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.4.1_2
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be5..918f1604061e 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
 # Template file for 'libostree'
 pkgname=libostree
 version=2020.8
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="

From 19b2542949284aff22353d126cfdc26549efda0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 2771/3458] librdkafka: rebuild against OpenSSL

---
 common/shlibs               | 4 ++--
 srcpkgs/librdkafka/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b10aac6cc053..4ae5aa051014 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3816,8 +3816,8 @@ libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.11 intel-gmmlib-19.4.1_1
 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
-librdkafka.so.1 librdkafka-1.3.0_1
-librdkafka++.so.1 librdkafka-1.3.0_1
+librdkafka.so.1 librdkafka-1.4.4_3
+librdkafka++.so.1 librdkafka-1.4.4_3
 libco.so.0 libco-20_1
 libraft.so.0 raft-0.9.16_1
 libmdnsd.so.1 libmdnsd-0.9_1
diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618b..4b6c741bf25d 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
 version=1.4.4
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
 short_desc="Apache Kafka C/C++ library"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"

From fed8a32784d52c0b97d38d1cd2a216d85747d79b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 2772/3458] libsignal-protocol-c: OpenSSL is only a
 checkdepends

---
 srcpkgs/libsignal-protocol-c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054e..20eb3cd373ca 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,8 +4,7 @@ version=2.3.3
 revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
-checkdepends="pkg-config check-devel"
+checkdepends="openssl-devel pkg-config check-devel"
 short_desc="Signal Protocol C Library"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"

From 606f00134de6840d5b21d8ca82da9e0df5223861 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 2773/3458] libssh: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/libssh/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4ae5aa051014..d07905e2a7f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1388,7 +1388,7 @@ libiodbcinst.so.2 libiodbc-3.52.8_1
 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
+libssh.so.4 libssh-0.9.5_2
 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
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a4..9b57379bfc88 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
 # Template file for 'libssh'
 pkgname=libssh
 version=0.9.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
 short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fecf7597225426705f19b62c8fc061b6e496fce6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 2774/3458] libstrophe: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libstrophe/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d07905e2a7f0..d51d97924146 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1818,7 +1818,7 @@ libfcgi.so.0 fcgi-2.4.0_2
 libdshconfig.so.1 libdshconfig-0.20.13_1
 libpar2.so.1 libpar2-0.4_1
 libsodium.so.23 libsodium-1.0.15_1
-libstrophe.so.0 libstrophe-0.8.6_1
+libstrophe.so.0 libstrophe-0.10.1_2
 libganv-1.so.1 ganv-1.4.2_1
 libblas.so.3 blas-3.5.0_1
 libcblas.so.3 cblas-3.6.0_1
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f475..5dad32e38267 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
 # Template file for 'libstrophe'
 pkgname=libstrophe
 version=0.10.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable cares) $(vopt_enable tls)"
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
 short_desc="Minimal XMPP library written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From def5506209806ca973f76f00497fcabe3d36246c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 2775/3458] libtd: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/libtd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d51d97924146..0b7c47a037ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3880,7 +3880,7 @@ libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
 libneatvnc.so.0 neatvnc-0.3.2_1
-libtdjson.so.1.7.0 libtd-1.7.0_1
+libtdjson.so.1.7.0 libtd-1.7.0_2
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c22..f719ab4d3f1e 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
 # Template file for 'libtd'
 pkgname=libtd
 version=1.7.0
-revision=1
+revision=2
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
 hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Cross-platform library for building Telegram clients"
 maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"

From 251399baad5b7bad3fe69193a4b8e4365a3cb2ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 2776/3458] libtorrent-rasterbar: rebuild against OpenSSL

---
 common/shlibs                         | 2 +-
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0b7c47a037ab..ffacdbb4efef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2032,7 +2032,7 @@ libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.2_1
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c1270..0588acd81bd8 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
 version=1.2.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
 hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
 }
 
 libtorrent-rasterbar-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		depends+=" libatomic-devel"
 	fi

From bc0b588c7e3bcb29c745ae6c15f7b692e40beb39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 2777/3458] libtorrent: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/libtorrent/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ffacdbb4efef..59e973853007 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -841,7 +841,7 @@ libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1
 libospgrove.so.0 openjade-1.3.2_1
 libostyle.so.0 openjade-1.3.2_1
-libtorrent.so.21 libtorrent-0.13.8_1
+libtorrent.so.21 libtorrent-0.13.8_4
 libgiblib.so.1 giblib-1.2.4_1
 libgc.so.1 gc-7.6.4_1
 libcord.so.1 gc-7.4_1
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c219..cadf0f5bb1dc 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
 # Template file for 'libtorrent'
 pkgname=libtorrent
 version=0.13.8
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-static --disable-debug --without-kqueue
  --enable-aligned --with-posix-fallocate"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-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++"

From 62d7d52339e37fe8ff28cf16f70a3fd0edfc0fb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 2778/3458] libu2f-host: rebuild against OpenSSL

---
 common/shlibs                | 2 +-
 srcpkgs/libu2f-host/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 59e973853007..05a5b07e6b20 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2447,7 +2447,7 @@ libboinc_graphics2.so.7 boinc-nox-7.16.16_2
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
-libu2f-host.so.0 libu2f-host-1.0.0_1
+libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d13..c2cd5b754dca 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
 # Template file for 'libu2f-host'
 pkgname=libu2f-host
 version=1.1.10
-revision=4
+revision=5
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl=yes"
 hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
 depends="libfido2"
 short_desc="C library and tool that implements the host-side of the U2F protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0c838a52f8f3c8662332f1a6201986febb8ace94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 2779/3458] libu2f-server: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libu2f-server/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 05a5b07e6b20..e262126fe2ce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2448,7 +2448,7 @@ libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
-libu2f-server.so.0 libu2f-server-1.0.1_2
+libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.4_9
diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee566331..661fc934531f 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
 # Template file for 'libu2f-server'
 pkgname=libu2f-server
 version=1.1.0
-revision=8
+revision=9
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
 short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD"

From 925ed2bc98880ff62aed13a88fb4feea313abec8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 2780/3458] libucl: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 ...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
 srcpkgs/libucl/template                       |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch

diff --git a/common/shlibs b/common/shlibs
index e262126fe2ce..65badf45d014 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1868,7 +1868,7 @@ libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1
 libjava.so openjdk10-bootstrap-10.0.2p13_1
 libjli.so openjdk10-bootstrap-10.0.2p13_1
 libjvm.so openjdk10-bootstrap-10.0.2p13_1
-libucl.so.5 libucl-0.8.1_1
+libucl.so.5 libucl-0.8.1_6
 libhandle.so.1 xfsprogs-3.2.1_1
 libnfnetlink.so.0 libnfnetlink-1.0.1_1
 libnetfilter_log.so.1 libnetfilter_log-1.0.1_1
diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 000000000000..e049a1b8b178
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+ 
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+-	AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++	AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ 		AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ 		LIBCRYPTO_LIB="-lcrypto"
+ 		LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+-		], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++		], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc00..04b2608684d2 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
 # Template file for 'libucl'
 pkgname=libucl
 version=0.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-urls --enable-signatures"
 hostmakedepends="automake libtool pkg-config"

From ee7576f493fd1d09fb0046e6ac5ea35e7c3936a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 2781/3458] libvncserver: rebuild against OpenSSL

---
 common/shlibs                 | 4 ++--
 srcpkgs/libvncserver/template | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 65badf45d014..cf70326143d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1403,8 +1403,8 @@ libqoauth.so.2 qoauth-qt5-2.0.0_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
 libKF5Torrent.so.6 libktorrent-2.1_1
-libvncserver.so.1 libvncserver-0.9.11_1
-libvncclient.so.1 libvncserver-0.9.11_1
+libvncserver.so.1 libvncserver-0.9.13_2
+libvncclient.so.1 libvncserver-0.9.13_2
 libotr.so.5 libotr-4.0.0_1
 liballeg.so.4.4 allegro4-4.4.2_1
 liballeggl.so.4.4 allegro4-4.4.2_1
diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d512..dd43945c15e7 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -1,11 +1,12 @@
 # Template file for 'libvncserver'
 pkgname=libvncserver
 version=0.9.13
-revision=1
+revision=2
 wrksrc="libvncserver-LibVNCServer-${version}"
 build_style=cmake
+confiugre_args="-DWITH_OPENSSL=ON -DWITH_GNUTLS=OF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel"
 short_desc="C libraries to easily implement VNC server or client functionality"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 12f08923820735629ff41f6fdd1b9ea366761f67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 2782/3458] libwebsockets: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/libwebsockets/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index cf70326143d0..cb114e274186 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2190,7 +2190,7 @@ libcvm-v2client.so.1 cvm-0.97_1
 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
+libwebsockets.so.15 libwebsockets-3.2.2_5
 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
diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f19463528..9311fe3afcd8 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
 # Template file for 'libwebsockets'
 pkgname=libwebsockets
 version=3.2.2
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
  -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
 short_desc="Lightweight client and server websocket library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
 CFLAGS="-Wno-error"
 
 libwebsockets-devel_package() {
-	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+	depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin

From bd5ae35062523299f13b57d9bdd8bd091e53149b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 2783/3458] lighttpd: rebuild against OpenSSL

---
 srcpkgs/lighttpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d38..7ae82aecfc33 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.59
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_brotli=false -Dwith_bzip=false
  -Dwith_fam=false -Dwith_gdbm=true

From 4209cd08dd45ae236522aa9263592854fb7ef4c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 2784/3458] links-x11: rebuild against OpenSSL

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f3215804..eb60b9fca0de 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
 # Template file for 'links-x11'
 pkgname=links-x11
 version=2.21
-revision=1
+revision=2
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics --enable-x"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
  libX11-devel libXt-devel"
 short_desc="Graphics and text mode web browser (with X11 graphics driver)"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From fce1d9bd43ebe27715530af0bf9adf5c1a80dfd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 2785/3458] links: rebuild against OpenSSL

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a133..06ca6e43960a 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
 # Template file for 'links'
 pkgname=links
 version=2.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
 short_desc="Graphics and text mode web browser, released under GPL"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"

From fc3f32e5c987ad9b052e41f9f068725d7a2e7cf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 2786/3458] linux-tools: rebuild against OpenSSL

---
 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 8c46de1e1ead..a3760e4965b9 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3
  python3-docutils xmlto"
 makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
  libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
  slang-devel"
 depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"

From c955ed326ca6b34c57cd374eceac2f3b0fcba4d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 2787/3458] litecoin: rebuild against OpenSSL

---
 srcpkgs/litecoin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c126..ad455be556d6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
 hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
  qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
 short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5f8bbbe06f41d13e6dc67e3d69c2efa143c600c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 2788/3458] live555: rebuild against OpenSSL

---
 common/shlibs            | 8 ++++----
 srcpkgs/live555/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index cb114e274186..4d23b20b8386 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2993,10 +2993,10 @@ libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
 libgcab-1.0.so.0 gcab-0.7_1
-libliveMedia.so.81 live555-2020.08.11_1
-libgroupsock.so.8 live555-2018.12.14_1
-libUsageEnvironment.so.3 live555-2018.12.14_1
-libBasicUsageEnvironment.so.1 live555-2018.12.14_1
+libliveMedia.so.81 live555-2020.08.11_2
+libgroupsock.so.8 live555-2020.08.11_2
+libUsageEnvironment.so.3 live555-2020.08.11_2
+libBasicUsageEnvironment.so.1 live555-2020.08.11_2
 libappstream.so.4 AppStream-0.12.2_1
 libappstream-glib.so.8 appstream-glib-0.6.13_1
 libappstream-builder.so.8 appstream-glib-0.6.13_1
diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda15..181675b6f3a3 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
 # Template file for 'live555'
 pkgname=live555
 version=2020.08.11
-revision=1
+revision=2
 wrksrc=live
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Set of C++ libraries for multimedia streaming"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="LGPL-3.0-or-later"

From 149ff5ca69b8a15c1dff97edf35c8be54bf7c4f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 2789/3458] loudmouth: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/loudmouth/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4d23b20b8386..d1256c0d0659 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2031,7 +2031,7 @@ libCDApplet.so cairo-dock-plugins-3.4.0_1
 libldns.so.3 libldns-1.7.1_4
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
-libloudmouth-1.so.0 loudmouth-1.4.3_1
+libloudmouth-1.so.0 loudmouth-1.5.3_12
 libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
 libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81f..4178683d5de9 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
 # Template file for 'loudmouth'
 pkgname=loudmouth
 version=1.5.3
-revision=11
+revision=12
 build_style=gnu-configure
 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"
+makedepends="libglib-devel libidn-devel openssl-devel"
 short_desc="Lightweight Jabber client library written in C/Glib"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d54a3558b33c11c5e56f6a4e9261d15d19e5e5ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 2790/3458] lxc: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/lxc/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d1256c0d0659..fe26f0094fb0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1561,7 +1561,7 @@ libxmlsec1.so.1 xmlsec1-1.2.19_1
 libxmlsec1-nss.so.1 xmlsec1-1.2.28_2
 libxmlsec1-openssl.so.1 xmlsec1-1.2.30_1
 libcheck.so.0 check-0.9.12_1
-liblxc.so.1 liblxc-1.0.0_1
+liblxc.so.1 liblxc-4.0.6_2
 libtcmalloc.so.4 gperftools-2.1_1
 libaio.so.1 libaio-0.3.109_1
 libofx.so.7 libofx-0.9.11_1
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d1..5a3458eb4eb5 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
 # Template file for 'lxc'
 pkgname=lxc
 version=4.0.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none

From cbfcd964c61c80f58f49cb0215999e54524a0281 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 2791/3458] lynx: rebuild against OpenSSL

---
 srcpkgs/lynx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224f..73d88a394982 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
 _distver=2.8.9
 _patchver=1
 version="${_distver}.${_patchver}"
-revision=4
+revision=5
 wrksrc="lynx${_distver}rel.${_patchver}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
 short_desc="A text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From f85d8251045ff1cfe1a4761bd1424e46f9db8822 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 2792/3458] mailx: rebuild against OpenSSL

---
 srcpkgs/mailx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea59..63ec23e72e07 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
 # Template file for 'mailx'
 pkgname=mailx
 version=12.5
-revision=24
+revision=25
 patch_args="-Np1"
 wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
 conf_files="/etc/mailx.rc"
 provides="mail-${version}_${revision}"
 short_desc="Feature-rich BSD mail(1)"

From 575b1a3f789e49a4d267a619d974fc10fa9a2299 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 2793/3458] mairix: rebuild against OpenSSL

---
 srcpkgs/mairix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da8..49f73671bcba 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
 # Template file for 'mairix'
 pkgname=mairix
 version=0.24
-revision=7
+revision=8
 build_style=configure
 configure_args="--prefix=/usr --mandir=/usr/share/man"
 hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 short_desc="A program for indexing and searching emails"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 717ec73d552744e08ebe50db5ce481779e751895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 2794/3458] maturin: switch to OpenSSL

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da5403..e97ae1cf099a 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,13 +1,13 @@
 # Template file for 'maturin'
 pkgname=maturin
 version=0.9.4
-revision=1
+revision=2
 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"
+makedepends="openssl-devel"
 depends="python3-toml"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From bb157388ea470918fdf0af87f10da7d07240afb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 2795/3458] mbox: rebuild against OpenSSL

---
 srcpkgs/mbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f16217888..efcc71eaaa61 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
 # Template file for 'mbox'
 pkgname=mbox
 version=0.0.0.140526
-revision=5
+revision=6
 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
 wrksrc="$pkgname-$_commit"
 build_wrksrc=src
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="A lightweight sandbox tool for non-root users"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 4bfc5c9241c0e58109bc7829ca801eaa76ef1d1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 2796/3458] mbuffer: rebuild against OpenSSL

---
 srcpkgs/mbuffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc39..a3a17c73a84c 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
 version=20200929
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"

From 75b117ea68d7073b8b1c6c199e70886e3d62102b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 2797/3458] mdbook-linkcheck: rebuild against OpenSSL

---
 srcpkgs/mdbook-linkcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index fa737c2324e3..3ec4add319f8 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
 # New versions need to be tested for compatibility with mdBook
 pkgname=mdbook-linkcheck
 version=0.7.4
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Backend for mdBook which will check links for you"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"

From 7477f094ac12bb0ccd338bcb99d95fb741723941 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 2798/3458] mdcat: rebuild against OpenSSL

---
 srcpkgs/mdcat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f8744..869aecd1b4bb 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
 pkgname=mdcat
 reverts="0.22.2_1"
 version=0.22.1
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Cat for markdown"
 maintainer="Wilson Birney <wpb@360scada.com>"
 license="MPL-2.0"

From d4627aa822030707daa0aae30716791916c3ff50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 2799/3458] *-luasec: update to 1.0

unify into a single template and add lua54 support
---
 srcpkgs/lua51-luasec                        |  1 +
 srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
 srcpkgs/lua51-luasec/template               | 29 -------
 srcpkgs/lua52-luasec                        |  1 +
 srcpkgs/lua52-luasec/template               | 28 -------
 srcpkgs/lua53-luasec                        |  1 +
 srcpkgs/lua53-luasec/template               | 34 --------
 srcpkgs/lua54-luasec/template               | 87 +++++++++++++++++++++
 8 files changed, 90 insertions(+), 127 deletions(-)
 create mode 120000 srcpkgs/lua51-luasec
 delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
 delete mode 100644 srcpkgs/lua51-luasec/template
 create mode 120000 srcpkgs/lua52-luasec
 delete mode 100644 srcpkgs/lua52-luasec/template
 create mode 120000 srcpkgs/lua53-luasec
 delete mode 100644 srcpkgs/lua53-luasec/template
 create mode 100644 srcpkgs/lua54-luasec/template

diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 000000000000..2326404994aa
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa1481..000000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
-   }
-   return 1;
- }
--  
-+
- /**
-  * Return the compression method used.
-  */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
-   const COMP_METHOD *comp;
-+#endif
-   p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
-   if (ssl->state != LSEC_STATE_CONNECTED) {
-     lua_pushnil(L);
-     lua_pushstring(L, "closed");
-     return 2;
-   }
-+#if !defined(OPENSSL_NO_COMP)
-   comp = SSL_get_current_compression(ssl->ssl);
-   if (comp)
-     lua_pushstring(L, SSL_COMP_get_name(comp));
-   else
-     lua_pushnil(L);
-+#else
-+  lua_pushnil(L);
-+#endif
-   return 1;
- }
- 
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d3..000000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 000000000000..2326404994aa
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997aa..000000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	export LUAPATH=${DESTDIR}/usr/share/lua/5.2
-	export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
-	vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 000000000000..2326404994aa
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a6..000000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
-	lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
-	make linux CC=$CC LD=$CC \
-		INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
-		LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
-	vlicense LICENSE
-}
-
-luasec_package() {
-	depends="lua53-luasec>=${version}_${revision}"
-	short_desc+=" (transitional dummy package)"
-	build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 000000000000..b6740ad44e1e
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+	mkdir -p lua5.1
+	mv * lua5.1 || true
+	cp -a lua5.1 lua5.2
+	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+		popd
+	done
+}
+
+do_build() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make linux CC=$CC LD=$CC \
+			INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+			LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+		popd
+	done
+}
+
+do_install() {
+	for luaver in 5.1 5.2 5.3 5.4; do
+		pushd lua${luaver}
+		make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+		popd
+	done
+	vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+	depends="lua51"
+	short_desc="${_desc} (5.1.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.1/LICENSE"
+		vmove usr/lib/lua/5.1
+		vmove usr/share/lua/5.1
+	}
+}
+
+lua52-luasec_package() {
+	depends="lua52"
+	short_desc="${_desc} (5.2.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.2/LICENSE"
+		vmove usr/lib/lua/5.2
+		vmove usr/share/lua/5.2
+	}
+}
+
+lua53-luasec_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+	}
+}
+
+luasec_package() {
+	depends="lua53-luasec>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}

From 40606b38dba7612cc4b238a2c34e4de4e10fac28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 2800/3458] megatools: rebuild against OpenSSL

---
 srcpkgs/megatools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb9..bb7e53221866 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
 # Template file for 'megatools'
 pkgname=megatools
 version=1.10.3
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
 short_desc="Command line client for Mega.nz file sharing service"
 maintainer="RunningDroid <runningdroid@zoho.com>"
 license="GPL-2.0-or-later"

From 184703bf33851f5e8382670d29afe7ed6d77cc02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 2801/3458] miniupnpd: rebuild against OpenSSL

---
 srcpkgs/miniupnpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ece..430fb02e6cf0 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
  /etc/miniupnpd/*.conf
  /etc/miniupnpd/*.sh"
 hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
 short_desc="Lightweight UPnP IGD daemon"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"

From 0d88fe7a14011fef233e4c6f3f85c9e9c97f5622 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 2802/3458] mixxx: rebuild against OpenSSL

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5d..4de620fd6038 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=7
+revision=8
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From 842007b519d39f5e0410997641f5c436887ad550 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 2803/3458] mktorrent: rebuild against OpenSSL

---
 srcpkgs/mktorrent/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb60..d0707326324d 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -1,10 +1,11 @@
 # Template file for 'mktorrent'
 pkgname=mktorrent
 version=1.1
-revision=2
+revision=3
 build_style=gnu-makefile
 make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+make_install_args="USE_OPENSSL=1"
+makedepends="openssl-devel"
 short_desc="Simple command line utility to create BitTorrent metainfo files"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="GPL-2.0-or-later"

From 8ae22af1a6bfd59d1db94cb90e06db8c999a37f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 2804/3458] monero-gui: rebuild against OpenSSL

---
 srcpkgs/monero-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3be..40ee7f6bce1c 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
 version=0.17.1.9
-revision=1
+revision=2
 _monero_version=0.17.1.9
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version

From f0dd70b52485cb1a6a68d4c49e43ddfbfa0c8ee9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 2805/3458] monero: rebuild against OpenSSL

---
 srcpkgs/monero/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d941..45072e81b820 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.1.9
-revision=1
+revision=2
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
  /var/lib/monero 0750 monero monero
  /var/log/monero 0755 monero monero"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
  readline-devel unbound-devel miniupnpc-devel expat-devel
  cppzmq czmq-devel libsodium-devel"
 short_desc="Private, secure, untraceable, decentralised digital currency"

From b80acf125f37baab61f5406d41765f432551352d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 2806/3458] mongo-c-driver: rebuild against OpenSSL

---
 common/shlibs                   | 2 +-
 srcpkgs/mongo-c-driver/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fe26f0094fb0..d4a80509fcbc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3886,7 +3886,7 @@ libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 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
+libbson-1.0.so.0 libbson-1.17.4_2
 libsonic.so.0 libsonic-0.2.0_1
 libtickit.so.3 libtickit-0.4.1_1
 libnotcurses.so.2 notcurses-2.0.4_1
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1a..3557648f8164 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
 version=1.17.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="High-performance MongoDB driver for C"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 24245f9da281d635d3aa8c2809b506d2a52fa093 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 2807/3458] mongoose: rebuild against OpenSSL

---
 srcpkgs/mongoose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a5..eddadc647333 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
 # Template file for 'mongoose'
 pkgname=mongoose
 version=6.18
-revision=3
+revision=4
 build_style=gnu-makefile
 make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Easy to use Web server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From 0c03bdd6d964f80980ef164a3015ce563376ad6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 2808/3458] monit: rebuild against OpenSSL

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82dd..1b0766e194ab 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.27.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
  libmonit_cv_vsnprintf_c99_conformant=yes"
 conf_files="/etc/monitrc"
 hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="AGPL-3.0-only"

From 6e6e45a7d601a2df0664ef3e4c40de5326b951b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 2809/3458] monitoring-plugins: rebuild against OpenSSL

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda1..48fbd4045ea4 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 2abadc347e920907d59cf26ab42c66deda5026c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 2810/3458] monolith: rebuild against OpenSSL

---
 srcpkgs/monolith/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d912..b83fc229ffaf 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
 # Template file for 'monolith'
 pkgname=monolith
 version=2.4.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Save HTML pages with ease "
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 81397b6cf09352fa899270fef406b854cc6ab481 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 2811/3458] mosh: rebuild against OpenSSL

---
 srcpkgs/mosh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b7..7f0231c305d4 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=20
+revision=21
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
 depends="perl-IO-Tty"
 short_desc="Mobile shell, remote terminal application that allows roaming"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From 082c68743a7c7393df2e73b5dd8e2acece1bb9e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 2812/3458] mosquitto: rebuild against OpenSSL

---
 common/shlibs              | 4 ++--
 srcpkgs/mosquitto/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d4a80509fcbc..ab3dd604a4a4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2144,8 +2144,8 @@ liblxqt-globalkeys-ui.so.0 lxqt-globalkeys-0.9.0_1
 libenet.so.7 libenet-1.3.12_1
 librrd.so.8 rrdtool-1.6.0_1
 librrd_th.so.4 rrdtool-1.4.9_1
-libmosquitto.so.1 libmosquitto-1.4_1
-libmosquittopp.so.1 libmosquittopp-1.4_1
+libmosquitto.so.1 libmosquitto-1.6.3_5
+libmosquittopp.so.1 libmosquittopp-1.6.3_5
 libmpv.so.1 mpv-0.8.0_2
 libmbedtls.so.12 mbedtls-2.13.1_1
 libmbedcrypto.so.3 mbedtls-2.9.0_1
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2c..78d19cba196e 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
 # Template file for 'mosquitto'
 pkgname=mosquitto
 version=1.6.3
-revision=4
+revision=5
 build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
 make_install_args="prefix=/usr"
 make_check_target=test
 conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
 checkdepends="python bcunit-devel"
 short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
 maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"

From c353e63b304b974520f43654704e256987bcc7f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 2813/3458] mtd-utils: rebuild against OpenSSL

---
 srcpkgs/mtd-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c74..0cbb7f1e70f1 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
 # Template file for 'mtd-utils'
 pkgname=mtd-utils
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
 short_desc="Memory Technology Device Utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 131eed28b1de07cb4e34d911f240eb18e52dd0ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 2814/3458] mtree: rebuild against OpenSSL

---
 srcpkgs/mtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af8..4eba212dbbbc 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
 # Template file for 'mtree'
 pkgname=mtree
 version=1.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-port-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Utility for creating and verifying file hierarchies"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From 3d87844c916d8d8e4b5ffd75809a633c4bea1f86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 2815/3458] mtxclient: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/mtxclient/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ab3dd604a4a4..61e1dc808e40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libFLAC++.so.6 libflac-1.2.1_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_1
+libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c901..5c5806d3cf7d 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.3.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"

From c6be5423131b65a701df3500f86cbe7c658a77cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 2816/3458] muchsync: rebuild against OpenSSL

---
 srcpkgs/muchsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450b..e1703b4bf9c0 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
 # Template file for 'muchsync'
 pkgname=muchsync
 version=6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
 depends="openssh notmuch"
 short_desc="Synchronize notmuch mail across machines"
 maintainer="Anjandev Momi <anjan@momi.ca>"

From ee13df3313a73343fea3fcc6fad8b67165a8fc62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 2817/3458] mumble: rebuild against OpenSSL

---
 srcpkgs/mumble/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecfb..5493688b12eb 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=3
+revision=4
 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
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
  CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
  speech-dispatcher-devel speex-devel portaudio-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"

From 428df29295bcbe8d94c833b67a4d2fe5d69d0baf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 2818/3458] munge: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/munge/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61e1dc808e40..a3791ef8faf1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2524,7 +2524,7 @@ libshout.so.3 libshout-2.4.1_1
 libfirm.so.1.22 libfirm-1.22.0_1
 libaudiofile.so.1 audiofile-0.3.6_1
 libbs2b.so.0 libbs2b-3.1.0_1
-libmunge.so.2 munge-libs-0.5.11_1
+libmunge.so.2 munge-libs-0.5.14_3
 libmgba.so.0.8 libmgba-0.8.1_1
 libglabels-3.0.so.8 libglabels30-3.2.1_1
 libglbarcode-3.0.so.0 libglabels30-3.2.1_1
diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b3..9d8e339b979b 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
 # Template file for 'munge'
 pkgname=munge
 version=0.5.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto-lib=openssl
  --with-openssl-prefix=${XBPS_CROSS_BASE}/usr
  x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
 depends="shadow"
 short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
 maintainer="pulux <pulux@pf4sh.de>"

From 99fb51936e0f4dc7a2bfa588f80029242a02c4b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 2819/3458] mupdf: rebuild against OpenSSL

---
 srcpkgs/mupdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d8..c8f05d1d3459 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'mupdf'
 pkgname=mupdf
 version=1.18.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
  libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel

From 26b1aac292b6f69f18e8c4d98be1241438e46aad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 2820/3458] musikcube: rebuild against OpenSSL

---
 common/shlibs                              |  2 +-
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/common/shlibs b/common/shlibs
index a3791ef8faf1..c6e8b2c32fa0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -593,7 +593,7 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
 libgtop-2.0.so.11 libgtop-2.38.0_1
 librarian.so.0 rarian-0.8.1_1
-libmusikcore.so musikcube-0.60.1_1
+libmusikcore.so musikcube-0.93.1_3
 libgnome-menu-3.so.0 gnome-menus-2.91.6_1
 libart_lgpl_2.so.2 libart-2.3.20_1
 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1
diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 000000000000..dc807dbf6bf4
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40ca..bf42f9e53c25 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 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
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"

From 6a4c1202e40e643c2ac7ccd89cd3653c361bec2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 2821/3458] mutt: rebuild against OpenSSL

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2e..7bede2a16e9a 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=2.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"

From 09e4eeab03b415f9ccbdac1deb927c3737b31c63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 2822/3458] namecoin: rebuild against OpenSSL

---
 srcpkgs/namecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a4..e4cfb3777b71 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'namecoin'
 pkgname=namecoin
 version=0.18.1
-revision=4
+revision=5
 wrksrc="${pkgname}-core-nc${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-static

From b20adf5158e22cf2a3409130c4ca34b2149cd00a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 2823/3458] nasa-wallpaper: rebuild against OpenSSL

---
 srcpkgs/nasa-wallpaper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e87..c53d0c1b4b1d 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
 # Template file for 'nasa-wallpaper'
 pkgname=nasa-wallpaper
 version=2.0
-revision=2
+revision=3
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Change your desktop background with a NASA image"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="Apache-2.0"

From aadf44b693ef23a180712a46dcc010fe7b462e84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 2824/3458] neomutt: rebuild against OpenSSL

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index eda14c53ef3e..77f9065023c4 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
 version=20210205
-revision=1
+revision=2
 wrksrc="neomutt-${version}"
 create_wrksrc=true
 build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
 hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
 makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
  rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 1e72cdb9167f49cdb82e248782c0900e270ddb1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 2825/3458] neon: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/neon/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c6e8b2c32fa0..9d50a1e0adfe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -776,7 +776,7 @@ libwavpack.so.1 libwavpack-4.60.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
 libfetch.so.2 libfetch-2.34_23
-libneon.so.27 neon-0.29.5_1
+libneon.so.27 neon-0.31.2_2
 libsvn_subr-1.so.0 libsvn-1.7.5_1
 libsvn_diff-1.so.0 libsvn-1.7.5_1
 libsvn_client-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 125a1e158b9b..9ace92c0fdd9 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,7 +1,7 @@
 # Template file for 'neon'
 pkgname=neon
 version=0.31.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-expat --with-ssl=openssl --enable-shared
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static
@@ -9,7 +9,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared
 make_build_args="all docs"
 make_install_args="install"
 hostmakedepends="automake libtool pkg-config xmlto"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
 depends="ca-certificates"
 short_desc="HTTP and WebDAV client library, with a C interface"
 maintainer="Orphaned <orphan@voidlinux.org>"

From be17f7ed61c15ec87f43f4c9510bda5cd3d251db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 2826/3458] netdata: rebuild against OpenSSL

---
 srcpkgs/netdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e89..69bb2a788e91 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.28.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
 hostmakedepends="pkg-config autoconf automake"
 makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
 depends="libcap-progs"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 17f5e8a8809bf6ed5a1ce962598a640f31240917 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 2827/3458] netpgp: rebuild against OpenSSL

---
 common/shlibs                                 |   4 +-
 .../patches/lib_openssl__crypto.c.patch       | 417 ++++++++++++++++++
 srcpkgs/netpgp/patches/lib_signature_c.patch  |  31 +-
 srcpkgs/netpgp/template                       |   6 +-
 4 files changed, 451 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch

diff --git a/common/shlibs b/common/shlibs
index 9d50a1e0adfe..2f864128b50e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -710,8 +710,8 @@ libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
-libnetpgp.so.0 libnetpgp-20100313_1
-libmj.so.0 libmj-20140211_1
+libnetpgp.so.0 libnetpgp-20140220_19
+libmj.so.0 libmj-20140220_19
 libmca_common_sm.so.40 libopenmpi-3.0.1_1
 libmca_common_dstore.so.1 libopenmpi-4.0.1_1
 libmca_common_ompio.so.41 libopenmpi-3.0.1_1
diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 000000000000..afa077902d9a
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig	2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+ 
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++	const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_get0_key(orsa, &n, &e, &d);
++	RSA_get0_factors(orsa, &q, &p);
++#else
++	n = orsa->n;
++	e = orsa->e;
++	d = orsa->d;
++	p = orsa->p;
++	q = orsa->q;
++#endif
++	if (sk) {
++		sk->d = BN_dup(d);
++		sk->p = BN_dup(p);
++		sk->q = BN_dup(q);
++	}
++	if (pk) {
++		pk->n = BN_dup(n);
++		pk->e = BN_dup(e);
++	}
++}
+ 
+-static void 
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++	BIGNUM	*n, *e, *d, *p, *q;
++	RSA *orsa;
++
++	orsa = RSA_new();
++	n = BN_dup(pubkey->n);
++	e = BN_dup(pubkey->e);
++
++	if (seckey) {
++		d = BN_dup(seckey->d);
++		p = BN_dup(seckey->p);
++		q = BN_dup(seckey->q);
++	} else {
++		d = p = q = NULL;
++	}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	RSA_set0_key(orsa, n, e, d);
++	RSA_set0_factors(orsa, p, q);
++#else
++	BN_free(orsa->n);
++	BN_free(orsa->e);
++	orsa->n = n;
++	orsa->e = e;
++	if (d) {
++		BN_free(orsa->d);
++		orsa->d = d;
++	}
++	if (p) {
++		BN_free(orsa->p);
++		orsa->p = p;
++	}
++	if (q) {
++		BN_free(orsa->q);
++		orsa->q = q;
++	}
++#endif
++	return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++	DSA_SIG        *osig;
++	BIGNUM	       *r, *s;
++
++	osig = DSA_SIG_new();
++	r = BN_dup(sig->r);
++	s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_SIG_set0(osig, r, s);
++#else
++	BN_free(osig->r);
++	BN_free(osig->s);
++	osig->r = r;
++	osig->s = s;
++#endif
++
++	return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+-	RSA            *test = RSA_new();
++	DSA            *odsa;
++	BIGNUM	       *p, *q, *g, *y, *x;
+ 
+-	test->n = BN_dup(seckey->pubkey.key.rsa.n);
+-	test->e = BN_dup(seckey->pubkey.key.rsa.e);
++	odsa = DSA_new();
+ 
+-	test->d = BN_dup(seckey->key.rsa.d);
+-	test->p = BN_dup(seckey->key.rsa.p);
+-	test->q = BN_dup(seckey->key.rsa.q);
++	p = BN_dup(dsa->p);
++	q = BN_dup(dsa->q);
++	g = BN_dup(dsa->g);
++	y = BN_dup(dsa->y);
++	x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_set0_key(odsa, y, x);
++#else
++	BN_free(odsa->p);
++	BN_free(odsa->q);
++	BN_free(odsa->g);
++	BN_free(odsa->pub_key);
++	odsa->p = p;
++	odsa->q = q;
++	odsa->g = g;
++	odsa->pub_key = y;
++	if (x) {
++		BN_free(odsa->priv_key);
++		odsa->priv_key = x;
++	}
++#endif
++	return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++	const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	DSA_get0_key(odsa, NULL, &x);
++#else
++	x = odsa->priv_key;
++#endif
++	sk->x = BN_dup(x);
++}
++
++static void 
++test_seckey(const pgp_seckey_t *seckey)
++{
++	RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+ 
+ 	if (RSA_check_key(test) != 1) {
+ 		(void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 	       const pgp_dsa_pubkey_t *dsa)
+ {
+ 	unsigned	qlen;
+-	DSA_SIG        *osig;
+-	DSA            *odsa;
++	DSA_SIG        *osig = makeDSA_SIG(sig);
++	DSA	       *odsa = makeDSA(dsa, NULL);
+ 	int             ret;
+ 
+-	osig = DSA_SIG_new();
+-	osig->r = sig->r;
+-	osig->s = sig->s;
+-
+-	odsa = DSA_new();
+-	odsa->p = dsa->p;
+-	odsa->q = dsa->q;
+-	odsa->g = dsa->g;
+-	odsa->pub_key = dsa->y;
+-
+ 	if (pgp_get_debug_level(__FILE__)) {
+ 		hexdump(stderr, "input hash", hash, hash_length);
+-		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++		(void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ 	}
+-	if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++	if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ 		hash_length = qlen;
+ 	}
+ 	ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ 		return 0;
+ 	}
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ 	DSA_free(odsa);
+-
+-	osig->r = osig->s = NULL;
+ 	DSA_SIG_free(osig);
+ 
+ 	return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
+-
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
++	RSA            *orsa = makeRSA(pubkey, NULL);
++	int             ret;
+ 
+-	n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
+-	int             n;
++	RSA            *orsa = makeRSA(pubkey, seckey);
++	int             ret;
+ 
+-	orsa = RSA_new();
+-	orsa->n = BN_dup(pubkey->n);
+-	orsa->d = seckey->d;
+-	orsa->p = seckey->q;	/* p and q are round the other way in openssl */
+-	orsa->q = seckey->p;
+-
+-	/* debug */
+-	orsa->e = BN_dup(pubkey->e);
+-	/* If this isn't set, it's very likely that the programmer hasn't */
+-	/* decrypted the secret key. RSA_check_key segfaults in that case. */
+-	/* Use pgp_decrypt_seckey() to do that. */
+-	if (orsa->d == NULL) {
++	if (seckey->d == NULL) {
+ 		(void) fprintf(stderr, "orsa is not set\n");
+ 		return 0;
+ 	}
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ 	}
+ 	/* end debug */
+ 
+-	n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++	ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+ 
+-	orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ 	RSA_free(orsa);
+ 
+-	return n;
++	return ret;
+ }
+ 
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 			const pgp_rsa_seckey_t *seckey,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *keypair;
++	RSA            *keypair = makeRSA(pubkey, seckey);
+ 	int             n;
+ 	char            errbuf[1024];
+ 
+-	keypair = RSA_new();
+-	keypair->n = pubkey->n;	/* XXX: do we need n? */
+-	keypair->d = seckey->d;
+-	keypair->p = seckey->q;
+-	keypair->q = seckey->p;
+-
+-	/* debug */
+-	keypair->e = pubkey->e;
+ 	if (RSA_check_key(keypair) != 1) {
+ 		(void) fprintf(stderr, "RSA_check_key is not set\n");
+ 		return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ 		ERR_error_string(err, &errbuf[0]);
+ 		(void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ 	}
+-	keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ 	RSA_free(keypair);
+ 
+ 	return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 			size_t length,
+ 			const pgp_rsa_pubkey_t *pubkey)
+ {
+-	RSA            *orsa;
++	RSA            *orsa = makeRSA(pubkey, NULL);
+ 	int             n;
+ 
+ 	/* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+ 
+-	orsa = RSA_new();
+-	orsa->n = pubkey->n;
+-	orsa->e = pubkey->e;
+-
+ 	/* printf("len: %ld\n", length); */
+ 	/* pgp_print_bn("n: ", orsa->n); */
+ 	/* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ 		fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ 		ERR_print_errors(fd_out);
+ 	}
+-	orsa->n = orsa->e = NULL;
+ 	RSA_free(orsa);
+ 
+ 	return n;
+@@ -656,7 +738,9 @@ void 
+ pgp_crypto_finish(void)
+ {
+ 	CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_remove_state((unsigned long)0);
++#endif
+ }
+ 
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	BN_CTX         *ctx;
+ 	pgp_output_t *output;
+ 	pgp_memory_t   *mem;
++	BIGNUM *bne;
++	pgp_rsa_pubkey_t *pk;
++	pgp_rsa_seckey_t *sk;
+ 
+ 	ctx = BN_CTX_new();
+ 	pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ 	seckey = pgp_get_writable_seckey(keydata);
++	pk = &seckey->pubkey.key.rsa;
++	sk = &seckey->key.rsa;
+ 
+ 	/* generate the key pair */
+ 
+-	rsa = RSA_generate_key(numbits, e, NULL, NULL);
++	bne = BN_new();
++	BN_set_word(bne, e);
++
++	rsa = RSA_new();
++	RSA_generate_key_ex(rsa, numbits, bne, NULL);
++	BN_free(bne);
+ 
+ 	/* populate pgp key from ssl key */
++	takeRSA(rsa, pk, sk);
+ 
+ 	seckey->pubkey.version = PGP_V4;
+ 	seckey->pubkey.birthtime = time(NULL);
+ 	seckey->pubkey.days_valid = 0;
+ 	seckey->pubkey.alg = PGP_PKA_RSA;
+ 
+-	seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+-	seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ 	seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ 	seckey->s2k_specifier = PGP_S2KS_SALTED;
+ 	/* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ 	seckey->octetc = 0;
+ 	seckey->checksum = 0;
+ 
+-	seckey->key.rsa.d = BN_dup(rsa->d);
+-	seckey->key.rsa.p = BN_dup(rsa->p);
+-	seckey->key.rsa.q = BN_dup(rsa->q);
+-	seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+-	if (seckey->key.rsa.u == NULL) {
++	sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++	if (sk->u == NULL) {
+ 		(void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ 		return 0;
+ 	}
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ 		const pgp_dsa_pubkey_t *pubdsa)
+ {
+ 	DSA_SIG        *dsasig;
+-	DSA            *odsa;
+-
+-	odsa = DSA_new();
+-	odsa->p = pubdsa->p;
+-	odsa->q = pubdsa->q;
+-	odsa->g = pubdsa->g;
+-	odsa->pub_key = pubdsa->y;
+-	odsa->priv_key = secdsa->x;
++	DSA            *odsa = makeDSA(pubdsa, secdsa);
+ 
+ 	dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+ 
+-	odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ 	DSA_free(odsa);
+ 
+ 	return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ 				rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ 			} while (rsa == NULL);
+ 		}
+-		key->key.seckey.key.rsa.d = rsa->d;
+-		key->key.seckey.key.rsa.p = rsa->p;
+-		key->key.seckey.key.rsa.q = rsa->q;
+-		key->key.seckey.key.rsa.d = rsa->d;
++		takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ 	} else if (strcmp(type, "ssh-dss") == 0) {
+ 		if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ 			ok = 0;
+ 		} else {
+-			key->key.seckey.key.dsa.x = dsa->priv_key;
++			takeDSA(dsa, &key->key.seckey.key.dsa);
+ 		}
+ 	} else {
+ 		ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f8..3438dcdaf0ff 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
 
 Output signatures to the standard output for "-".
 
 --- src/lib/signature.c.orig	2012-03-05 02:20:18.000000000 +0000
 +++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ 	unsigned        t;
+ 	uint8_t		hashbuf[NETPGP_BUFSIZ];
+ 	DSA_SIG        *dsasig;
++	const BIGNUM	*r, *s;
+ 
+ 	/* hashsize must be "equal in size to the number of bits of q,  */
+ 	/* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ 	dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+ 
+ 	/* convert and write the sig out to memory */
+-	pgp_write_mpi(output, dsasig->r);
+-	pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	DSA_SIG_get0(dsasig, &r, &s);
++#else
++	r = dsasig->r;
++	s = dsasig->s;
++#endif
++	pgp_write_mpi(output, r);
++	pgp_write_mpi(output, s);
+ 	DSA_SIG_free(dsasig);
+ 	return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
  
  	/* setup output file */
  	if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac73..2bc40e253d09 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
 # Template file for 'netpgp'
 pkgname=netpgp
 version=20140220
-revision=18
+revision=19
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
 distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
 checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
 
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
 
 pre_configure() {
 	autoreconf -fi

From 64ba05bd5e9b524a1ca764d8fe932822352acbe6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 2828/3458] netsurf: rebuild against OpenSSL

---
 srcpkgs/netsurf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df0..a91ff22b098a 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
 # Template file for 'netsurf'
 pkgname=netsurf
 version=3.10
-revision=2
+revision=3
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="

From 67d9a39fbbd42405658f8c6c32efc17e23172a87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 2829/3458] network-ups-tools: rebuild against OpenSSL

---
 common/shlibs                                 |   6 +-
 .../patches/openssl-1.1.patch                 | 181 ++++++++++++++++++
 srcpkgs/network-ups-tools/template            |   4 +-
 3 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch

diff --git a/common/shlibs b/common/shlibs
index 2f864128b50e..0bdb90c5cfcc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1685,9 +1685,9 @@ 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
 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
-libnutscan.so.1 libnetwork-ups-tools-2.7.3_3
+libupsclient.so.4 libnetwork-ups-tools-2.7.4_12
+libnutclient.so.0 libnetwork-ups-tools-2.7.4_12
+libnutscan.so.1 libnetwork-ups-tools-2.7.4_12
 libsphinxad.so.0 sphinxbase-0.8_1
 libsphinxbase.so.1 sphinxbase-0.8_1
 libpocketsphinx.so.1 libpocketsphinx-0.8_3
diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 000000000000..a83f1ca7b38d
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ 	int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ 	SECStatus	status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ 	}
+ 	
+ #ifdef WITH_OPENSSL
+-	
+-	SSL_library_init();
+-	SSL_load_error_strings();
+ 
+-	ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	SSL_load_error_strings();
++	SSL_library_init();
+ 
+-	if (!ssl_method) {
+-		return 0;
+-	}
++	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+ 
+-	ssl_ctx = SSL_CTX_new(ssl_method);
+ 	if (!ssl_ctx) {
+ 		upslogx(LOG_ERR, "Can not initialize SSL context");
+ 		return -1;
+ 	}
+ 	
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++	if (ret != 1) {
++		upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++		return -1;
++	}
++#endif
++
+ 	if (!certpath) {
+ 		if (certverify == 1) {
+ 			upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ 	switch(res)
+ 	{
+ 	case 1:
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ 		break;
+ 	case 0:
+ 		upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ 	}
+ 
+ 	if (!strcmp(cmd, "EXECUTE")) {
+-		if (ca1 == '\0') {
++		if (ca1[0] == '\0') {
+ 			upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ 			return;
+ 		}
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+ 
+ 	dnl check if openssl is usable
+ 	AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+-	AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++	AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+ 
+ 	if test "${nut_have_openssl}" = "yes"; then
+ 		nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ 	{
+ 	case 1:
+ 		client->ssl_connected = 1;
+-		upsdebugx(3, "SSL connected");
++		upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ 		break;
+ 		
+ 	case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ 	SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+-	const SSL_METHOD	*ssl_method;
+-#else
+-	SSL_METHOD	*ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+ 
+ 	if (!certfile) {
+ 		return;
+@@ -386,18 +380,29 @@
+ 
+ #ifdef WITH_OPENSSL
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 
+-	if ((ssl_method = TLSv1_server_method()) == NULL) {
++	ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++	ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++	if (!ssl_ctx) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ 	}
+ 
+-	if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	/* set minimum protocol TLSv1 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++	if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ 		ssl_debug();
+-		fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++		fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ 	}
++#endif
+ 
+ 	if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ 		ssl_debug();
+--- configure	2021-02-13 22:54:47.106372805 +0100
++++ -	2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+ 
+ done
+ 
+-	for ac_func in SSL_library_init
++	for ac_func in SSL_CTX_new
+ do :
+-  ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++  ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e3..0f4f1ce5a3b4 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'network-ups-tools'
 pkgname=network-ups-tools
 version=2.7.4
-revision=11
+revision=12
 wrksrc="nut-${version}"
 build_style=gnu-configure
 configure_args="
@@ -11,7 +11,7 @@ configure_args="
  --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
  --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
 hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
  net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
 conf_files="
 	/etc/ups/ups.conf

From a065d403c85c06c60f25d8ece6181474eb303fe5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 2830/3458] next: rebuild against OpenSSL

---
 srcpkgs/next/patches/sbcl-2.1.0.patch | 31 +++++++++++++++++++++++++++
 srcpkgs/next/template                 |  6 +++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch

diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
new file mode 100644
index 000000000000..44c2059d21de
--- /dev/null
+++ b/srcpkgs/next/patches/sbcl-2.1.0.patch
@@ -0,0 +1,31 @@
+commit 8350ff933c37faa15101662516d8614a9c301a36
+Author: Pierre Neidhardt <mail@ambrevar.xyz>
+Date:   Thu Mar 5 16:43:55 2020 +0100
+
+    Work around Guix compilation error of define-key.
+    
+    Error happens in search-buffer's search-over-buffers which calls define-key.
+    
+    ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
+    ;     (NEXT:DEFINE-KEY "C-s"
+    ;      #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
+    ;      :KEYMAP NEXT::KEYMAP)
+    ;
+    ; caught WARNING:
+    ;   The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
+    
+    Maybe the type is wrong.  But our define-key lambdalist is weird anyways.
+
+diff --git a/source/keymap.lisp b/source/keymap.lisp
+index bbcb9d21..e29bdf3a 100644
+--- source/keymap.lisp
++++ source/keymap.lisp
+@@ -144,7 +144,7 @@
+          (setf (key-chord-stack *browser*) nil))
+         (t (setf (key-chord-stack *browser*) nil))))))
+ 
+-(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
++;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
+ @export
+ (defun define-key (&rest key-command-pairs
+                    &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46d..fd5b877ecd21 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
 # Template file for 'next'
 pkgname=next
 version=1.5.0
-revision=1
+revision=2
 wrksrc=nyxt-${version}
 build_style=gnu-makefile
 hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

From 644a6931f3c979c6ec7b7ca24f090861ff634c9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 2831/3458] nextcloud-client: rebuild against OpenSSL

---
 srcpkgs/nextcloud-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999de..2382d7d337f9 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
 version=3.1.2
-revision=1
+revision=2
 wrksrc="desktop-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=True"

From e976db5210bd9c8c7750b5067ace7763efb3d210 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 2832/3458] nginx: rebuild against OpenSSL

---
 srcpkgs/nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec2873..76d52cb3f221 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.18.0
-revision=3
+revision=4
 build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1b96835480338a16e6203a2a661eea9d3117d7b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 2833/3458] ngircd: rebuild against OpenSSL

---
 srcpkgs/ngircd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f2..7634efdfdc20 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
 # Template file for 'ngircd'
 pkgname=ngircd
 version=26
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
 conf_files="/etc/ngircd.conf"
 short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5c895a75807ba05f3e9eded22268a1386d309b4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 2834/3458] ngrep: rebuild against OpenSSL

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2ca..02a301eb639d 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From f53a2167ec83b258f44efc6742fa7c874209a5a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 2835/3458] nix: rebuild against OpenSSL

---
 srcpkgs/nix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a1..be65950c14a6 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
 # Template file for 'nix'
 pkgname=nix
 version=2.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
 hostmakedepends="curl pkg-config flex tar xz"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
  libseccomp-devel editline-devel"
 depends="curl tar xz"
 short_desc="Purely functional package manager"

From ad1bdaa6fd90b8412be62c8732a93437b790756a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 2836/3458] nmap: rebuild against OpenSSL

---
 srcpkgs/nmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf813..9b507d649fd3 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
 pkgname=nmap
 reverts="7.90_1 7.91_1"
 version=7.80
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
 hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
  $(vopt_if lua lua53-devel)"
 short_desc="Utility for network discovery and security auditing"
 maintainer="Piraty <piraty1@inbox.ru>"

From 7baa444d27539f72a9f6f899ddec0d57b9fd3805 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 2837/3458] nmh: rebuild against OpenSSL

---
 srcpkgs/nmh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54cc..0c234f74d824 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.7.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
 checkdepends="groff lynx tzdata tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"

From 74e9979aca42c228deb2c42e653969f44d38d7da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 2838/3458] nodejs-lts-10: change openssl buildoption to
 OpenSSL

---
 srcpkgs/nodejs-lts-10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a04..0d28125a75f8 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
 revision=1
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
 python_version=2 #unverified
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser"
 desc_option_icu="Enable shared icu"

From fea4a77f8c931052f57afec2f6a41ff47f8adfcb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 2839/3458] nodejs-lts: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs-lts/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198eb..edb108631ae4 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ 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 libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-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="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-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)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From dc91ed687734117510b06515ca46add310296a94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 2840/3458] nodejs: change openssl build-option to OpenSSL

---
 srcpkgs/nodejs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6c..e89a169ad612 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ 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 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-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="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-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)"
 short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
 desc_option_libuv="Enable shared libuv"
 desc_option_http_parser="Enable shared http-parser and llhttp"
 desc_option_icu="Enable shared icu"

From d629896fc5b66167b978fff7052e45631ae81a4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 2841/3458] nrpe: rebuild against OpenSSL

---
 srcpkgs/nrpe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856f..6a598b0909ee 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
 # Template file for 'nrpe'
 pkgname=nrpe
 version=4.0.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="monitoring-plugins"
 make_dirs="/etc/nagios 0775 _nagios _nagios"
 conf_files="/etc/nagios/nrpe.cfg"

From a3a0abd631723c951aad830eb4f34ef52b076592 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 2842/3458] nsd: rebuild against OpenSSL

---
 srcpkgs/nsd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c6..4c7cf99afea0 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
 version=4.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"

From 69dee484a8c2e221e4ea08d8408a7821bc0ad722 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 2843/3458] ntp: rebuild against OpenSSL

---
 srcpkgs/ntp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c3394..fa88f33f92b7 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
 hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
 short_desc="Network Time Protocol daemon and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NTP"

From f4d705fe2cdf18f85052e6d0c9fc561317f07bcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 2844/3458] nushell: rebuild against OpenSSL

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6cd..bd1e069c4b7a 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.27.1
-revision=2
+revision=3
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
 short_desc="Modern shell for the GitHub era"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 22d09987b23375f64472b78ba8ba59c38ff388da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 2845/3458] nzbget: rebuild against OpenSSL

---
 srcpkgs/nzbget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c8..3dfdc9154f10 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
 # Template file for 'nzbget'
 pkgname=nzbget
 version=21.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tlslib=OpenSSL
  --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
  --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
  --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
 short_desc="Download from Usenet using .nzb files"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 0d37ee647da652e6df795a1e1ad8ab89ce9069ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 2846/3458] open-iscsi: rebuild against OpenSSL

---
 srcpkgs/open-iscsi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb7251..7cd8308b0498 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=1
+revision=2
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
 short_desc="Open-iSCSI userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 89bdf75c4f9c16bba94cb79369efe3ddc1cc478e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 2847/3458] open-isns: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/open-isns/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0bdb90c5cfcc..931540354b4f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2818,7 +2818,7 @@ libKF5JsEmbed.so.5 kjsembed-5.26.0_1
 libKF5KrossCore.so.5 kross-5.26.0_1
 libKF5KrossUi.so.5 kross-5.36.0_1
 liblmdb.so.0 lmdb-0.9.18_2
-libisns.so.0 libisns-0.96_1
+libisns.so.0 libisns-0.101_2
 libz80ex.so.1 z80ex-1.1.21_1
 libz80ex_dasm.so.1 z80ex-1.1.21_1
 libqmmp.so.1 qmmp-1.1.4_1
diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4b..af670232cefb 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
 # Template file for 'open-isns'
 pkgname=open-isns
 version=0.101
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
 conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
 short_desc="Server and client for iSNS"

From 67e5e5ad7acc66b2634e0264c3766c77e5ae707f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 2848/3458] open-vm-tools: rebuild against OpenSSL

---
 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 91f592220c4d..c452f7365ac3 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'open-vm-tools'
 pkgname=open-vm-tools
 version=11.2.5
-revision=1
+revision=2
 archs="x86_64* i686* aarch64*"
 wrksrc="open-vm-tools-stable-${version}"
 build_wrksrc="open-vm-tools"
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
  --without-xmlsecurity --without-kernel-modules
  $(vopt_with x11 x) $(vopt_with pam)"
 hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
  libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
  $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
 short_desc="Open source implementation of VMware Tools"

From f6791f1c60c8c78c5ca33db7a0e7ea478e54ffc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 2849/3458] opendkim: rebuild against OpenSSL

---
 common/shlibs                                 |  2 +-
 .../patches/openssl_1.1.0_compat.patch        | 90 +++++++++++++++++++
 srcpkgs/opendkim/template                     | 10 ++-
 3 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch

diff --git a/common/shlibs b/common/shlibs
index 931540354b4f..fd3ec284a57d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2692,7 +2692,7 @@ libgl2ps.so.1 gl2ps-1.3.9_1
 libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1
 librpmatch.so.0 musl-rpmatch-1.0_1
 libmilter.so.1.0.2 libmilter-1.0.2_1
-libopendkim.so.10 opendkim-2.10.3_1
+libopendkim.so.10 opendkim-2.10.3_12
 libtevent.so.0 tevent-0.9.28_1
 libldb.so.2 ldb-2.2.0_1
 libpyldb-util.so.2 libpyldb-util-2.2.0_1
diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 000000000000..3957bb12bcb7
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+   * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+     - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ 	AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ 	               AC_MSG_ERROR([libcrypto not found]))
+ 
+-	AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-		[
+-			if test x"$enable_shared" = x"yes"
+-			then
+-				AC_MSG_ERROR([Cannot build shared opendkim
+-				              against static openssl libraries.
+-				              Configure with --disable-shared
+-				              to get this working or obtain a
+-				              shared libssl library for
+-				              opendkim to use.])
+-			fi
+ 
+-			# avoid caching issue - last result of SSL_library_init
+-			# shouldn't be cached for this next check
+-			unset ac_cv_search_SSL_library_init
+-			LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+-			AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+-			               AC_MSG_ERROR([libssl not found]), [-ldl])
+-		]
+-	)
++	AC_LINK_IFELSE(
++		       [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++					[[SSL_library_init();]])],
++					[od_have_ossl="yes";],
++					[od_have_ossl="no";])
++	if test x"$od_have_ossl" = x"no"
++	then
++		if test x"$enable_shared" = x"yes"
++		then
++			AC_MSG_ERROR([Cannot build shared opendkim
++			              against static openssl libraries.
++			              Configure with --disable-shared
++			              to get this working or obtain a
++			              shared libssl library for
++			              opendkim to use.])
++		fi
++
++		LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++		AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++		               AC_MSG_ERROR([libssl not found]), [-ldl])
++	fi
+ 
+ 	AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+                       AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ 	{
+ 		assert(pthread_setspecific(id_key, ptr) == 0);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		free(ptr);
+ 
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ 	if (crypto_init_done)
+ 	{
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++		OPENSSL_thread_stop();
++#else
+ 		CRYPTO_cleanup_all_ex_data();
+ 		CONF_modules_free();
+ 		EVP_cleanup();
+ 		ERR_free_strings();
+ 		ERR_remove_state(0);
++#endif
+ 
+ 		if (nmutexes > 0)
+ 		{
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa31995..c9d0abfda66c 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
 # Template file for 'opendkim'
 pkgname=opendkim
 version=2.10.3
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
 short_desc="DKIM library"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
 python_version=2 #unverified
 
+pre_configure() {
+	 autoreconf -fi
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.Sendmail

From 017fb88a4d4bd0bb5deba5986ee817f39cad4b9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 2850/3458] openfortivpn: rebuild against OpenSSL

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d725120..3ba99f7b2664 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-proc
@@ -11,7 +11,7 @@ configure_args="
  --with-resolvconf=/usr/bin/resolvconf
  --with-rt_dst"
 hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Client for PPP+SSL VPN tunnel services"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"

From fdbbd296491e8e1bd4a80dbf9183ce63ae2e643c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 2851/3458] openjdk11: change to OpenSSL

---
 srcpkgs/openjdk11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5b..7e7177eff699 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
 make_build_args="images $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"

From 75de08f84089c3e08da9175b7d59cddfb5258831 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 2852/3458] opensc: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/opensc/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fd3ec284a57d..268573147ae4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1742,7 +1742,7 @@ libLinearMath.so.2.89 bullet-2.89_1
 libBulletSoftBody.so.2.89 bullet-2.89_1
 libinotifytools.so.0 libinotify-tools-3.14_2
 libfswatch.so.11 libfswatch-1.13.0_1
-libopensc.so.7 libopensc-0.21.0_1
+libopensc.so.7 libopensc-0.21.0_2
 libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1
 librtlsdr.so.0 librtlsdr-0.5.3_1
 libSDL2_mixer-2.0.so.0 SDL2_mixer-2.0.0_1
diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd3260..596cd849584f 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
 # Template file for 'opensc'
 pkgname=opensc
 version=0.21.0
-revision=1
+revision=2
 wrksrc="OpenSC-${version}"
 build_style=gnu-configure
 configure_args="--enable-man  --enable-sm --enable-static=no --enable-doc
  --with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
 hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
 short_desc="Tools and libraries for smart cards"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 552563896507f6e0d73977e339a2548859cd485f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 2853/3458] opensmtpd-extras: rebuild against OpenSSL

---
 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 164eaf6dfc52..068e94bfee78 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,13 +1,13 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=2
+revision=3
 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
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
  libmariadbclient-devel sqlite-devel"
 depends="opensmtpd"
 short_desc="Free implementation of the server-side SMTP protocol - extras"

From e585396ba5aafe4e6866dc0d4a57e0a2cfb62f98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 2854/3458] opensmtpd: rebuild against OpenSSL

---
 srcpkgs/opensmtpd/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5d..10890fec2a47 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
  --with-maildir=/var/mail
  --with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
  ac_cv_func_explicit_bzero=no
  ac_cv_func_reallocarray=no
  ac_cv_func_strlcat=no
  ac_cv_func_strlcpy=no"
 hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
 depends="ca-certificates"
 conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
 short_desc="Free implementation of the server-side SMTP protocol"

From a6fe8d7f28c7ee7f5a801eefaec8c3e796e44a5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 2855/3458] openssh: rebuild against OpenSSL

---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a13..dfd8f6594921 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.4p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
 hostmakedepends="automake"
 makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
 short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"

From e495b107b13fd933b26141ac6a0dad52d3606656 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 2856/3458] openvpn: build against OpenSSL, re-enable pcks11

---
 srcpkgs/openvpn/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6b..29c0f10ddea8 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
 # Template file for 'openvpn'
 pkgname=openvpn
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
 hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
  $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
 short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
 checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
 
 build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
 desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11

From 1d0839eb1cb942193b0975623673d1c109df68bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 2857/3458] openvswitch: rebuild against OpenSSL

---
 srcpkgs/openvswitch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5a..145a0b52e8fc 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
 # Template file for 'openvswitch'
 pkgname=openvswitch
 version=2.14.2
-revision=1
+revision=2
 archs="i686* x86_64* ppc64*"
 build_style=gnu-configure
 configure_args="--with-rundir=/run/openvswitch"
 pycompile_dirs="usr/share/openvswitch/python"
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
 depends="python"
 short_desc="Production quality, multilayer virtual switch"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From f59d50badb142a9f1a5cd8b94198315acf620581 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 2858/3458] opkg: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/opkg/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 268573147ae4..c81a1d048f34 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3538,7 +3538,7 @@ libvkd3d.so.1 vkd3d-1.1_1
 libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
-libopkg.so.1 libopkg-0.4.0_1
+libopkg.so.1 libopkg-0.4.4_2
 libkodiplatform.so.18.0 kodi-platform-17.1.0_1
 libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
 libipset.so.13 libipset-7.9_1
diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb4..a1c1c2a910e2 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
 # Template file for 'opkg'
 pkgname=opkg
 version=0.4.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
  $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"

From d7f56d9ce97eea19e03024468f486207ccd0c259 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 2859/3458] opmsg: rebuild against OpenSSL

---
 srcpkgs/opmsg/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b7..eef0965e2d05 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
 # Template file for 'opmsg'
 pkgname=opmsg
 version=1.78s
-revision=3
+revision=4
 wrksrc="${pkgname}-rel-${version}"
 build_wrksrc=src
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
 maintainer="travankor <travankor@tuta.io>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
 do_configure() {
 	vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
 		 -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
-		 -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
 		 -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
 		 -e "s|^CXX=c++$|CXX=${CXX}|" \
 		 -e 's|^LD=c++$|LD=$(CXX)|' \

From fd447cd1dd0e745f21cea783cc12c2854e3de7f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 2860/3458] opusfile: rebuild against OpenSSL

---
 common/shlibs             | 4 ++--
 srcpkgs/opusfile/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c81a1d048f34..ae0bcad42cf6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1223,8 +1223,8 @@ libcprops.so.15 libcprops-0.1.12_1
 libopus.so.0 opus-1.0.2_1
 libconfig++.so.11 libconfig++-1.7.1_1
 libconfig.so.11 libconfig-1.7.1_1
-libopusfile.so.0 opusfile-0.2_1
-libopusurl.so.0 opusfile-0.6_1
+libopusfile.so.0 opusfile-0.12_2
+libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
 libgranite.so.5 granite-0.5.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36d..2b2169eed3ce 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
 # Template file for 'opusfile'
 pkgname=opusfile
 version=0.12
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From bbba66bfe20fc1feda74bc19ffc2d796e27a8693 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 2861/3458] pacman: rebuild against OpenSSL

---
 srcpkgs/pacman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b9050..d23aba0468bf 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=1
+revision=2
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"

From 84ae3b0cab43d09b684986213b1acf8c11beca77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 2862/3458] pam-u2f: rebuild against OpenSSL

---
 srcpkgs/pam-u2f/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae42293..7c1b5034a28d 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
 # Template file for 'pam-u2f'
 pkgname=pam-u2f
 version=1.1.0
-revision=1
+revision=2
 wrksrc="${pkgname/-/_}-${version}"
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security"
 hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
 short_desc="Pluggable Authentication Module (PAM) for U2F"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"

From 39966e5d245364d4822ae9b04c52226f184a128e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 2863/3458] pam_ssh: rebuild against OpenSSL

---
 srcpkgs/pam_ssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc92..eba01a0fa450 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
 # Template file for 'pam_ssh'
 pkgname=pam_ssh
 version=2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
  --includedir=${XBPS_CROSS_BASE}/usr/include
  --libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing single sign-on behavior for SSH"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="BSD-2-Clause"

From 09582202af7c609376db875c56572f8796c0d63c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 2864/3458] pam_ssh_agent_auth: rebuild against OpenSSL

---
 .../pam_ssh_agent_auth/patches/openssl.patch  | 881 ++++++++++++++++++
 srcpkgs/pam_ssh_agent_auth/template           |   5 +-
 2 files changed, 884 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch

diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 000000000000..bda9a37a5fff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c    |  50 ++++++++++++++++++++
+ bufbn.c     |   4 ++
+ cipher.h    |   6 ++-
+ kex.h       |   9 +++-
+ key.c       | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c   |  51 ++++++++++++++++----
+ ssh-ecdsa.c |  40 ++++++++++++----
+ ssh-rsa.c   |  22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 	case 1:
+ 		key = pamsshagentauth_key_new(KEY_RSA1);
+ 		bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ 		pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ 		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ 		if (keybits < 0 || bits != (u_int)keybits)
+ 			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ 			    BN_num_bits(key->rsa->n), bits);
++#else
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++		*comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++		keybits = BN_num_bits(RSA_get0_n(key->rsa));
++		if (keybits < 0 || bits != (u_int)keybits)
++			pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++			    BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ 		break;
+ 	case 2:
+ 		blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ 	}
+ 	pamsshagentauth_buffer_init(&buffer);
+ 	pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ 	pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++	pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++	pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ 	pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ 	pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ 	pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ 	pamsshagentauth_buffer_put_bignum(b, key->n);
+ 	pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ 	pamsshagentauth_buffer_put_bignum(b, key->iqmp);	/* ssh key->u */
+ 	pamsshagentauth_buffer_put_bignum(b, key->q);	/* ssh key->p, SSL key->q */
+ 	pamsshagentauth_buffer_put_bignum(b, key->p);	/* ssh key->q, SSL key->p */
++#else
++	pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++	/* To keep within the protocol: p < q for ssh. in SSL p > q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key));	/* ssh key->u */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key));	/* ssh key->p, SSL key->q */
++	pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key));	/* ssh key->q, SSL key->p */
++#endif
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+ 
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ 	pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ 	switch (key->type) {
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ 		pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ 		break;
+ 	}
+ 	pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+ 
+ 	if (key->type == KEY_RSA1) {
+ 		pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++		pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ 	} else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ 		pamsshagentauth_key_to_blob(key, &blob, &blen);
+ 		pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ 		pamsshagentauth_buffer_put_int(buffer, 0);
+ 		return 0;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (value->neg) {
++#else
++	if (BN_is_negative(value)) {
++#endif
+ 		pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ 		return (-1);
+ 	}
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT		0
+ 
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+ 
+ struct Cipher;
++/*
+ struct CipherContext {
+ 	int	plaintext;
+ 	EVP_CIPHER_CTX evp;
+ 	Cipher *cipher;
+ };
++*/
+ 
++/*
+ u_int	 cipher_mask_ssh1(int);
+ Cipher	*cipher_by_name(const char *);
+ Cipher	*cipher_by_number(int);
+@@ -88,4 +91,5 @@ void	 cipher_set_keyiv(CipherContext *, u_char *);
+ int	 cipher_get_keyiv_len(const CipherContext *);
+ int	 cipher_get_keycontext(const CipherContext *, u_char *);
+ void	 cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif				/* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT	0x0001
+ 
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ 	u_char	*key;
+ 	u_char	*iv;
+ };
++/*
+ struct Mac {
+ 	char	*name;
+ 	int	enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ 	HMAC_CTX	evp_ctx;
+ 	struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ 	int	type;
+ 	int	enabled;
+ 	char	*name;
+ };
++/*
+ struct Newkeys {
+ 	Enc	enc;
+ 	Mac	mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ 	int	(*host_key_index)(Key *);
+ 	void	(*kex[KEX_MAX])(Kex *);
+ };
++*/
+ 
++/*
+ Kex	*kex_setup(char *[PROPOSAL_MAX]);
+ void	 kex_finish(Kex *);
+ 
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+ 
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void	dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ 	case KEY_RSA:
+ 		if ((rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((rsa->n = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((rsa->e = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ 		k->rsa = rsa;
+ 		break;
+ 	case KEY_DSA:
+ 		if ((dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((dsa->p = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
+ 		if ((dsa->pub_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++		if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++		if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++			pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ 		k->dsa = dsa;
+ 		break;
+ 	case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ 	switch (k->type) {
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->rsa->d = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
+ 		if ((k->rsa->dmp1 = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++		if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++		if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++			pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((k->dsa->priv_key = BN_new()) == NULL)
+ 			pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++		if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++			pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ 			pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ 		break;
+ 	case KEY_ED25519:
+ 		RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ 	case KEY_RSA1:
+ 	case KEY_RSA:
+ 		return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ 		    BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++		    BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++		    BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ 	case KEY_DSA:
+ 		return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ 		    BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ 		    BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ 		    BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++		    BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++		    BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ 	case KEY_ECDSA:
+ 		return a->ecdsa != NULL && b->ecdsa != NULL &&
+ 			EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+     u_int *dgst_raw_length)
+ {
+ 	const EVP_MD *md = NULL;
+-	EVP_MD_CTX ctx;
++	EVP_MD_CTX *ctx;
+ 	u_char *blob = NULL;
+ 	u_char *retval = NULL;
+ 	u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		nlen = BN_num_bytes(k->rsa->n);
+ 		elen = BN_num_bytes(k->rsa->e);
+ 		len = nlen + elen;
+ 		blob = pamsshagentauth_xmalloc(len);
+ 		BN_bn2bin(k->rsa->n, blob);
+ 		BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++		nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++		elen = BN_num_bytes(RSA_get0_e(k->rsa));
++		len = nlen + elen;
++		blob = pamsshagentauth_xmalloc(len);
++		BN_bn2bin(RSA_get0_n(k->rsa), blob);
++		BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 	case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ 	}
+ 	if (blob != NULL) {
+ 		retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+-		EVP_DigestInit(&ctx, md);
+-		EVP_DigestUpdate(&ctx, blob, len);
+-		EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++		/* XXX Errors from EVP_* functions are not hadled */
++		ctx = EVP_MD_CTX_create();
++		EVP_DigestInit(ctx, md);
++		EVP_DigestUpdate(ctx, blob, len);
++		EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ 		memset(blob, 0, len);
+ 		pamsshagentauth_xfree(blob);
++		EVP_MD_CTX_destroy(ctx);
+ 	} else {
+ 		pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ 	}
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ 			return -1;
+ 		*cpp = cp;
+ 		/* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (!read_bignum(cpp, ret->rsa->e))
+ 			return -1;
+ 		if (!read_bignum(cpp, ret->rsa->n))
+ 			return -1;
++#else
++		if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++			return -1;
++		if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++			return -1;
++#endif
+ 		success = 1;
+ 		break;
+ 	case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+ 
+ 	if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ 		/* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		bits = BN_num_bits(key->rsa->n);
+ 		fprintf(f, "%u", bits);
+ 		if (write_bignum(f, key->rsa->e) &&
+ 		    write_bignum(f, key->rsa->n)) {
++#else
++		bits = BN_num_bits(RSA_get0_n(key->rsa));
++		fprintf(f, "%u", bits);
++		if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++		    write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ 			success = 1;
+ 		} else {
+ 			pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ 	switch (k->type) {
+ 	case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_RSA:
+ 		return BN_num_bits(k->rsa->n);
+ 	case KEY_DSA:
+ 		return BN_num_bits(k->dsa->p);
++#else
++	case KEY_RSA:
++		return BN_num_bits(RSA_get0_n(k->rsa));
++	case KEY_DSA:
++		return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ 	switch (k->type) {
+ 	case KEY_DSA:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ 		    (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ 		    (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ 		    (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++		if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++		    (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_RSA:
+ 	case KEY_RSA1:
+ 		n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ 		    (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++		if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++		    (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ 			pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ 		break;
+ 	case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 	switch (type) {
+ 	case KEY_RSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ 		break;
+ 	case KEY_DSA:
+ 		key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ 		    pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++		if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++		    pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ 			pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ 			pamsshagentauth_key_free(key);
+ 			key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+ 	switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	case KEY_DSA:
+ 		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ 		pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ 		break;
++#else
++	case KEY_DSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++		pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++		break;
++	case KEY_RSA:
++		pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++		pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++		break;
++#endif
+ 	case KEY_ECDSA:
+ 	{
+ 		size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ 	case KEY_RSA:
+ 		if ((pk->rsa = RSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_DSA:
+ 		if ((pk->dsa = DSA_new()) == NULL)
+ 			pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
+ 		if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ 			pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++		if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++		if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++			pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ 		break;
+ 	case KEY_ECDSA:
+ 		pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ 	u_int rlen, slen, len, dlen;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	const BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	sig = DSA_do_sign(digest, dlen, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (sig == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ 		return -1;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	rlen = BN_num_bytes(sig->r);
+ 	slen = BN_num_bytes(sig->s);
++#else
++	DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++	rlen = BN_num_bytes(r);
++	slen = BN_num_bytes(s);
++#endif
+ 	if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ 		pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ 		DSA_SIG_free(sig);
+ 		return -1;
+ 	}
+ 	memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ 	BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++	BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++	BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ 	DSA_SIG_free(sig);
+ 
+ 	if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	DSA_SIG *sig;
+ 	const EVP_MD *evp_md = EVP_sha1();
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen;
+ 	int rlen, ret;
+ 	Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+ 	if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ 		pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	/* parse signature */
+ 	if ((sig = DSA_SIG_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if ((sig->r = BN_new()) == NULL)
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ 	if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 	if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ 	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ 		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++	if ((r = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if ((s = BN_new()) == NULL)
++		pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++	if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++	    (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++		pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++	if (DSA_SIG_set0(sig, r, s) != 1)
++		pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+ 
+ 	/* clean up */
+ 	memset(sigblob, 0, len);
+ 	pamsshagentauth_xfree(sigblob);
+ 
+ 	/* sha1 the data */
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	DSA_SIG_free(sig);
+ 
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE];
+     u_int len, dlen;
+     Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+         return -1;
+     }
+ 
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     if (sig == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     }
+ 
+     pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+         pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++        pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+         pamsshagentauth_logerror("couldn't serialize signature");
+         ECDSA_SIG_free(sig);
+         return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+     ECDSA_SIG *sig;
+     const EVP_MD *evp_md = evp_from_key(key);
+-    EVP_MD_CTX md;
++    EVP_MD_CTX *md;
+     u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+     u_int len, dlen;
+     int rlen, ret;
+     Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	BIGNUM *r, *s;
++#endif
+ 
+     if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+         pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 
+     pamsshagentauth_buffer_init(&b);
+     pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+         (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++    DSA_SIG_get0(sig, &r, &s);
++    if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++        (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+         pamsshagentauth_fatal("ssh_ecdsa_verify:"
+             "pamsshagentauth_buffer_get_bignum2_ret failed");
+ 
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+     pamsshagentauth_xfree(sigblob);
+ 
+     /* sha256 the data */
+-    EVP_DigestInit(&md, evp_md);
+-    EVP_DigestUpdate(&md, data, datalen);
+-    EVP_DigestFinal(&md, digest, &dlen);
++    md = EVP_MD_CTX_create();
++    EVP_DigestInit(md, evp_md);
++    EVP_DigestUpdate(md, data, datalen);
++    EVP_DigestFinal(md, digest, &dlen);
+ 
+     ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+     memset(digest, 'd', sizeof(digest));
++    EVP_MD_CTX_destroy(md);
+ 
+     ECDSA_SIG_free(sig);
+ 
+     pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+         ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+     return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+     const u_char *data, u_int datalen)
+ {
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sig;
+ 	u_int slen, dlen, len;
+ 	int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 		pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ 		return -1;
+ 	}
++	md = EVP_MD_CTX_create();
+ 	EVP_DigestInit(&md, evp_md);
+ 	EVP_DigestUpdate(&md, data, datalen);
+ 	EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ 
+ 	ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 
+ 	if (ok != 1) {
+ 		int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ 	Buffer b;
+ 	const EVP_MD *evp_md;
+-	EVP_MD_CTX md;
++	EVP_MD_CTX *md;
+ 	char *ktype;
+ 	u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ 	u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ 		return -1;
+ 	}
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++	if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ 		pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		    BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++		    BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ 		return -1;
+ 	}
+ 	pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ 		pamsshagentauth_xfree(sigblob);
+ 		return -1;
+ 	}
+-	EVP_DigestInit(&md, evp_md);
+-	EVP_DigestUpdate(&md, data, datalen);
+-	EVP_DigestFinal(&md, digest, &dlen);
++	md = EVP_MD_CTX_create();
++	EVP_DigestInit(md, evp_md);
++	EVP_DigestUpdate(md, data, datalen);
++	EVP_DigestFinal(md, digest, &dlen);
+ 
+ 	ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ 	memset(digest, 'd', sizeof(digest));
++	EVP_MD_CTX_destroy(md);
+ 	memset(sigblob, 's', len);
+ 	pamsshagentauth_xfree(sigblob);
+ 	pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532f..507448245108 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
 # Template file for 'pam_ssh_agent_auth'
 pkgname=pam_ssh_agent_auth
 version=0.10.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--without-openssl-header-check"
 hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
 short_desc="PAM module providing authentication through a ssh agent"
 maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
 license="MIT"

From da231016d7ca771170a688a370c51f94fe36cc57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 2865/3458] partclone: rebuild against OpenSSL

---
 srcpkgs/partclone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d93541..4813a8a250dd 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
 # Template file for 'partclone'
 pkgname=partclone
 version=0.3.17
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
  --enable-extfs --enable-hfsp --enable-fat --enable-exfat
  --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
 hostmakedepends="pkg-config automake autoconf libtool"
 makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
 short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 039826a1988c077bc8c5e13ea78394697beb947f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 2866/3458] passwordsafe: rebuild against OpenSSL

---
 srcpkgs/passwordsafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11a..c4eab0c120ec 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
 version=1.13.0
-revision=1
+revision=2
 wrksrc="pwsafe-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 # build process uses perl to generate core_st.cpp and zip to generate help files
 hostmakedepends="perl zip pkg-config gettext"
 makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
 checkdepends="gtest-devel"
 short_desc="Simple & Secure Password Management"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"

From d877613280b37d0c133ae71fa3641a6362a95b4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 2867/3458] pen: rebuild against OpenSSL

---
 srcpkgs/pen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a4..d55a7f21272e 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=5
+revision=6
 build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6c7f6e87bc61df1585a0a45aac58ce4f4cde6ede Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 2868/3458] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1ceaa..0d6407501fb8 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Bignum'
 pkgname=perl-Crypt-OpenSSL-Bignum
 version=0.09
-revision=11
+revision=12
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="${hostmakedepends}"
 short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fc19c5c0031a25ae232900317ce2b299fdf9e98a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 2869/3458] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61a..ad093d068402 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-RSA'
 pkgname=perl-Crypt-OpenSSL-RSA
 version=0.31
-revision=6
+revision=7
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 checkdepends="perl-Crypt-OpenSSL-Random"
 short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"

From eb1f55afeb8879178929527073614f5a98d39308 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 2870/3458] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL

---
 srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e01..d81f4b99f7a4 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Crypt-OpenSSL-Random'
 pkgname=perl-Crypt-OpenSSL-Random
 version=0.15
-revision=9
+revision=10
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
 depends="perl"
 short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
 maintainer="Kevin Berry <kevin@opensourcealchemist.com>"

From c3e7ecd9e71f6a28f185a27d8e080de2def2d50b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 2871/3458] perl-DBD-mysql: rebuild against OpenSSL

---
 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 a647f5bd13ce..dab8099adcdc 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=6
+revision=7
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
 depends="perl-DBI"
 checkdepends="perl-Test-Deep"
 short_desc="DBD::mysql - MySQL DBI driver"

From ec1fcf8d102fe8d0a596ef1abf0c351e6c147d78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 2872/3458] perl-Net-SSH2: rebuild against OpenSSL

---
 srcpkgs/perl-Net-SSH2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c3..541ad9a6e039 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSH2'
 pkgname=perl-Net-SSH2
 version=0.72
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"

From 27f2b002832c5284dbfde166e9c4cda49512c170 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 2873/3458] perl-Net-SSLeay: rebuild against OpenSSL

---
 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 1033a5ac930e..e1d6500e207c 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.90
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
 short_desc="Net::SSLeay - Perl extension for using OpenSSL"

From 2068a36924aed6515ee8853fc691fd74c6280e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 2874/3458] pev: rebuild against OpenSSL

---
 srcpkgs/pev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13edc..4a55528f83b5 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
 # Template file for 'pev'
 pkgname=pev
 version=0.81
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="prefix=/usr sysconfdir=/etc"
 make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
 # We don't need python for check, only their PE binary is needed
 checkdepends="which python3"
 short_desc="PE file analysis toolkit"

From b1f506f2c0b8fb427a9584b77917dac8d1415956 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 2875/3458] pgadmin3: unbundle libssh2

---
 .../patches/pgadmin3_unbundle-libssh.patch    | 68 +++++++++++++++++++
 srcpkgs/pgadmin3/template                     |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch

diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 000000000000..f3bcf8521508
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in	2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in	2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk	2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+ 
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am	2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+ 
+ if SUN_CC
+   __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+ 
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ 	$(TMP_ui)
+ endif
+ 
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+ 
+ install-exec-hook:
+ 	cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp	2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp	2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+ 
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+ 
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e8..ad2465b3413c 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
 # Template file for 'pgadmin3'
 pkgname=pgadmin3
 version=1.22.2
-revision=13
+revision=14
 build_style=gnu-configure
 configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
 short_desc="Comprehensive design and management interface for PostgreSQL"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
 
 CXXFLAGS="-Wno-narrowing"
 
-post_extract() {
+pre_configure() {
+	autoreconf -fi
 	sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
 	sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
 }

From 48097d978ea4e706e082e88e9fb0a22070ab8e47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 2876/3458] pgbackrest: rebuild against OpenSSL

---
 srcpkgs/pgbackrest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a3..b501ed9385eb 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
 # Template file for 'pgbackrest'
 pkgname=pgbackrest
 version=2.26
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
 build_wrksrc="src"
 build_style=gnu-configure
 hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
 short_desc="Reliable PostgreSQL Backup & Restore"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From e12e57b86141fe31f9b169299dbd530dce6678bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 2877/3458] pgbouncer: rebuild against OpenSSL

---
 srcpkgs/pgbouncer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c7..1049a1594d06 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
 version=1.15.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libevent-devel"

From d3c77fa3d7a0cdeb3ab86999e8efd8fbb6546e14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 2878/3458] php: rebuild against OpenSSL

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d35605..bdc35ee2d846 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel

From 98694b423b1471b720af6372851b441715cec185 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 2879/3458] pidgin-sipe: rebuild against OpenSSL

---
 srcpkgs/pidgin-sipe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035ad..9ea248618f43 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
 # Template file for 'pidgin-sipe'
 pkgname=pidgin-sipe
 version=1.25.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
  libnice-devel gst-plugins-base1-devel farstream-devel"
 depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
 short_desc="SIP/SIMPLE plugin for Pidgin IM"

From f2cfa744dd92b6e4190a083115b797be2df981da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 2880/3458] pijul: rebuild against OpenSSL

---
 srcpkgs/pijul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a7503819839..40df186b9387 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=3
+revision=4
 build_style=cargo
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
 short_desc="Distributed version control system based on patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-only"

From f618a8070a79368edd82aa50ba58fbca901e50c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 2881/3458] pjproject: rebuild against OpenSSL

---
 common/shlibs              | 28 ++++++++++++++--------------
 srcpkgs/pjproject/template |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ae0bcad42cf6..4b9db33f1b4b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2493,20 +2493,20 @@ libKF5UnitConversion.so.5 kunitconversion-5.26.0_1
 libfdk-aac.so.2 fdk-aac-2.0.0_1
 libyubikey.so.0 libyubikey-1.13_1
 libykpers-1.so.1 libykpers-1.17.2_1
-libg7221codec.so.2 pjproject-2.4.5_1
-libilbccodec.so.2 pjproject-2.4.5_1
-libpj.so.2 pjproject-2.4.5_1
-libpjlib-util.so.2 pjproject-2.4.5_1
-libpjmedia-audiodev.so.2 pjproject-2.4.5_1
-libpjmedia-codec.so.2 pjproject-2.4.5_1
-libpjmedia-videodev.so.2 pjproject-2.4.5_1
-libpjmedia.so.2 pjproject-2.4.5_1
-libpjnath.so.2 pjproject-2.4.5_1
-libpjsip-simple.so.2 pjproject-2.4.5_1
-libpjsip-ua.so.2 pjproject-2.4.5_1
-libpjsip.so.2 pjproject-2.4.5_1
-libpjsua.so.2 pjproject-2.4.5_1
-libpjsua2.so.2 pjproject-2.4.5_1
+libg7221codec.so.2 pjproject-2.8_5
+libilbccodec.so.2 pjproject-2.8_5
+libpj.so.2 pjproject-2.8_5
+libpjlib-util.so.2 pjproject-2.8_5
+libpjmedia-audiodev.so.2 pjproject-2.8_5
+libpjmedia-codec.so.2 pjproject-2.8_5
+libpjmedia-videodev.so.2 pjproject-2.8_5
+libpjmedia.so.2 pjproject-2.8_5
+libpjnath.so.2 pjproject-2.8_5
+libpjsip-simple.so.2 pjproject-2.8_5
+libpjsip-ua.so.2 pjproject-2.8_5
+libpjsip.so.2 pjproject-2.8_5
+libpjsua.so.2 pjproject-2.8_5
+libpjsua2.so.2 pjproject-2.8_5
 libhdf5_hl.so.100 hdf5-1.10.1_2
 libhdf5.so.103 hdf5-1.10.4_1
 libhdf5_hl_cpp.so.100 hdf5-1.10.1_2
diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6f..c94ead90e9de 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
 # and this template is heavily based on Alpine's APKBUILD.
 pkgname=pjproject
 version=2.8
-revision=4
+revision=5
 disable_parallel_build=yes
 build_style=gnu-configure
 configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
 # libyuv packaged for Void.  Thought I could be smart and use
 # webrtc-audio-processing, but it doesn't have what I need.  Using the
 # bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
 	libsrtp-devel libsamplerate-devel"
 short_desc="Open source SIP and media stack"
 maintainer="Christopher Brannon <chris@the-brannons.com>"

From 21a1036867d0050208fcf82131e911f3c21a6311 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 2882/3458] pkcs11-helper: rebuild against OpenSSL

---
 common/shlibs                  | 2 +-
 srcpkgs/pkcs11-helper/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b9db33f1b4b..878b45ac8db6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3115,7 +3115,7 @@ 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
+libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 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
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730bc..1be136f157aa 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
 # Template file for 'pkcs11-helper'
 pkgname=pkcs11-helper
 version=1.25.1
-revision=5
+revision=6
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
 hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"

From c14f406f540400d47e61bffd4cf40c3487914be1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 2883/3458] pmbootstrap: rebuild against OpenSSL

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23f..d1660a8a59dc 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,10 +1,10 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.29.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
 short_desc="PostmarketOS's chroot, build and flash tool"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"

From 78302efa13a84bf87628410a6b75378ee3d01084 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 2884/3458] poco: rebuild against OpenSSL

---
 common/shlibs         | 26 +++++++++++++-------------
 srcpkgs/poco/template |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 878b45ac8db6..23ebeab80ca2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2956,19 +2956,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
 libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
 libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.64 poco-1.9.4_1
-libPocoMongoDB.so.64 poco-1.9.4_1
-libPocoZip.so.64 poco-1.9.4_1
-libPocoData.so.64 poco-1.9.4_1
-libPocoNet.so.64 poco-1.9.4_1
-libPocoDataSQLite.so.64 poco-1.9.4_1
-libPocoFoundation.so.64 poco-1.9.4_1
-libPocoXML.so.64 poco-1.9.4_1
-libPocoUtil.so.64 poco-1.9.4_1
-libPocoRedis.so.64 poco-1.9.4_1
-libPocoEncodings.so.64 poco-1.9.4_1
-libPocoNetSSL.so.64 poco-1.9.4_1
-libPocoCrypto.so.64 poco-1.9.4_1
+libPocoJSON.so.64 poco-1.9.4_3
+libPocoMongoDB.so.64 poco-1.9.4_3
+libPocoZip.so.64 poco-1.9.4_3
+libPocoData.so.64 poco-1.9.4_3
+libPocoNet.so.64 poco-1.9.4_3
+libPocoDataSQLite.so.64 poco-1.9.4_3
+libPocoFoundation.so.64 poco-1.9.4_3
+libPocoXML.so.64 poco-1.9.4_3
+libPocoUtil.so.64 poco-1.9.4_3
+libPocoRedis.so.64 poco-1.9.4_3
+libPocoEncodings.so.64 poco-1.9.4_3
+libPocoNetSSL.so.64 poco-1.9.4_3
+libPocoCrypto.so.64 poco-1.9.4_3
 libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe177800..9c157ba6d615 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
 # Template file for 'poco'
 pkgname=poco
 version=1.9.4
-revision=2
+revision=3
 wrksrc="${pkgname}-${version}-all"
 build_style=cmake
 configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
 short_desc="C++ class libraries for building network-based applications"
 maintainer="Julien Dehos <dehos@univ-littoral.fr>"
 license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
 }
 
 poco-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 8ccf5f7ba6504cc69cad69b781080508b16d767e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 2885/3458] postfix: rebuild against OpenSSL

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c1..ea2df7449793 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=2
+revision=3
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From d21589c06d2cdd641c956b6dcac100f3ed0970c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 2886/3458] postgresql: rebuild against OpenSSL

---
 srcpkgs/postgresql/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c0..e5eda8fb05c4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=9.6.20
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt --disable-rpath
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From 9b0557dbac83260f065dc760bc03bfc882d65554 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 2887/3458] postgresql12: rebuild against OpenSSL

---
 srcpkgs/postgresql12/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2ab..4714ae62ed3d 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.6
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
  --without-bonjour --with-libxml --with-libxslt
  --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
 hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
 checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"

From dabc23a5dbd751758465ca1b44fc991d9070e78a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 2888/3458] prosody: rebuild against OpenSSL

---
 srcpkgs/prosody/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d347..ce76d7c0c2e1 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
 # Template file for 'prosody'
 pkgname=prosody
 version=0.11.8
-revision=1
+revision=2
 build_style=configure
 configure_args="
  --ostype=linux
@@ -19,7 +19,7 @@ conf_files="
  /etc/prosody/certs/makefile
  /etc/prosody/certs/GNUmakefile"
 make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
 depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
  lua51-BitOp"
 short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"

From 53dc2dd5ee5cf477d14c647dc4409f9c02501036 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 2889/3458] python-cryptography: rebuild against OpenSSL

---
 srcpkgs/python-cryptography/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042de..0a0ccbefd5f0 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.3.2
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
  python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-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 ${depends}"

From 77c61e8da0a6fe3f0e33f8fb85ddae2a76bd4746 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 2890/3458] python-tkinter: rebuild against OpenSSL

---
 srcpkgs/python-tkinter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa18..51c2fd766500 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -8,11 +8,11 @@ _desc="Interpreted, interactive, object-oriented programming language"
 
 pkgname=python-tkinter
 version=2.7.18
-revision=2
+revision=3
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
  sqlite-devel bzip2-devel zlib-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python2"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e2446a95961b9d2ecc17408e72417b0a52a03e8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 2891/3458] python3-adblock: switch to OpenSSL

---
 srcpkgs/python3-adblock/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f890279..91ffd8811059 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
 version=0.4.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
 build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="Brave's adblock library in Python"

From 9d2b8d3a2791a2435a75ab9c69a5c64a60196c8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 2892/3458] python3-cryptography: switch to OpenSSL

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186ea..27fbe57203a0 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
 version=3.4.6
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
 checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
  python3-cryptography_vectors python3-pretend python3-hypothesis $depends"

From 189b86937e0f87f5dd359bb33af8ce56d77eeefe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 2893/3458] python3-curl: rebuild against OpenSSL

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383b..e985ecf8534f 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=9
+revision=10
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 short_desc="Python3 interface to cURL library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, MIT"

From 3e7a8f3f32d186c6fb9a8401b5bbbff24638a83e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 2894/3458] python3-grpcio: rebuild against OpenSSL

---
 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 f286217b2466..38515f13aae4 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.36.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
 depends="python3-six"
 short_desc="HTTP/2-based gRPC framework for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From b51527a1d2bee0f3d2df4dd23ac06a8ca0426861 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 2895/3458] python3-mysqlclient: rebuild against OpenSSL

---
 srcpkgs/python3-mysqlclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472bf..5a6fc075fe8d 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=4
+revision=5
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
 short_desc="Python3 interface to MySQL/MariaDB"
 maintainer="Alin Dobre <alin.dobre@outlook.com>"
 license="GPL-2.0-or-later"

From e187fcb2d1b9ccd147b335354b686c6ab5a88005 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 2896/3458] python3-scrypt: rebuild against OpenSSL

---
 srcpkgs/python3-scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb81..f73f4c555766 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=2
+revision=3
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
 short_desc="Python 3 bindings for the scrypt key derivation function"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="BSD-2-Clause"

From 4c14bf86e7cc1e2771c9b994c630796de36fb050 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 2897/3458] python3-tkinter: rebuild against OpenSSL

---
 srcpkgs/python3-tkinter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034e..626392bc88fd 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
  usr/lib/python${version%.*}/turtledemo
  usr/lib/python${version%.*}/turtle.py"
 hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
 short_desc="${_desc} - GUI toolkit for Python3"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"

From 11b586d66d62d8531713f98cf44fc1705e054027 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 2898/3458] qbittorrent: rebuild against OpenSSL

---
 srcpkgs/qbittorrent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab2336..b3a5b7fb58a9 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
 version=4.3.3
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=qmake
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"

From 2eb0a83858613ebb1e1c08db6ba9929704aa052f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 2899/3458] qca-qt5: rebuild against OpenSSL

---
 common/shlibs            | 10 ++++++++++
 srcpkgs/qca-qt5/template |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 23ebeab80ca2..c950129d2106 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2204,6 +2204,16 @@ libclamunrar.so.9 clamav-0.103.1_2
 libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2c..9e1cd59b8395 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
 # Template file for 'qca-qt5'
 pkgname=qca-qt5
 version=2.3.1
-revision=1
+revision=2
 wrksrc="${pkgname%-*}-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
  -DUSE_RELATIVE_PATHS=true"
 hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
 depends="ca-certificates"
 short_desc="Qt5 Cryptographic Architecture"
 maintainer="John <me@johnnynator.dev>"

From a05eeacd9159b93e362fb05c8eac2897c06fd63c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 2900/3458] qingy: switch to libgcrypt

---
 srcpkgs/qingy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e80..02c89bd1ccae 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
 # Template file for 'qingy'
 pkgname=qingy
 version=1.0.0
-revision=28
+revision=29
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
  $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
 configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
 short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"

From cf2f0e3a1096f417ce004aaea669f08b84373529 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 2901/3458] rabbitmq-c: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/rabbitmq-c/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c950129d2106..6803181f587c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3665,7 +3665,7 @@ libluv.so.1 libluv-1.30.1.0_1
 libarmadillo.so.9 armadillo-9.700.2_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
-librabbitmq.so.4 rabbitmq-c-0.9.0_1
+librabbitmq.so.4 rabbitmq-c-0.10.0_2
 libuInputPlus.so.0 libuInputPlus-0.1.3_1
 libevdevPlus.so.0 libevdevPlus-0.1.0_1
 librte_lpm.so.2 dpdk-19.08_5
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161d..95ad7a333435 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
 # Template file for 'rabbitmq-c'
 pkgname=rabbitmq-c
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 make_check_target=test
 hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="RabbitMQ C client"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="MIT"

From f4c28ddbcb9b88d6f0ac38b4fd4515f6afa429b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 2902/3458] rdedup: rebuild against OpenSSL

---
 srcpkgs/rdedup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc9442..c392e3c0e2fc 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
 # Template file for 'rdedup'
 pkgname=rdedup
 version=3.1.1
-revision=5
+revision=6
 wrksrc=rdedup-rdedup-v${version}
 build_style=cargo
 hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 8ccc5c836d1f7e7931924b3ef1d038716afbaf54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 2903/3458] rdis-git: rebuild against OpenSSL

---
 srcpkgs/rdis-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c1..5aaa5d669b7a 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
 # Template file for 'rdis-git'
 pkgname=rdis-git
 version=20150722
-revision=11
+revision=12
 hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
 short_desc="A binary analysis tool for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"

From a5c8ad94d9ff888562729bf0d8dd2f265be100a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 2904/3458] remmina: rebuild against OpenSSL

---
 srcpkgs/remmina/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433ab..53043809e675 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
 # Template file for 'remmina'
 pkgname=remmina
 version=1.4.10
-revision=1
+revision=2
 wrksrc="Remmina-v${version}"
 build_style=cmake
 configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"

From 62a70db8e4f3c1e243a4dc8cb1ee2d54e7e73a26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 2905/3458] remwharead: cleanup makedepends

remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8a..03ac932eac03 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
 revision=1
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
 short_desc="Saves URIs of things you want to remember in a database"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"

From 1b037a5143c587737c86dc755a45c66000b539af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 2906/3458] retroshare: rebuild against OpenSSL

---
 srcpkgs/retroshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f10..9e1084749f4b 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
 # Template file for 'retroshare'
 pkgname=retroshare
 version=0.6.5
-revision=4
+revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"

From e6649dfb5f55d53e38bda7e8f4e78c604ec89541 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 2907/3458] rmilter: change to OpenSSL

openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
 srcpkgs/rmilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b0386..a131af6c7f07 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
 build_style=cmake
 configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
 hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
 short_desc="Postfix/sendmail integration for rspamd"
 maintainer="John Regan <john@jrjrtech.com>"
 license="BSD"

From af4f5db2140526a6c077b90b3f2795f41d74500a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 2908/3458] rng-tools: rebuild against OpenSSL

---
 srcpkgs/rng-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad640..bfc01d1b2201 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.11
-revision=2
+revision=3
 wrksrc=${pkgname}-${version}
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"

From ca9d0c5cd652569948b611e00c416e8661172277 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 2909/3458] rooster: rebuild against OpenSSL

---
 srcpkgs/rooster/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb761..90b4f237bc84 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
 # Template file for 'rooster'
 pkgname=rooster
 version=2.9.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"

From b08efa6d093bcd119fb937aa1523561b22b86338 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 2910/3458] rpi-imager: rebuild against OpenSSL

---
 srcpkgs/rpi-imager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5fd..b00e8ed63e98 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
 # Template file for 'rpi-imager'
 pkgname=rpi-imager
 version=1.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel

From 519c42c792389d0ad70e044613a9affa186a05a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 2911/3458] rspamd: rebuild against OpenSSL

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc193..7398b753622e 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From 49831cb7fd1f90d925da528b5ff937eac5e6dd2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 2912/3458] rstudio: rebuild against OpenSSL

---
 srcpkgs/rstudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce86..904bec8ca964 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
 # Template file for 'rstudio'
 pkgname=rstudio
 version=1.3.1093
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
 hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
  qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel

From 77bb52782482d9b4328a6c1a62ca2b40ae84178e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 2913/3458] rsync: rebuild against OpenSSL

---
 srcpkgs/rsync/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d1..a1df98d33f52 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
 # Template file for 'rsync'
 pkgname=rsync
 version=3.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
 makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
 short_desc="Remote fast incremental file transfer tool"
 maintainer="Lugubris <lugubris@disroot.org>"
 license="GPL-3.0-only"

From b07aee3036c4a35cd830fa11b72a93952317af69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 2914/3458] rtags: rebuild against OpenSSL

---
 srcpkgs/rtags/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c30903..baf721c4160c 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From 8cac130cd7d0fc617a171eeedf0e1939f992e92f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 2915/3458] rust-cargo-audit: rebuild against OpenSSL

---
 srcpkgs/rust-cargo-audit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71ff..b733afa1a7bd 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-cargo-audit'
 pkgname=rust-cargo-audit
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
 short_desc="Audit Cargo.lock for crates with security vulnerabilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0, MIT"

From 7fd0667b5822d207ffce9533140bbde647bff353 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 2916/3458] rust-sccache: rebuild against OpenSSL

---
 srcpkgs/rust-sccache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e2..5d8f2bf185c1 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
 # Template file for 'rust-sccache'
 pkgname=rust-sccache
 version=0.2.13
-revision=2
+revision=3
 wrksrc="${pkgname/rust-/}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Sccache is a ccache-like tool"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From e98ac8795826b09fd805cea001875c0a93fd9af2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 2917/3458] rustup: rebuild against OpenSSL

---
 srcpkgs/rustup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5e..e4f985f74ec4 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=2
+revision=3
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
 build_helper=qemu
 configure_args="--features no-self-update --bin rustup-init"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
 short_desc="Rust toolchain installer"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"

From 36e9693fd752a3550464841a1b9f9fcc731b9935 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 2918/3458] s-nail: rebuild against OpenSSL

---
 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 0497dac816b8..cd63a895863b 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.9.22
-revision=1
+revision=2
 build_helper="qemu"
 hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
 conf_files="/etc/s-nail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 0ff6a7e8faaa87eb0eebfdc69c837745eed71ed9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 2919/3458] s3fs-fuse: rebuild against OpenSSL

---
 srcpkgs/s3fs-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b3..7ccbf82bcdff 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 's3fs-fuse'
 pkgname=s3fs-fuse
 version=1.86
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-openssl ac_cv_file__git=no"
 hostmakedepends="automake libtool pkg-config"

From bf722a81cce849d1fca673f5113b4810535a960f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 2920/3458] sane: rebuild against OpenSSL

---
 srcpkgs/sane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2da..35dac1cc846a 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -2,7 +2,7 @@
 pkgname=sane
 _gitlab_release_hash=8bf1cae2e1803aefab9e5331550e5d5d
 version=1.0.31
-revision=2
+revision=3
 wrksrc="sane-backends-${version}"
 build_style=gnu-configure
 configure_args="--disable-locking --enable-ipv6 --enable-pthread
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
  $(vopt_with snmp)"
 hostmakedepends="pkg-config"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"

From 3d819816f50010c050a6ebf7bfd48021445440c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 2921/3458] sbsigntool: rebuild against OpenSSL

---
 srcpkgs/sbsigntool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b271..6e6c32ddf3e7 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
 version=0.9.4
-revision=3
+revision=4
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=sbsigntools-$version
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"

From 49e509c281f518e8d3a9d36170e804672108b19e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 2922/3458] scrypt: rebuild against OpenSSL

---
 srcpkgs/scrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a7..8d313c2fff1b 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
 # Template file for 'scrypt'
 pkgname=scrypt
 version=1.3.1
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Scrypt key derivation function"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 49283bc66c9cd422695ffd628918d5874b43f260 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 2923/3458] seafile-libclient: rebuild against OpenSSL

---
 common/shlibs                      | 2 +-
 srcpkgs/seafile-libclient/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6803181f587c..c29f3a809e39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2554,7 +2554,7 @@ libm.so android-studio-3.0.1_1
 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
+libseafile.so.0 seafile-libclient-7.0.10_2
 libpodofo.so.0.9.7 libpodofo-0.9.7_2
 libIrcUtil.so.3 libcommuni-3.4.0_1
 libIrcCore.so.3 libcommuni-3.4.0_1
diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f9..db394362f188 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.10
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure

From bf5f7f8ec9e1250e2a64d8ede61c6f8a74050aec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 2924/3458] serf: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/serf/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c29f3a809e39..58e62b8f4bfa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1436,7 +1436,7 @@ libphorward.so.0 libphorward-0.17_1
 libusbip.so.0 libusbip-3.10_1
 libcpupower.so.0 libcpupower-3.10_1
 librsync.so.2 librsync-1.0.0_1
-libserf-1.so.1 serf-1.3.6_1
+libserf-1.so.1 serf-1.3.9_13
 libmpdclient.so.2 libmpdclient-0.28_1
 libmcrypt.so.4 libmcrypt-2.5.8_1
 libgraphite2.so.3 graphite-1.2.3_1
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c6..a9ac8a6d35e4 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
 # Template file for 'serf'
 pkgname=serf
 version=1.3.9
-revision=12
+revision=13
 build_style=scons
 make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
 short_desc="High-performance asynchronous HTTP client library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 30354cc0d707c5642014c3ef2bd8d848deaa28fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 2925/3458] sgfutils: rebuild against OpenSSL

---
 srcpkgs/sgfutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef569..95e84d22279b 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
 # Template file for 'sgfutils'
 pkgname=sgfutils
 version=0.25
-revision=6
+revision=7
 build_style=gnu-makefile
 short_desc="Collection of utilities to handle SGF files"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
 homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
 distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 depends="ImageMagick"

From b3028043eee1fde9d757ec60833d86c4d22ce83b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 2926/3458] signal-backup-decode: rebuild against OpenSSL

---
 srcpkgs/signal-backup-decode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f5269..119546b61ea7 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
 short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"

From ce0f722afba449c931f0915ecb7bef8bf43f6278 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 2927/3458] slrn: rebuild against OpenSSL

---
 srcpkgs/slrn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a0..95d398859836 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
 # Template file for 'slrn'
 pkgname=slrn
 version=1.0.3a
-revision=7
+revision=8
 wrksrc="${pkgname}-${version%a}"
 build_style=gnu-configure
 configure_args="--with-slrnpull --with-ssl
  --with-slanginc=${XBPS_CROSS_BASE}/usr/include
  --with-slanglib=${XBPS_CROSS_BASE}/usr/lib
  slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
 short_desc="Text mode Usenet news reader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"

From 48d5e0c2433eec46f138eb5710ed4b9d69ec66a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 2928/3458] slurm-wlm: rebuild against OpenSSL

---
 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 4d19c3ff5270..46fc8773520b 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 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
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
  ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
  freeipmi-devel"
 short_desc="Workload manager for Linux clusters of all sizes"

From a2192a4fe54d0acdcddbd2be9225dc9031adc887 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 2929/3458] so: rebuild against OpenSSL

---
 srcpkgs/so/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee3..b46c4846b914 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
 # Template file for 'so'
 pkgname=so
 version=0.4.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Terminal interface for Stack Overflow"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From fdd5b536eff6a6371b2db349d24aba905db0f7c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 2930/3458] socat: rebuild against OpenSSL

---
 srcpkgs/socat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 6c3d342b9e23..d4e0f0a9bbdb 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.4.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
  ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"

From cce657890427c1e9efc4a1153189676ac7d33a46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 2931/3458] spice-gtk: rebuild against OpenSSL

---
 common/shlibs              | 6 +++---
 srcpkgs/spice-gtk/template | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 58e62b8f4bfa..bc9a846e5b48 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1189,9 +1189,9 @@ libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
 libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
 libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
 libosinfo-1.0.so.0 libosinfo-0.2.0_1
-libspice-client-gtk-3.0.so.5 spice-gtk-0.33_1
-libspice-client-glib-2.0.so.8 spice-gtk-0.14_1
-libspice-controller.so.0 spice-gtk-0.14_1
+libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
+libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
+libspice-controller.so.0 spice-gtk-0.37_6
 libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b2..b61e4e8d0965 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.37
-revision=5
+revision=6
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dpulse=disabled -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
  spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
  phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 spice-gtk-devel_package() {
-	depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+	depends="gtk+3-devel pixman-devel openssl-devel opus-devel
 	 libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
 	 json-glib-devel gstreamer1-devel gst-plugins-base1-devel
 	 spice-protocol $(vopt_if gir libgirepository-devel)

From 4a3e61f6a29be7653b848935a42aad8ff38a4353 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 2932/3458] spice: rebuild against OpenSSL

---
 common/shlibs          | 2 +-
 srcpkgs/spice/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bc9a846e5b48..032dd431a105 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -805,7 +805,7 @@ libgtk-3.so.0 gtk+3-3.0.0_1
 libgailutil-3.so.0 gtk+3-3.0.0_1
 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1
 libcelt0.so.2 celt-0.11.1_1
-libspice-server.so.1 spice-0.6.4_1
+libspice-server.so.1 spice-0.14.3_3
 libbrasero-burn3.so.1 brasero-2.91.90_1
 libbrasero-media3.so.1 brasero-2.91.90_1
 libbrasero-utils3.so.1 brasero-2.91.90_1
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b955603..98559c4a5077 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
 # Template file for 'spice'
 pkgname=spice
 version=0.14.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-tunnel --disable-opengl --enable-smartcard
  --with-sasl --disable-static --enable-xinerama --disable-celt051"
 hostmakedepends="pkg-config python"
 makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
  libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
  nss-devel"
 short_desc="Implements the SPICE protocol"

From 28398e2c9466ed35aeb982195cb6ad52e541fe2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 2933/3458] spiped: rebuild against OpenSSL

---
 srcpkgs/spiped/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011a..765b0b00959a 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
 # Template file for 'spiped'
 pkgname=spiped
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Spiped secure pipe daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From c84d5ce5fc295771cfda6818b42772ee8de0703c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 2934/3458] spotify-tui: rebuild against OpenSSL

---
 srcpkgs/spotify-tui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e22..19593004ef06 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
 version=0.23.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
 short_desc="Spotify for the terminal"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 0d62922c14ac328607f96b3209db2ac010869f94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 2935/3458] spotifyd: rebuild against OpenSSL

---
 srcpkgs/spotifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af1..8dd5947d2690 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
 version=0.3.0
-revision=2
+revision=3
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
  $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
  $(vopt_if dbus dbus-devel)"
 short_desc="Spotify client running as a UNIX daemon"

From 9cd7e2e9b5ad0a36907b248161f6736a420099ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 2936/3458] sqlcipher: rebuild against OpenSSL

---
 common/shlibs              | 2 +-
 srcpkgs/sqlcipher/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 032dd431a105..3ea6d51b04fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2459,7 +2459,7 @@ libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
 libu2f-host.so.0 libu2f-host-1.1.10_5
 libu2f-server.so.0 libu2f-server-1.1.0_9
-libsqlcipher.so.0 sqlcipher-3.3.1_1
+libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.26 libgdal-3.0.4_9
 libosgViewer.so.131 osg-3.4.1_1
diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f560..74c98205efa7 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
 # Template file for 'sqlcipher'
 pkgname=sqlcipher
 version=4.3.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-tempstore=yes"
 hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
 short_desc="SQLite extension that provides transparent 256-bit AES encryption"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="BSD-3-Clause"

From 0602123eff7d437a3f99bee3175f0aee11627259 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 2937/3458] sqmail: rebuild against OpenSSL

---
 srcpkgs/sqmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d2..95b7c46373ca 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.10
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"

From c1abcfdb06b8176a465198e0be2316e8ef83bc06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 2938/3458] squid: rebuild against OpenSSL

---
 srcpkgs/squid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44d..deeed973659f 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
 version=4.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin

From 16409f19b8b0c73a6cd062f4c2b5d4627ee562b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 2939/3458] srain: rebuild against OpenSSL

---
 srcpkgs/srain/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50e..abf70431e843 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
 # Template file for 'srain'
 pkgname=srain
 version=1.1.3
-revision=1
+revision=2
 build_style=configure
 build_helper=gir
 configure_args="--prefix=/usr --sysconfdir=/etc"
 hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
  libsecret-devel libsoup-devel"
 short_desc="Modern IRC client written in GTK"
 maintainer="avoidr <avoidr@posteo.de>"

From af56534230fb6a07ff0b8de95c51d9977d22fe16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 2940/3458] sssd: rebuild against OpenSSL

---
 common/shlibs         | 18 +++++++++---------
 srcpkgs/sssd/template |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3ea6d51b04fd..c7984a103c80 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2712,15 +2712,15 @@ libcollection.so.4 ding-libs-0.5.0_1
 libref_array.so.1 ding-libs-0.5.0_1
 libbasicobjects.so.0 ding-libs-0.5.0_1
 libini_config.so.5 ding-libs-0.5.0_1
-libipa_hbac.so.0 sssd-1.13.4_1
-libsss_idmap.so.0 sssd-1.13.4_1
-libnss_sss.so.2 sssd-1.13.4_1
-libsss_nss_idmap.so.0 sssd-1.13.4_1
-libsss_simpleifp.so.0 sssd-1.13.4_1
-libsss_certmap.so.0 sssd-2.2.3_1
-libsss_util.so sssd-2.0.0_1
-libsss_crypt.so sssd-2.0.0_1
-libsss_debug.so sssd-2.0.0_1
+libipa_hbac.so.0 sssd-2.4.0_3
+libsss_idmap.so.0 sssd-2.4.0_3
+libnss_sss.so.2 sssd-2.4.0_3
+libsss_nss_idmap.so.0 sssd-2.4.0_3
+libsss_simpleifp.so.0 sssd-2.4.0_3
+libsss_certmap.so.0 sssd-2.4.0_3
+libsss_util.so sssd-2.4.0_3
+libsss_crypt.so sssd-2.4.0_3
+libsss_debug.so sssd-2.4.0_3
 libforms.so.2 xforms-1.2.4_2
 libflimage.so.2 xforms-1.2.4_2
 libutilspp.so.0 curlpp-0.7.3_2
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd01..61ead1c9e44e 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From a92181983c4de91ed289e48009421b995a8c0c26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 2941/3458] starship: switch to OpenSSL

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41df..9362f5664cba 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
 # Template file for 'starship'
 pkgname=starship
 version=0.50.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-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>"

From 7b6ee023b8d31de14dabf15e563525544f513206 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 2942/3458] stremio-shell: rebuild against OpenSSL

---
 srcpkgs/stremio-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f4..e26d066c062c 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'stremio-shell'
 pkgname=stremio-shell
 version=4.4.120
-revision=1
+revision=2
 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
 _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
 build_style=qmake

From fc144a8de1744602457f539c183dcabd282d7ade Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 2943/3458] stunnel: rebuild against OpenSSL

---
 srcpkgs/stunnel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d0..54ecff002a05 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
 # Template file for 'stunnel'
 pkgname=stunnel
 version=5.46
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 checkdepends="nmap procps-ng"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
 # One thing OpenBSD does that we don't do here is add a _stunnel user/group and
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
 # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem. EDIT: Well, it would break. Badly.
 # --

From 5e6dec6b22187a24cfc44c70b79faaf428f4fc8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 2944/3458] supertuxkart: rebuild against OpenSSL

---
 srcpkgs/supertuxkart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b7306..519bc615782d 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
 # Template file for 'supertuxkart'
 pkgname=supertuxkart
 version=1.2
-revision=2
+revision=3
 wrksrc="SuperTuxKart-${version}-src"
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
  libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
  libopenal-devel fribidi-devel libcurl-devel freetype-devel
  libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
 depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
 short_desc="Kart racing game featuring Tux and his friends"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f13b7cb2c81a31a986f3e5325f6596081c6f1b7c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 2945/3458] swi-prolog: rebuild against OpenSSL

---
 common/shlibs               | 2 +-
 srcpkgs/swi-prolog/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c7984a103c80..e8b04c29aaea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2846,7 +2846,7 @@ libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
 libbotan-2.so.16 botan-2.16.0_3
-libswipl.so.8 swi-prolog-8.0.0_1
+libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
 libpcre2-8.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8b..ed76890c0575 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
 # Template file for 'swi-prolog'
 pkgname=swi-prolog
 version=8.2.4
-revision=1
+revision=2
 wrksrc="swipl-${version}"
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config"
 makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
  unixodbc-devel zlib-devel pcre-devel libyaml-devel"
 short_desc="Comprehensive free Prolog environment"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 9754c28101bf6e9045ffac48d1251a24a418e763 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 2946/3458] swiften: rebuild against OpenSSL

---
 common/shlibs            | 2 +-
 srcpkgs/swiften/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e8b04c29aaea..fd47112223e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2572,7 +2572,7 @@ libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
 libglyphy.so.0 glyphy-0.0.20160104_1
-libSwiften.so.0 swiften-2.0_1
+libSwiften.so.0 swiften-4.0.3_2
 libfreehand-0.1.so.1 libfreehand-0.1.1_1
 libe-book-0.1.so.1 libe-book-0.1.2_1
 libOsi.so.1 CoinMP-1.8.3_1
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56ce..969ef1eb5d78 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
 # Template file for 'swiften'
 pkgname=swiften
 version=4.0.3
-revision=1
+revision=2
 wrksrc="swift-${version}"
 hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
  lua51-devel miniupnpc-devel sqlite-devel"
 short_desc="XMPP library for C++"
 maintainer="John Regan <john@jrjrtech.com>"

From 57d9612eefa4caa54f8d9ec8b879ee9cd444b8cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 2947/3458] swirc: rebuild against OpenSSL

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6a..8cb273d927dc 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
 # Template file for 'swirc'
 pkgname=swirc
 version=3.2.6
-revision=1
+revision=2
 build_style=configure
 make_install_args="PREFIX=/usr"
 hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
 checkdepends="cmocka-devel"
 short_desc="Curses ICB and IRC client"
 maintainer="Markus Uhlin <markus.uhlin@bredband.net>"

From 8f01a1094b45094f54df4835480a3682debd4d0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 2948/3458] sylpheed: rebuild against OpenSSL

---
 srcpkgs/sylpheed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef405..5df8312b53dc 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
 # Template file for 'sylpheed'
 pkgname=sylpheed
 version=3.7.0
-revision=6
+revision=7
 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"
+makedepends="libfl-devel zlib-devel openssl-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.0-or-later, LGPL-2.1-or-later"

From 2a6299fe26c95e6686f648303e1901239e39b6aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 2949/3458] synergy: rebuild against OpenSSL

---
 srcpkgs/synergy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d59213..0c4f3b4f130a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
 # Template file for 'synergy'
 pkgname=synergy
 version=1.13.0
-revision=1
+revision=2
 wrksrc="${pkgname}-core-${version}-stable"
 build_style=cmake
 configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"

From 8ebd75837c8f7515b197d1cf23ebcd64ad88a453 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 2950/3458] sysbench: rebuild against OpenSSL

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caaf..032f10234ea5 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
  --with-system-ck
  --with-system-luajit"
 hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
  postgresql-libs-devel zlib-devel"
 short_desc="Scriptable database and system performance benchmark"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From f568f9e57a2c059b80b4d601927fcb7987e1ecce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 2951/3458] sysdig: rebuild against OpenSSL

---
 srcpkgs/sysdig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f7938db8c2e3..f3600394d405 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=7
+revision=8
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=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
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
  tbb-devel zlib-devel"
 depends="dkms"
 short_desc="Open source system-level exploration and troubleshooting tool"

From 67bbdb9fe8a6aa4c56608dae72ae7da9a6f0a226 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 2952/3458] taisei: rebuild against OpenSSL

---
 srcpkgs/taisei/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e61..b47f44502eb2 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.1
-revision=3
+revision=4
 wrksrc="taisei-v${version}"
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"

From 904fb9b4b9baa4b6c2d09c8c06bc00d32a1d626e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 2953/3458] tarpaulin: rebuild against OpenSSL

---
 srcpkgs/tarpaulin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc5..56fceeb4c436 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
 version=0.14.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cargo
 hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From a554b428a0f88f98fc8e6046e2e37ba9696c6949 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 2954/3458] tarsnap: rebuild against OpenSSL

---
 srcpkgs/tarsnap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425e..7b64c4ccb1fe 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
 # Template file for 'tarsnap'
 pkgname=tarsnap
 version=1.0.39
-revision=1
+revision=2
 wrksrc=${pkgname}-autoconf-${version}
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
 depends="bzip2 xz"
 conf_files="/etc/tarsnap/tarsnap.conf"
 short_desc="An online encrypted backup service (client)"

From a40bd3997e6ab6a28d259786bc61c6009b78b201 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 2955/3458] tcpdump: rebuild against OpenSSL

---
 srcpkgs/tcpdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5f..1b55d262a2fa 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
 # Template file for 'tcpdump'
 pkgname=tcpdump
 version=4.99.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 checkdepends="perl"
 short_desc="A tool for network monitoring and data acquisition"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c45888d7ea799f2e7a9bc2fe5368040055db6b8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 2956/3458] tcpflow: rebuild against OpenSSL

---
 srcpkgs/tcpflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c76..decc27a0a27c 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
 # Template file for 'tcpflow'
 pkgname=tcpflow
 version=1.5.2
-revision=2
+revision=3
 wrksrc="$pkgname-$pkgname-$version"
 build_style=gnu-configure
 hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
 short_desc="Captures data transmitted as part of TCP connections"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"

From 57af33adc8eda4452f6ce73560a217b8558e2a62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 2957/3458] tealdeer: rebuild against OpenSSL

---
 srcpkgs/tealdeer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b40..72b8a1117c2d 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
 # Template file for 'tealdeer'
 pkgname=tealdeer
 version=1.4.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
 short_desc="Very fast implementation of tldr in Rust"
 maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"

From 3e44bb9fcd5cc723e9a99cbebd1bc51d1daef783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 2958/3458] tectonic: rebuild against OpenSSL

---
 srcpkgs/tectonic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aad..b339ce146d79 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.3.3
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
 short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="MIT"

From 2348651c5f65bf18bc63a05828745bef4d5034a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 2959/3458] telegram-desktop: rebuild against OpenSSL

---
 srcpkgs/telegram-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a61..5778f4c2d76a 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.5.1
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"

From 82776547a39a01be1f1d858fd120bc32a6d7defe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 2960/3458] telepathy-salut: switch to GnuTLS

---
 srcpkgs/telepathy-salut/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0ce..8c3d2dace29a 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
 # Template file for 'telepathy-salut'
 pkgname=telepathy-salut
 version=0.8.1
-revision=19
+revision=20
 lib32disabled=yes
 build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
 hostmakedepends="pkg-config python xmldiff glib-devel"
 makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
 depends="avahi"
 short_desc="Link-local XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d66e3e13a4290c1dba85fb566597153db3d268d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 2961/3458] testssl.sh: rebuild against OpenSSL

---
 srcpkgs/testssl.sh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1a..84b5510f5983 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
 # Template file for 'testssl.sh'
 pkgname=testssl.sh
 version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
 short_desc="Command line tool which checks a server for the support of TLS/SSL"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 3f0ce61af039fbc7621cf4b35bbb28dfa2ce24ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 2962/3458] tg_owt: rebuild against OpenSSL

---
 srcpkgs/tg_owt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 27a211f23820..fa0d55fc4aec 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
 version=0.0.0.1
-revision=1
+revision=2
 _commit=756fd0fb5f40ffb4244c675208e84de781f766f3
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF"
 hostmakedepends="pkg-config yasm protobuf"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
 depends="$makedepends"
 short_desc="WebRTC library for Telegram-desktop"

From db3c380cd7d104554d609b76d210b1874d4ac7a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 2963/3458] thc-hydra: rebuild against OpenSSL

---
 srcpkgs/thc-hydra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13c..1d4575336174 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
  postgresql-libs-devel libmariadbclient-devel libssh-devel"
 short_desc="Tool to guess/crack valid login/password pairs"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 337758545589dafad10e9371452032b85df8d0a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 2964/3458] thrift: rebuild against OpenSSL

---
 srcpkgs/thrift/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52a..9ac4bb481c30 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
 # Template file for 'thrift'
 pkgname=thrift
 version=0.13.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
 checkdepends="zlib-devel libevent-devel"
 short_desc="Apache Thrift compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 6931bb51fb66679ac386857857a1654f3b353afe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 2965/3458] tinc: rebuild against OpenSSL

---
 srcpkgs/tinc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14f..1252d5a17348 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.36
-revision=2
+revision=3
 build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 083160beae9994df9141b5fdf000105f0d0d08be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 2966/3458] tmplgen: rebuild against OpenSSL

---
 srcpkgs/tmplgen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd2..f352a5f3fd60 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
 # Template file for 'tmplgen'
 pkgname=tmplgen
 version=1.3.1
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Void Linux template generator for language-specific package managers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From ce5ef31a520fedd66a8608570e1b99f09862486c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 2967/3458] tnftp: rebuild against OpenSSL

---
 srcpkgs/tnftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c0..c0b75c164f25 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"

From 9ae6bb8d8e602e711a1c303a3577ecad3ec95f7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 2968/3458] tor: rebuild against OpenSSL

---
 srcpkgs/tor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d3772..3c3dffc63388 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.4.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 25941b77b600e7f6894534b05a2ef8c8951f1eab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 2969/3458] tpm-tools: rebuild against OpenSSL

---
 srcpkgs/tpm-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515dd..c581d1653452 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=6
+revision=7
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CPL"

From a97765cc80d511375a33b062eec5834340884007 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 2970/3458] transmission: rebuild against OpenSSL

---
 srcpkgs/transmission/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a3..5a61a0a2bdd3 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=3.00
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DENABLE_CLI=ON"
 hostmakedepends="autoconf automake intltool glib-devel

From 4b569709a258ad059d1bc1acabff2dd1abbf613a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 2971/3458] trousers: rebuild against OpenSSL

---
 common/shlibs             | 2 +-
 srcpkgs/trousers/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fd47112223e1..84061f8783ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2527,7 +2527,7 @@ libcryptmount.so.0 libpam-mount-2.15_1
 libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
-libtspi.so.1 trousers-0.3.13_1
+libtspi.so.1 trousers-0.3.14_11
 libflickcurl.so.0 flickcurl-1.26_1
 libpsiconv.so.6 psiconv-0.9.9_1
 libshout.so.3 libshout-2.4.1_1
diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d107..5d962adec91a 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
 # Template file for 'trousers'
 pkgname=trousers
 version=0.3.14
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-configure
 conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 short_desc="Trusted Computing Software Stack for the TPM"

From 5850319ee164f89906e83c7109bbec54cfec90e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 2972/3458] ttyd: rebuild against OpenSSL

---
 srcpkgs/ttyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e9..e870724e1d9a 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
 # Template file for 'ttyd'
 pkgname=ttyd
 version=1.6.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
  libuv-devel"
 short_desc="Share your terminal over the web"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 6d3da3c68dc60746ced2f8f499592f71dd5a17f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 2973/3458] turbovnc: rebuild against OpenSSL

---
 srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
 srcpkgs/turbovnc/template                   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch

diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e5..000000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig	2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h	2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
- 
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
- 
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b5..12db4b8c9c57 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
  -DTVNC_SYSTEMLIBS=ON"
 hostmakedepends="rsync"
 makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
 depends="perl"
 short_desc="Optimized version of TightVNC VNC client and server"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2cd45f766f3b8a5135028e8d3d7dfcf0a0f0508f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 2974/3458] tvheadend: rebuild against OpenSSL

---
 srcpkgs/tvheadend/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f4..230ecb592571 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
 # Template file for 'tvheadend'
 pkgname=tvheadend
 version=4.2.8
-revision=4
+revision=5
 wrksrc=tvheadend-${version}
 build_style=gnu-configure
 configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
 --disable-libx265_static --disable-libvpx_static --disable-libtheora_static
 --disable-libvorbis_static --disable-libfdkaac_static"
 hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
 short_desc="TV streaming server"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-only"

From 6511b32aa43093598955d13d277b91a77a2b002e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 2975/3458] ucspi-ssl: rebuild against OpenSSL

---
 srcpkgs/ucspi-ssl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d24..1f2c6c36793c 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
 pkgname=ucspi-ssl
 reverts="0.99e_3 0.99e_2 0.99e_1"
 version=0.11.6a
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
 build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
 depends="ucspi-tcp6"
 short_desc="Command-line tools for building SSL client-server applications"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
 
 ucspi-ssl-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
 	pkg_install() {
 		vinstall ucspissl.a 0644 usr/lib
 		vinstall ucspissl.h 0644 usr/include

From dcd738af3e96e2f6722b7f26c2c2b82ffe52d574 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 2976/3458] uftp: rebuild against OpenSSL

---
 srcpkgs/uftp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b586485..f0c6347e26e1 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
 # Template file for 'uftp'
 pkgname=uftp
 version=5.0
-revision=1
+revision=2
 build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Encrypted multicast file transfer program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 3eb3f2cad2fcfa87567b1afaaa28b834b83f2bf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 2977/3458] uget: rebuild against OpenSSL

---
 srcpkgs/uget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34a..33907bbd0540 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"

From 49adb440b3cffbb6bcfe3a68041c86f8cc695356 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 2978/3458] umurmur: rebuild against OpenSSL

---
 srcpkgs/umurmur/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c3..e3046ab968e6 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
 # Template file for 'umurmur'
 pkgname=umurmur
 version=0.2.19
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shmapi --with-ssl=openssl"
 conf_files="/etc/umurmur/umurmur.conf"
 hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
 short_desc="Minimalistic Mumble server"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-clause"

From e7a84fd7718d1aaa3a4dab8fd9dd29d6513f9e95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 2979/3458] vanitygen: rebuild against OpenSSL

---
 srcpkgs/vanitygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a92..8fb4fa5ca443 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
 # Template file for 'vanitygen'
 pkgname=vanitygen
 version=1.53
-revision=1
+revision=2
 wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Bitcoin vanity address generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"

From 797212ded08215fbe07e7c9813e2d35ea16ac655 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 2980/3458] vboot-utils: rebuild against OpenSSL

---
 srcpkgs/vboot-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a9..591697d20cf4 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
 # Template file for 'vboot-utils'
 pkgname=vboot-utils
 version=89.13729
-revision=1
+revision=2
 _version=${version/./-}
 archs="x86_64* i686* aarch64* arm*"
 create_wrksrc=yes
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
 short_desc="Verified boot kernel utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"

From 6c0cb28cdaac6bc27b9b97b7b236839e782f7ad7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 2981/3458] vde2: rebuild against OpenSSL

---
 common/shlibs         | 8 ++++----
 srcpkgs/vde2/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 84061f8783ea..d81852ebff1d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1111,10 +1111,10 @@ libminiupnpc.so.17 miniupnpc-2.1_1
 libxbps.so.5 libxbps-0.59.1_4
 libatf-c.so.1 atf-libs-0.21_1
 libatf-c++.so.2 atf-libs-0.21_1
-libvdeplug.so.3 libvde2-2.3.2_1
-libvdemgmt.so.0 libvde2-2.3.2_1
-libvdehist.so.0 libvde2-2.3.2_1
-libvdesnmp.so.0 libvde2-2.3.2_1
+libvdeplug.so.3 libvde2-2.3.2_23
+libvdemgmt.so.0 libvde2-2.3.2_23
+libvdehist.so.0 libvde2-2.3.2_23
+libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70ac..5d0efce366ab 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
 # Template file for 'vde2'
 pkgname=vde2
 version=2.3.2
-revision=22
+revision=23
 build_style=gnu-configure
 configure_args="--disable-static --enable-experimental
  --disable-python --enable-kernel-switch"
 hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
 conf_files="
 	/etc/vde2/vdecmd
 	/etc/vde2/libvdemgmt/asyncrecv.rc

From 0a3911fdd3ce3a5509873bf79d4604e3ad91e7fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 2982/3458] virtualbox-ose: rebuild against OpenSSL

---
 srcpkgs/virtualbox-ose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5b..c56c5dc9ff1d 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.18
-revision=2
+revision=3
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 747b3f7784fb1ad27c06113b39ce4a68558017df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 2983/3458] virtuoso: rebuild against OpenSSL

---
 srcpkgs/virtuoso/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcdf..77ea433a1073 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
 # Template file for 'virtuoso'
 pkgname=virtuoso
 version=7.2.5.1
-revision=2
+revision=3
 archs="x86_64* aarch64* ppc64le*"
 wrksrc="${pkgname}-opensource-${version}"
 build_style=gnu-configure
 configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2"

From d289f7bb6835f2e1d52b296bc092971fad53b8b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 2984/3458] volta: rebuild against OpenSSL

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d4..d6b4f67774a2 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
 # Template file for 'volta'
 pkgname=volta
 version=1.0.2
-revision=1
+revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="JavaScript tool version sync helper"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"

From 90bf31199fbdb6dc7f1836a9cb1e838dbe455bb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 2985/3458] vpn-ws: rebuild against OpenSSL

---
 srcpkgs/vpn-ws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34e..498ca5775a82 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
 # Template file for 'vpn-ws'
 pkgname=vpn-ws
 version=0.2
-revision=6
+revision=7
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="VPN system over webhooks"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From dd3088bf4829d2a97f3469c26619212fd0de0134 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 2986/3458] vpnc: switch to OpenSSL

---
 srcpkgs/vpnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cde..80d9edd464bc 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
 # Template file for 'vpnc'
 pkgname=vpnc
 version=0.5.3
-revision=8
+revision=9
 _githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
 wrksrc="vpnc-$_githash"
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
 make_build_args="SBINDIR=/usr/bin"
 make_check_target=test
 hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
 depends="net-tools vpnc-scripts"
 short_desc="Client for cisco vpn concentrator"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 07110c709d1e7984ddb8bac07835eab4e178187d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 2987/3458] vsftpd: rebuild against OpenSSL

---
 srcpkgs/vsftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c566300075..866fa5db3054 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
 # Template file for 'vsftpd'
 pkgname=vsftpd
 version=3.0.3
-revision=13
+revision=14
 build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
 short_desc="FTP daemon with focus on security"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"

From 45f9540d69da4e6e30d8ad9fcf0439b00c669f04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 2988/3458] w3m: rebuild against OpenSSL

---
 srcpkgs/w3m/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f3..8befde6048b9 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3+git20210102
-revision=1
+revision=2
 wrksrc="${pkgname}-${version/+/-}"
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
  --with-nkf=/usr/bin/nkf
  --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
 hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
  libX11-devel"
 short_desc="Text-based Web browser and pager (with Debian patches)"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"

From 03522bbf6894edca72c912960b6afaf089b164f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 2989/3458] watchman: rebuild against OpenSSL

---
 srcpkgs/watchman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96a..a7effa00bcb8 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
 # Template file for 'watchman'
 pkgname=watchman
 version=4.9.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-statedir --enable-lenient"
 hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
 short_desc="Watches files and records, or triggers actions, when they change"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 6ad2e3b7393c36976a4f7ca03c4110a58cd0a738 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 2990/3458] websocat: rebuild against OpenSSL

and actually enable ssl support
---
 srcpkgs/websocat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641b..120039714059 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
 # Template file for 'websocat'
 pkgname=websocat
 version=1.6.0
-revision=1
+revision=2
 build_style=cargo
+configure_args="--features=ssl"
 hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
 short_desc="Netcat, curl and socat for WebSockets"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From 5c46f427dcc7c708f59b35286d25581d8cd8b6a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 2991/3458] wesnoth: rebuild against OpenSSL

---
 srcpkgs/wesnoth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e554..7b9b5bd64a0b 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.14.13
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
 makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
  SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
 depends="desktop-file-utils"
 short_desc="Turn-based fantasy strategy game"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"

From 5da009c91f5c7c836ba1a71cc71d6ad0693bbfe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 2992/3458] wget: rebuild against OpenSSL

---
 srcpkgs/wget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f14..346f8a411742 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
 # Template file for 'wget'
 pkgname=wget
 version=1.21.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
 conf_files="/etc/wgetrc"
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
 depends="ca-certificates"
 checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
 short_desc="GNU wget download utility"

From 358f2a958a54ff65549b435bbfced48eddb7f6f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 2993/3458] wpa_supplicant: rebuild against OpenSSL

---
 srcpkgs/wpa_supplicant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f15..064fd6f71f5d 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=4
+revision=5
 build_wrksrc="$pkgname"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
 patch_args="-Np1"
 
 hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
 build_options="dbus readline"
 build_options_default="dbus readline"
 conf_files="/etc/${pkgname}/${pkgname}.conf"

From 19b70dfcf57f0f0251a0b8db3c97a8df08078570 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 2994/3458] wrk: rebuild against OpenSSL

---
 srcpkgs/wrk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b51..b2deb5e0ffb8 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
 # Template file for 'wrk'
 pkgname=wrk
 version=4.1.0
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
 hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
 short_desc="Modern HTTP benchmarking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

From 969d3a3c975d2dce783f2f361409e1fec856b1cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 2995/3458] wvstreams: rebuild against OpenSSL

---
 common/shlibs              | 8 ++++----
 srcpkgs/wvstreams/template | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d81852ebff1d..dfd12eae0d24 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2104,10 +2104,10 @@ 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
-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
-libwvstreams.so.4.6 wvstreams-4.6.1_1
+libuniconf.so.4.6 wvstreams-4.6.1_20
+libwvbase.so.4.6 wvstreams-4.6.1_20
+libwvutils.so.4.6 wvstreams-4.6.1_20
+libwvstreams.so.4.6 wvstreams-4.6.1_20
 libespeak-ng.so.1 libespeak-ng-1.50_1
 libKF5Plotting.so.5 kplotting-5.26.0_1
 libpgf.so.6 libpgf-6.14.12_1
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2da..068c21944270 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=19
+revision=20
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
 distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
 conf_files="/etc/uniconf.conf"

From ce97014b22c4130d3448e6dc5f7356807bb6bc37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 2996/3458] x11vnc: rebuild against OpenSSL

---
 srcpkgs/x11vnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436d..4b8ff04a9ebe 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
 # Template file for 'x11vnc'
 pkgname=x11vnc
 version=0.9.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
 short_desc="VNC server for real X displays"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"

From 67334f48b7ebdbe469ef1cac3f5328ca30c6fbf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 2997/3458] xar: rebuild against OpenSSL

---
 common/shlibs        | 2 +-
 srcpkgs/xar/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dfd12eae0d24..ab37899442af 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1118,7 +1118,7 @@ libvdesnmp.so.0 libvde2-2.3.2_23
 libsbc.so.1 sbc-1.0_1
 libecryptfs.so.1 libecryptfs-111_9
 libnuma.so.1 libnuma-2.0.7_1
-libxar.so.1 xar-1.5.2_1
+libxar.so.1 xar-1.6.1_9
 libmikmod.so.3 libmikmod-3.1.12_1
 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1
 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1
diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb79..79117d197a99 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.6.1
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
 short_desc="Archiver for the eXtensible ARchiver format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From fe7fd698820bc9deaa8103109300999233f4b092 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 2998/3458] xarcan: rebuild against OpenSSL

---
 srcpkgs/xarcan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60f..222f434d0bc0 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
 # Template file for 'xarcan'
 pkgname=xarcan
 version=0.6.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
  xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"

From 160ba0b5cb21f4b050d1a2654a97184829227dc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 2999/3458] xca: rebuild against OpenSSL

---
 srcpkgs/xca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c4214..e4ee1de46871 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
 # Template file for 'xca'
 pkgname=xca
 version=2.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
 depends="qt5-plugin-sqlite"
 short_desc="X Certificate and Key Management"
 maintainer="Denis Revin <denis.revin@gmail.com>"

From 170f90e31ca80618e2c7a2a58bb7a2ffecd2fd1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 3000/3458] xen: change to OpenSSL

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0e..092460ea73e5 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
 hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
  ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
 depends="bridge-utils perl xen-hypervisor"
 short_desc="Xen hypervisor utilities"

From 58b40bb1b485209203440ac071d2af45182f5331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 3001/3458] xmlrpc-c: rebuild against OpenSSL

---
 common/shlibs             | 32 ++++++++++++++++----------------
 srcpkgs/xmlrpc-c/template |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ab37899442af..abf3058da097 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1767,22 +1767,22 @@ libpython3.so python3-3.9.2_2
 libpython3.9.so.1.0 python3-3.9.2_2
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
-libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
-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.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
-libxmlrpc_client++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util++.so.8 xmlrpc-c-1.39.11_1
-libxmlrpc_abyss++.so.8 xmlrpc-c-1.39.11_1
+libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_packetsocket.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util.so.4 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_cpp.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss++.so.8 xmlrpc-c-1.51.06_2
 libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_6
 libnetpbm.so.11 libnetpbm-10.66.03_2
 libid3.so id3lib-3.8.3_1
diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ece..911072087594 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlrpc-c'
 pkgname=xmlrpc-c
 version=1.51.06
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
  --disable-libwww-client --disable-wininet-client"

From b843b73968f3877b2daf6e93ec1db512f44af144 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 3002/3458] xmlsec1: rebuild against OpenSSL

---
 common/shlibs            | 10 +++++-----
 srcpkgs/xmlsec1/template |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index abf3058da097..ee9383d9b28b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1557,9 +1557,9 @@ libaqhbci.so.24 aqbanking-5.7.8_1
 libaqofxconnect.so.7 aqbanking-5.0.25_1
 libaqebics.so.0 aqbanking-5.0.25_1
 libaqbankingpp.so.0 aqbanking-5.0.25_1
-libxmlsec1.so.1 xmlsec1-1.2.19_1
-libxmlsec1-nss.so.1 xmlsec1-1.2.28_2
-libxmlsec1-openssl.so.1 xmlsec1-1.2.30_1
+libxmlsec1.so.1 xmlsec1-1.2.31_2
+libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
+libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
 libcheck.so.0 check-0.9.12_1
 liblxc.so.1 liblxc-4.0.6_2
 libtcmalloc.so.4 gperftools-2.1_1
@@ -1755,8 +1755,8 @@ libMrm.so.4 motif-2.3.8_1
 libUil.so.4 motif-2.3.8_1
 libgtest.so gtest-1.7.0_1
 libgtest_main.so gtest-1.7.0_1
-libxmlsec1-gcrypt.so.1 xmlsec1-1.2.20_2
-libxmlsec1-gnutls.so.1 xmlsec1-1.2.20_2
+libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
+libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
 libefivar.so.1 libefivar-31_1
 libefiboot.so.1 libefivar-31_1
 libportaudio.so.2 portaudio-19.20140130_1
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27fd..d564b5142ca1 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
 version=1.2.31
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel

From 3d05f1a18d5959989772a4d53b811fb53807074f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 3003/3458] xorg-server: rebuild against OpenSSL

---
 srcpkgs/xorg-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e84..780738711835 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.10
-revision=3
+revision=4
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
 hostmakedepends="pkg-config wayland-devel xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel pixman-devel wayland-devel wayland-protocols
  xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
  xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"

From 718e5870ff1e4758a218032a66649ac47c62d6e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 3004/3458] yara: rebuild against OpenSSL

---
 common/shlibs         | 2 +-
 srcpkgs/yara/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ee9383d9b28b..f34c39bb367f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2998,7 +2998,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
 libsuperlu.so.5 superlu-5.2.1_1
 libgosu.so.0 gosu-0.12.0_1
-libyara.so.4 libyara-4.0.0_1
+libyara.so.4 libyara-4.0.5_2
 libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f82..668ab97b1a7d 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
 # Template file for 'yara'
 pkgname=yara
 version=4.0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
 short_desc="Pattern matching swiss knife for malware researchers"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From c517eb9e9591dccfb65bff22072f9ad8ed502841 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 3005/3458] ympd: rebuild against OpenSSL

---
 srcpkgs/ympd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2a..14437beb5384 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
 # Template file for 'ympd'
 pkgname=ympd
 version=1.3.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
 short_desc="Standalone MPD Web GUI written in C"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"

From aec249204d0fd1bf56b3d695de3a16d2e7ba702d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 3006/3458] yubico-piv-tool: rebuild against OpenSSL

---
 common/shlibs                    | 4 ++--
 srcpkgs/yubico-piv-tool/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f34c39bb367f..409bf2228746 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3148,8 +3148,8 @@ 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
+libykpiv.so.1 libykpiv-2.1.1_2
+libykcs11.so.1 libykcs11-2.1.1_2
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
 libqmobipocket.so.2 libqmobipocket-17.04.3_1
 libgloox.so.17 gloox-1.0.20_1
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b368..c660d62461af 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
 
 pkgname=yubico-piv-tool
 version=2.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
 short_desc="Yubikey PIV management tool"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="BSD-2-Clause"

From d5765d79bd42ec8b6271ce4cf0f380d43d4beb87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 3007/3458] zbackup: rebuild against OpenSSL

---
 srcpkgs/zbackup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77c..ce1190b62f00 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
 # Template file for 'zbackup'
 pkgname=zbackup
 version=1.4.4
-revision=21
+revision=22
 build_style=cmake
 hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
 short_desc="Versatile deduplicating backup tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 143458e53335446974178540dd52a6fad982ce19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 3008/3458] zchunk: rebuild against OpenSSL

---
 common/shlibs           | 2 +-
 srcpkgs/zchunk/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 409bf2228746..554b3e3ed429 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,7 +3524,7 @@ libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7
 libgetdns_ext_uv.so.10 getdns-1.5.1_7
-libzck.so.1 zchunk-1.0.2_2
+libzck.so.1 zchunk-1.1.9_3
 librec.so.1 librec1-1.8_1
 libfixposix.so.3 libfixposix-0.4.3_1
 libgerv.so.1 gerbv-2.6.2_1
diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef0..b56a3aba18bd 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
 version=1.1.9
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
 
 zchunk-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+	depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"

From 0b507102adbf6914ff7c2c1d3cad825054dff2a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 3009/3458] zeek: rebuild against OpenSSL

---
 common/shlibs         | 10 +++++-----
 srcpkgs/zeek/template |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 554b3e3ed429..926e19dab809 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,11 +3532,11 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
 libupstart.so.1 libupstart-1.13.3_1
 librtas.so.2 librtas-2.0.2_1
 librtasevent.so.2 librtas-2.0.2_1
-libbroker.so.2 zeek-3.1.1_1
-libcaf_core.so.0.17.6 zeek-3.2.0_1
-libcaf_io.so.0.17.6 zeek-3.2.0_1
-libcaf_openssl.so.0.17.6 zeek-3.2.0_1
-libbinpac.so.0 zeek-3.1.1_1
+libbroker.so.2 zeek-3.2.4_2
+libcaf_core.so.0.17.6 zeek-3.2.4_2
+libcaf_io.so.0.17.6 zeek-3.2.4_2
+libcaf_openssl.so.0.17.6 zeek-3.2.4_2
+libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libuhd.so.4.0.0 uhd-4.0.0.0_1
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b9..408b3fe11407 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
 # Template file for 'zeek'
 pkgname=zeek
 version=3.2.4
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
  bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"

From cb1b406a67040b31a0c31897b1b586782acc10fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 3010/3458] zeroinstall: rebuild against OpenSSL

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e6..514e22f76554 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"
 hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
 depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
 short_desc="Cross-distribution software installation system"
 maintainer="mobinmob <mobinmob@disroot.org>"

From d452593edaf520cc9ea145940d24f96a357577f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 3011/3458] zfs: rebuild against OpenSSL

---
 common/shlibs        | 12 ++++++------
 srcpkgs/zfs/template |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 926e19dab809..a911b3892cbc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3815,12 +3815,12 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1
 libtss2-rc.so.0 tpm2-tss-2.3.1_1
 libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
 libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
-libzfsbootenv.so.1 zfs-2.0.0_1
-libzfs.so.4 zfs-2.0.0_1
-libuutil.so.3 zfs-2.0.0_1
-libzpool.so.4 zfs-2.0.0_1
-libzfs_core.so.3 zfs-2.0.0_1
-libnvpair.so.3 zfs-2.0.0_1
+libzfsbootenv.so.1 zfs-2.0.3_2
+libzfs.so.4 zfs-2.0.3_2
+libuutil.so.3 zfs-2.0.3_2
+libzpool.so.4 zfs-2.0.3_2
+libzfs_core.so.3 zfs-2.0.3_2
+libnvpair.so.3 zfs-2.0.3_2
 libgmio.so gmio-0.4.1_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1d..1f5c4809fcef 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.0.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

From da4200833df5dcfebb676fb3aebc07e7f23c23bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 3012/3458] znc: rebuild against OpenSSL

---
 srcpkgs/znc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e01..02ca0634bb25 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --enable-python
@@ -10,7 +10,7 @@ configure_args="
  --enable-cyrus
  --with-tcl=$XBPS_CROSS_BASE/usr/lib"
 hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
  icu-devel zlib-devel perl"
 short_desc="Advanced IRC Bouncer"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 0f0b7392681ce35506d0f579901d4053f237cf8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 3013/3458] gtklp: rebuild against OpenSSL

---
 srcpkgs/gtklp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b4464608..8b210cac2b7e 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -1,11 +1,11 @@
 # Template file for 'gtklp'
 pkgname=gtklp
 version=1.3.4
-revision=1
+revision=2
 build_style="gnu-configure"
 configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
 hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
 maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"

From ffa7c106c381ccddd2ac6682e6e29002a45cffae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:18:42 +0100
Subject: [PATCH 3014/3458] gemserv: update checksum

---
 srcpkgs/gemserv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index c1dfb792740d..89a3d17e7917 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="gemini://80h.dev/projects/gemserv/"
 distfiles="https://git.sr.ht/~int80h/gemserv/archive/v${version}.tar.gz"
-checksum=0d255a5a93275c29fbe4d66dd069e499902ccd6c04983175b90b03725267295c
+checksum=7aeb5edc8af6ebefc2331aebc0c360798711c2fb16ee9cbde8c5c4f9502c491f
 system_accounts="_gemserv"
 
 post_install() {

From 977bf3085960675b0200138ecb648b56e4fa5b4b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:44 +0100
Subject: [PATCH 3015/3458] linux4.4: change to openssl

---
 srcpkgs/linux4.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index d85511fe55d3..5b4d2e213bd5 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 3cd95d08a6688d7b26fa9e8e65e4098edd86951b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:44 +0100
Subject: [PATCH 3016/3458] linux5.11: change to openssl

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 0c01d11ba9ea..886c3af06c26 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -25,7 +25,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 2280dc75a1f784a3e924e8319ffc67f805098c13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:44 +0100
Subject: [PATCH 3017/3458] linux5.4: change to openssl

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 5defb48639d5..b5c6af89bf70 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 6e7b927d7c623e115c07b3e5d18c853261bcf44a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:44 +0100
Subject: [PATCH 3018/3458] linux5.10: change to openssl

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 57f51c95acaa..fd88817cc57f 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -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 pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From bf3d4a95fb4407a07365376892b79e92ebfc2984 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:45 +0100
Subject: [PATCH 3019/3458] linux4.19: change to openssl

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 7a5d82851bc6..bf8a7fafa6be 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
 
 archs="i686* x86_64* arm* aarch64* ppc*"
 hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From c7f112efda144ac3fb3bf81ed42053cec1c5cb62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:45 +0100
Subject: [PATCH 3020/3458] linux4.14: change to openssl

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 808bc4343609..3e4506bc79bf 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage
  gmp-devel libmpc-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in

From 0ab3cc0c43f22a6df74118f1e50ea8368992c8b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:45 +0100
Subject: [PATCH 3021/3458] pinephone-kernel: change to openssl

---
 srcpkgs/pinephone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index b201e6b993c5..73631552a9ba 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -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 pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 4659f3976f9b98d984f7084a3d72e9915ddf89d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:45 +0100
Subject: [PATCH 3022/3458] pinebookpro-kernel: change to openssl

---
 srcpkgs/pinebookpro-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 0d0c0e66604f..dfdf391d0ae7 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"

From 7df60cafb24aacf8f3ede745547d0cb4aec8f23b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:45 +0100
Subject: [PATCH 3023/3458] ci20-kernel: change to openssl

---
 srcpkgs/ci20-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd118477..da1685b6600f 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
 noshlibprovides=yes
 
 archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From def33719eac2b7eb6d2695e329e22d5dc0ac0335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:45 +0100
Subject: [PATCH 3024/3458] sun7i-kernel: change to openssl

---
 srcpkgs/sun7i-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index e8d90d530157..3d7ae0956875 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -29,7 +29,7 @@ skip_extraction="
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 patch_args=-Np1

From 99561e9b664466c6e4ab19f64d51dec141002de8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:45 +0100
Subject: [PATCH 3025/3458] rpi-kernel: change to openssl

---
 srcpkgs/rpi-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc05..1fe4e2477e1f 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
 
 # RPi, RPi2, RPi3
 archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From 76258146cd7c8738de3d2855b5689edd4bad1332 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Mar 2021 22:24:46 +0100
Subject: [PATCH 3026/3458] beaglebone-kernel: change to openssl

---
 srcpkgs/beaglebone-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cbe..b36c9b36eb53 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
 makedepends="ncurses-devel"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.

From fa4e7b85abc96187c2f629db84cff9b46e794268 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 5 Mar 2021 22:26:29 +0100
Subject: [PATCH 3027/3458] gftp: fetch from sources.voidlinux.org

---
 srcpkgs/gftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index bdbad8e9c2bb..2ce0a9e872f4 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -9,5 +9,5 @@ short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
 license="GPL-2"
 homepage="https://www.gftp.org"
-distfiles="https://www.gftp.org/gftp-${version}.tar.bz2"
+distfiles="https://sources.voidlinux.org/gftp-${version}/gftp-${version}.tar.bz2"
 checksum=5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd

From 793306532bba893b6399cbdae096eee3148d5d4d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 6 Mar 2021 00:25:13 +0100
Subject: [PATCH 3028/3458] kicad: mark cross builds broken

---
 srcpkgs/kicad/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index d7cc9e2ba7a4..6a43af96cd77 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -31,4 +31,5 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxPython4"
 	configure_args+=" -DPYTHON_DEST=/${py3_sitelib}
 	-DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
+	broken="https://build.voidlinux.org/builders/armv7l_builder/builds/31151/steps/shell_3/logs/stdio"
 fi

From 28aef90fe0b8afc481e2d7a6d70218de96133429 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 6 Mar 2021 00:50:16 +0100
Subject: [PATCH 3029/3458] libgdal: add upstream patch

---
 ...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch

diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
new file mode 100644
index 000000000000..3fe5d7fda9eb
--- /dev/null
+++ b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
@@ -0,0 +1,53 @@
+From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 5 Oct 2020 12:11:52 +0200
+Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
+
+---
+ gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
+ gdal/frmts/jpeg2000/jpeg2000dataset.cpp  |  2 +-
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
+index 10a4f96f0ee..ebcac4010ce 100644
+--- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig
++++ frmts/jpeg2000/jpeg2000_vsil_io.cpp
+@@ -94,13 +94,24 @@
+ * File stream object.
+ \******************************************************************************/
+
++#if defined(PRIjas_seqent)
++static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
++#else
+ static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
++#endif
+ {
+     jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
+     return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
+ }
+
++#if defined(JAS_INCLUDE_JP2_CODEC)
++// Jasper 2.0.21
++static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
++#elif defined(PRIjas_seqent)
++static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
++#else
+ static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
++#endif
+ {
+     jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
+     return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
+
+diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
+index a5a6b258ed9..bd1e7763186 100644
+--- frmts/jpeg2000/jpeg2000dataset.cpp
++++ frmts/jpeg2000/jpeg2000dataset.cpp
+@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
+         for ( iBand = 0; iBand < nBands; iBand++ )
+         {
+             JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
+-            if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
++            if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
+                 poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
+             {
+                 CPLError(CE_Failure, CPLE_AppDefined,

From 5443005b404770001e12797548681673683f09e6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 6 Mar 2021 01:01:44 +0100
Subject: [PATCH 3030/3458] libgdal: add another patch

---
 ...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch

diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
new file mode 100644
index 000000000000..40d0b4ec529b
--- /dev/null
+++ b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
@@ -0,0 +1,31 @@
+From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 10 Aug 2020 17:26:53 +0200
+Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
+
+---
+ gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
+index 3e668ffe503..2d3f4e46876 100644
+--- frmts/jpeg2000/jpeg2000dataset.cpp
++++ frmts/jpeg2000/jpeg2000dataset.cpp
+@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
+     /* the JP2 boxes match the ones of the code stream */
+     if (nBands != 0)
+     {
+-        if (nBands != jas_image_numcmpts( psImage ))
++        if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
+         {
+             CPLError(CE_Failure, CPLE_AppDefined,
+                      "The number of components indicated in the IHDR box (%d) mismatch "
+@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
+ 
+ {
+     int         iFormat;
+-    char        *pszFormatName = nullptr;
++    const char *pszFormatName = nullptr;
+ 
+     if (!Identify(poOpenInfo))
+         return nullptr;

From 94b4f81db20d48d9ebc841637767f9dc089688f4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 6 Mar 2021 01:46:38 +0100
Subject: [PATCH 3031/3458] monero-gui: nocross for now

---
 srcpkgs/monero-gui/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 40ee7f6bce1c..f6e08f8bef82 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -35,6 +35,8 @@ checksum="3a924b4e08b557d93337a0c05826a9fa95e5cf8c503aff0ecb3676be45db1d14
 skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
  ${_quirc_gitrev}.tar.gz"
 
+nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/31154/steps/shell_3/logs/stdio"
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	CFLAGS+=" -latomic"

From b6652157c3ecb236559ed8872fbf8b20c32fdaf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 22:23:17 -0300
Subject: [PATCH 3032/3458] kicad: fix cross build.

Thanks sgn for pointing me at the build helper.
---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 6a43af96cd77..4b10f28927e6 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -3,11 +3,12 @@ pkgname=kicad
 version=5.1.9
 revision=2
 build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
  -DKICAD_SCRIPTING_ACTION_MENU=ON  -DBUILD_GITHUB_PLUGIN=ON -DKICAD_USE_OCE=OFF
  -DKICAD_SCRIPTING_PYTHON3=ON -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON
- -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+ -DwxWidgets_CONFIG_EXECUTABLE=$WX_CONFIG
  -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
 hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
 makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
@@ -31,5 +32,4 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxPython4"
 	configure_args+=" -DPYTHON_DEST=/${py3_sitelib}
 	-DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
-	broken="https://build.voidlinux.org/builders/armv7l_builder/builds/31151/steps/shell_3/logs/stdio"
 fi

From d1a3f5308d1455c19bab022dc9e513f0ebd303cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 23:54:05 -0300
Subject: [PATCH 3033/3458] retroshare: fix noatomic8 build.

---
 srcpkgs/retroshare/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 9e1084749f4b..6f95e8937616 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -18,6 +18,10 @@ homepage="https://retroshare.cc"
 distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz"
 checksum=901a1d1f282e04118fbe0e24190355b4a8f355a806cc5448738b1d691b46f5d5
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 post_patch() {
 	# upnputil.c includes a C++ header, so make sure qmake recognizes it as C++
 	mv libretroshare/src/upnp/upnputil.{c,cc}

From be0b8704a9aca1c83d0aad7a97bf919570ec365a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 00:12:58 -0300
Subject: [PATCH 3034/3458] seafile-libclient: broken for now.

---
 srcpkgs/seafile-libclient/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index db394362f188..bb17d2347fbe 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,3 +1,5 @@
+broken="https://build.voidlinux.org/builders/armv7l_builder/builds/31155/steps/shell_3/logs/stdio"
+
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient

From 3f6c920d96a69502a6313b95f2f3482313e58ce2 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 6 Mar 2021 13:00:27 +1100
Subject: [PATCH 3035/3458] monero-gui: fix cross.

We moved to ninja cmake generator so generate_translation_headers was not
being generated properly as a makefile. Moving to ninja for the
building command solves this issue.
---
 srcpkgs/monero-gui/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index f6e08f8bef82..6ed3b0f5ce6a 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -35,8 +35,6 @@ checksum="3a924b4e08b557d93337a0c05826a9fa95e5cf8c503aff0ecb3676be45db1d14
 skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz
  ${_quirc_gitrev}.tar.gz"
 
-nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/31154/steps/shell_3/logs/stdio"
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	CFLAGS+=" -latomic"
@@ -58,8 +56,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" -DARCH=default" ;;
 esac
 
-
-
 post_extract() {
 	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero
 	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson
@@ -95,7 +91,7 @@ pre_build() {
 		# but is not included in the binary package. It thus needs to be
 		# built for the host
 		CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \
-			make -C build/monero ${makejobs} generate_translations_header
+			ninja -C build ${makejobs} generate_translations_header
 
 	fi
 	make ${makejobs} -C src/zxcvbn-c

From df0dedb6f8618a048435df6f5c2b7b62baa375e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 00:37:41 -0300
Subject: [PATCH 3036/3458] seafile-libclient: remove broken.

Added in 1f26ec6bbf60af0fdd10cf124bde4738325743b0, but couldn't
reproduce issue locally.
---
 srcpkgs/seafile-libclient/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index bb17d2347fbe..db394362f188 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,5 +1,3 @@
-broken="https://build.voidlinux.org/builders/armv7l_builder/builds/31155/steps/shell_3/logs/stdio"
-
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient

From 848557da171157667742597f830e54083caa7f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 02:51:42 -0300
Subject: [PATCH 3037/3458] amp: pick up cleaned up depends.

Wasn't revbumped in 9e48fbe8289d9420c8e2210feaedb836a9e73a96.
---
 srcpkgs/amp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index f62a206c1fd5..e942e32c0c32 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -1,7 +1,7 @@
 # Template file for 'amp'
 pkgname=amp
 version=0.6.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="cmake git python3"
 makedepends="libxcb-devel"

From 93b67c558023c626596ab02f650cc51bbbc7aa38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 03:17:09 -0300
Subject: [PATCH 3038/3458] linux4.14: pick up change to openssl in -headers.

---
 srcpkgs/linux4.14/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 3e4506bc79bf..a8cad70c7713 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
 version=4.14.222
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 910b75a856ee5d78edf638e00057383cad6bd076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 03:17:09 -0300
Subject: [PATCH 3039/3458] linux4.19: pick up change to openssl in -headers.

---
 srcpkgs/linux4.19/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index bf8a7fafa6be..fbf723826ac4 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
 version=4.19.178
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"

From d3d48d78b9a32256e91f35ce9fa074f15aa90169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 03:17:09 -0300
Subject: [PATCH 3040/3458] linux5.10: pick up change to openssl in -headers.

---
 srcpkgs/linux5.10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index fd88817cc57f..6ae77aee534c 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.20
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 10a583501a06827a24755846db2ff137006fd72c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 03:17:09 -0300
Subject: [PATCH 3041/3458] linux5.11: pick up change to openssl in -headers.

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 886c3af06c26..1b5134062142 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
 version=5.11.3
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"

From 36997924cecbbf0ef30aa631a20850c22384b415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 03:17:10 -0300
Subject: [PATCH 3042/3458] linux5.4: pick up change to openssl in -headers.

---
 srcpkgs/linux5.4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index b5c6af89bf70..8944092048b3 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.102
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"

From 01c4aa03c5ccc6d9559562176e7a35e77be782ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Mar 2021 13:32:04 +0100
Subject: [PATCH 3043/3458] dpdk: build without linux-headers

this should only be needed if we would compile the kernel modules in the package,
but we ship these as dkms
---
 srcpkgs/dpdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 9a2ca615b25e..0f74b4c99d64 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -7,7 +7,7 @@ archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
 configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
-makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
+makedepends="libnuma-devel jansson-devel libpcap-devel
  zlib-devel openssl-devel libbsd-devel libelf libmnl"
 depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
@@ -23,7 +23,7 @@ case "${XBPS_TARGET_MACHINE}" in
 	armv7l*) configure_args+=" -Dmachine=armv7-a";;
 	aarch64*) configure_args+=" -Dmachine=armv8-a";;
 	ppc64le*) configure_args+=" -Dmachine=power8";;
-		   *) configure_args+=" -Dmachine=default"
+	*) configure_args+=" -Dmachine=default"
 esac
 
 CFLAGS="-fcommon"

From 46838ee1b3a3b235b9a6ecb4b38d12afabd2e203 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Mar 2021 13:49:51 +0100
Subject: [PATCH 3044/3458] ngrep: remove unused openssl-devel dep

---
 srcpkgs/ngrep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index 02a301eb639d..78f768dc9957 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
 hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel openssl-devel"
+makedepends="pcre-devel libpcap-devel"
 short_desc="Like GNU grep applied to the network layer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From a6582d1aaf40467cbf5ad3d8655cf8bf0e4d2071 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Mar 2021 13:53:10 +0100
Subject: [PATCH 3045/3458] iputils: remove unused openssl-devel dep

---
 srcpkgs/iputils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index a65a49c48e6a..f5b9aa6c0864 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
 configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
  -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel openssl-devel"
+makedepends="libcap-devel"
 depends="libcap-progs"
 short_desc="Useful utilities for Linux networking (including ping)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 9ce21ea3a69cefb7a4e3aad40369efb5d1118347 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Mar 2021 13:59:44 +0100
Subject: [PATCH 3046/3458] cryfs: remove unused openssl-devel dep

---
 srcpkgs/cryfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index ccd1f994c15a..e8022335f019 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=cmake
 configure_args="-DCRYFS_UPDATE_CHECKS=off"
 hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel"
 depends="fuse"
 short_desc="Cryptographic filesystem for the cloud"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"

From 6935b81187b34444e582754e6450c44bc054e0d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Mar 2021 14:03:14 +0100
Subject: [PATCH 3047/3458] linux4.9: update to 4.9.259.

---
 srcpkgs/linux4.9/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index e4dbd5a06a2f..3649672b6721 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.258
+version=4.9.259
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a
- 5a35fc05ba60b80588592cade43ddea4bdef0933882767bf8ad7e2a6f4ff2a4a"
+ 99cacec60833add6d972d7b36da209cc2b81807a46db40a46d408c61a97194dc"
 python_version=2 #unverified
 skip_extraction="patch-${version}.xz"
 patch_args="-Np1"
@@ -22,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) broken="No ppc64le support";;

From 275eb42e2f3132afe339edf58c00d295fe5ca98f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Mar 2021 14:05:02 +0100
Subject: [PATCH 3048/3458] odroid-u2-kernel: change to openssl build time dep

---
 srcpkgs/odroid-u2-kernel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de4..748f904ee1de 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
 nostrip=yes
 noverifyrdeps=yes
 archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
 triggers="kernel-hooks"

From 43c438a15930e4fcf6af1a44843853fb0d1bed9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 11:44:38 -0300
Subject: [PATCH 3049/3458] kicad: mark broken for native builds.

Using the build style directly seems to only have worked for cross
builds.
---
 srcpkgs/kicad/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 4b10f28927e6..1fd8b5a5bd26 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -32,4 +32,6 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxPython4"
 	configure_args+=" -DPYTHON_DEST=/${py3_sitelib}
 	-DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
+else
+	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/34953/steps/shell_3/logs/stdio"
 fi

From dea0b84834405d7649a7f6b33243bc8db2142a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 11:52:06 -0300
Subject: [PATCH 3050/3458] common/build-helper: pass a full path for native
 builds in cmake-wxWidgets-gtk3.

At least KiCAD tries to find wx-config-gtk3 in the current directory,
without looking for it in PATH, so the build fails. Actually give it a
full path, like we do for the cross build case.
---
 common/build-helper/cmake-wxWidgets-gtk3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-helper/cmake-wxWidgets-gtk3.sh b/common/build-helper/cmake-wxWidgets-gtk3.sh
index 9e59751fd7a7..68bc53de5464 100644
--- a/common/build-helper/cmake-wxWidgets-gtk3.sh
+++ b/common/build-helper/cmake-wxWidgets-gtk3.sh
@@ -1,5 +1,5 @@
 if [ "$CROSS_BUILD" ]; then
 	export WX_CONFIG=${XBPS_WRAPPERDIR}/wx-config-gtk3
 else
-	export WX_CONFIG=wx-config-gtk3
+	export WX_CONFIG=/usr/bin/wx-config-gtk3
 fi

From c5549643f75e0ddd1a8142917e176385debb5e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 6 Mar 2021 11:56:08 -0300
Subject: [PATCH 3051/3458] kicad: remove broken.

Solved in 4e045788313b0912b442d68160cf50957c8998c9.
---
 srcpkgs/kicad/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 1fd8b5a5bd26..4b10f28927e6 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -32,6 +32,4 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxPython4"
 	configure_args+=" -DPYTHON_DEST=/${py3_sitelib}
 	-DwxWidgets_CONFIG_OPTIONS='--prefix=${XBPS_CROSS_BASE}'"
-else
-	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/34953/steps/shell_3/logs/stdio"
 fi

From d84ca8bcc5cc97f1d4986582eb6f3c3aabcc7b21 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 6 Mar 2021 22:39:34 +0100
Subject: [PATCH 3052/3458] remwharead: rebuild

---
 srcpkgs/remwharead/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index 03ac932eac03..3e52473f86ce 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
 # Template file for 'remwharead'
 pkgname=remwharead
 version=0.10.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="poco-devel asciidoc pkg-config"
 makedepends="poco-devel boost-devel"

From 643c4b2cc2f9ac91c0c41e7cf39deb3518840572 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 7 Mar 2021 17:23:59 +0100
Subject: [PATCH 3053/3458] qt5: devel needs dependency on libatomic-devel on
 some targets

---
 srcpkgs/qt5/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 613170928016..1a2a3441cbf1 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=3
+revision=4
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
@@ -39,6 +39,10 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" postgresql-libs-devel"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 _cleanup_wrksrc_leak() {
 	if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then
 		# Replace references to ${wrksrc} in cmake files
@@ -1073,6 +1077,9 @@ qt5-devel_package() {
 		qt5-network-${version}_${revision}
 		qt5-xml-${version}_${revision}
 		qt5-host-tools-${version}_${revision}"
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		depends+=" libatomic-devel"
+	fi
 	short_desc+=" - Development files"
 	# qt5-enginio-devel is gone
 	pkg_install() {

From 8d32962efa595504c810a83d99cb545e4b15b26c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 23:32:13 +0100
Subject: [PATCH 3054/3458] crystal: rebuild against OpenSSL

---
 srcpkgs/crystal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index 1e5ad3257337..f368e4e24604 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -1,7 +1,7 @@
 # Template file for 'crystal'
 pkgname=crystal
 version=0.34.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 _shardsversion=0.10.0
 _molinilloversion=0.1.0

From 7789448f0512b10e3c8a317acc27d93c563a32ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 23:51:53 +0100
Subject: [PATCH 3055/3458] lolcat-c: update to 1.2.

---
 srcpkgs/lolcat-c/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lolcat-c/template b/srcpkgs/lolcat-c/template
index 349088c0e5b1..7dd7dbdd6308 100644
--- a/srcpkgs/lolcat-c/template
+++ b/srcpkgs/lolcat-c/template
@@ -1,6 +1,6 @@
 # Template file for 'lolcat-c'
 pkgname=lolcat-c
-version=1.1
+version=1.2
 revision=1
 wrksrc="lolcat-$version"
 build_style=gnu-makefile
@@ -10,9 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="WTFPL"
 homepage="https://github.com/jaseg/lolcat"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7c1ec1a1044d42b7574a71920c04d787eccf8c7028314cdd3d37de10b38ae252
-
-CFLAGS="-lm"
+checksum=b6e1a0e24479fbdd4eb907531339e2cafc0c00b78d19caf70e8377b8b7546331
 
 do_install() {
 	vbin lolcat

From c9f40b54753ff615c59af51ed09d64c22c113d3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 00:18:43 +0100
Subject: [PATCH 3056/3458] crystal: remove package

- the bootstrap binary does not even run on our build server:
https://build.voidlinux.org/builders/x86_64_builder/builds/30928/steps/shell_3/logs/stdio

- the template only supports glibc

- more reasons
---
 srcpkgs/crystal/template          | 107 ------------------------------
 srcpkgs/removed-packages/template |   3 +-
 2 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 srcpkgs/crystal/template

diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
deleted file mode 100644
index f368e4e24604..000000000000
--- a/srcpkgs/crystal/template
+++ /dev/null
@@ -1,107 +0,0 @@
-# Template file for 'crystal'
-pkgname=crystal
-version=0.34.0
-revision=3
-archs="x86_64* i686* aarch64* arm*"
-_shardsversion=0.10.0
-_molinilloversion=0.1.0
-_bootstrapversion=0.34.0
-_bootstraprevision=1
-hostmakedepends="which tar git llvm10 pkg-config"
-makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel"
-depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
-short_desc="Crystal Programming Language"
-maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
-license="Apache-2.0"
-homepage="https://crystal-lang.org/"
-distfiles="
- https://github.com/crystal-lang/crystal/archive/${version}.tar.gz
- https://github.com/crystal-lang/shards/archive/v${_shardsversion}.tar.gz
- https://github.com/crystal-lang/crystal-molinillo/archive/v${_molinilloversion}.tar.gz"
-checksum="973293ffbcfa4fb073f6a2f833b0ce5b82b72f7899427f39d7e5610ffc9029c8
- 3aea420df959552d1866d473c878ab1ed0b58489c4c9881ef40a170cfb775459
- 1ecc7a8bf52a3bfdc0134d4c58f1155ef204a22a3fed151ac2d4ba6a9e9e0a15"
-nocross="FIXME: someone needs to sort out the llvm --cxxflags for cross building"
-_crystalflags="--release --no-debug --progress"
-
-build_options="binary_bootstrap"
-build_options_default="binary_bootstrap"
-desc_option_binary_bootstrap="Bootstrap using precompiled binaries"
-
-if [ "$build_option_binary_bootstrap" ]; then
-	case "$XBPS_MACHINE" in
-	x86_64)
-		distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-x86_64.tar.gz"
-		checksum+=" 268ace9073ad073b56c07ac10e3f29927423a8b170d91420b0ca393fb02acfb1"
-		;;
-	i686)
-		distfiles+=" https://github.com/crystal-lang/crystal/releases/download/${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-i686.tar.gz"
-		checksum+=" e8962c91b6b739ac9738e03b24de907d64930d6129fbe54f9c81e0e029378006"
-		;;
-	*)
-		broken="cannot be built on $XBPS_MACHINE"
-		;;
-	esac
-else
-	hostmakedepends+=" crystal"
-fi
-
-do_extract() {
-	mkdir -p ${wrksrc}/{shards,shards/lib,shards/lib/molinillo,molinillo,$(vopt_if binary_bootstrap bootstrap)}
-
-	tar xfz ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${version}.tar.gz --strip-components=1 -C ${wrksrc}
-	tar xfz ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_shardsversion}.tar.gz --strip-components=1 -C ${wrksrc}/shards
-	tar xfz ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v${_molinilloversion}.tar.gz --strip-components=1 -C ${wrksrc}/molinillo
-	mv -f ${wrksrc}/molinillo/src/* ${wrksrc}/shards/lib/molinillo
-	if [ "$build_option_binary_bootstrap" ]; then
-		tar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-${XBPS_TARGET_MACHINE}.tar.gz \
-			--strip-components=1 -C ${wrksrc}/bootstrap
-	fi
-}
-
-do_build() {
-	if [ -z ${disable_parallel_build} ] && [ ${XBPS_MAKEJOBS} ]; then
-		_crystalflags="${_crystalflags} --threads ${makejobs:2:4}"
-	fi
-	make ${makejobs} release=1 FLAGS="${_crystalflags}" \
-		CRYSTAL_CONFIG_PATH="lib:/usr/lib/crystal" \
-		CRYSTAL_CONFIG_VERSION="${version}" \
-		CRYSTAL_CACHE_DIR="/tmp/crystal" \
-		$(vopt_if binary_bootstrap PATH="${wrksrc}/bootstrap/bin:$PATH")
-	make ${makejobs} docs CRYSTAL_CACHE_DIR="/tmp/crystal"
-
-	cd shards
-	${wrksrc}/bin/crystal build ${_crystalflags} -o bin/shards src/shards.cr
-}
-
-do_check() {
-	make ${makejobs} spec \
-		CRYSTAL_CONFIG_VERSION="${version}" \
-		CRYSTAL_CACHE_DIR="/tmp/crystal" \
-		PATH=".build:$PATH"
-
-	cd shards
-	make test CRYSTAL_BIN="${wrksrc}/bin/crystal"
-}
-
-do_install() {
-	vmkdir /usr/bin
-	vmkdir /usr/lib/crystal
-	vmkdir /usr/share/doc/crystal
-	vmkdir /usr/share/doc/crystal/api
-	vmkdir /usr/share/licenses/shards
-
-	vinstall etc/completion.bash 644 \
-		usr/share/bash-completion/completions crystal
-	vinstall etc/completion.zsh 644 usr/share/zsh/site-functions _crystal
-	vcopy samples /usr/share/doc/crystal
-	vcopy docs/* /usr/share/doc/crystal/api
-	vcopy src/* /usr/lib/crystal
-	vbin .build/crystal crystal
-	vman man/crystal.1
-	vbin shards/bin/shards
-	cp shards/LICENSE ${DESTDIR}/usr/share/licenses/shards
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a3859c3ed895..79242e53c692 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=35
+revision=36
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -29,6 +29,7 @@ replaces="
  clamz<=0.5_4
  couchdb<=1.7.1_2
  cracklib-python<=2.9.7_1
+ crystal<=0.34.0_4
  ctpp2<=2.8.3_7
  ctpp2-devel<=2.8.3_7
  dht-node<=0.2.0_3

From e21f66c1ce472426dd9c5934e2b8fbb9fc5903c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 7 Mar 2021 15:54:39 -0500
Subject: [PATCH 3057/3458] python-openssl: update to 20.0.1.

---
 srcpkgs/python-openssl/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
index ff1ae3918cba..266e3326b8c8 100644
--- a/srcpkgs/python-openssl/template
+++ b/srcpkgs/python-openssl/template
@@ -1,18 +1,24 @@
 # Template file for 'python-openssl'
 pkgname=python-openssl
-version=19.1.0
-revision=3
+version=20.0.1
+revision=1
 wrksrc="pyOpenSSL-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-cryptography python-six"
+checkdepends="python3-cryptography python3-six
+ python3-pytest python3-flaky python3-pretend"
 short_desc="Python2 interface to the OpenSSL library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Apache-2.0"
 homepage="https://pyopenssl.org/"
 changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
-checksum=9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507
+checksum=4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51
+
+do_check() {
+	PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
+}
 
 python3-openssl_package() {
 	depends="python3-cryptography python3-six"

From 5ab3e14a54b052ab4569ecfc3553c6cf5956c2d0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 8 Mar 2021 02:23:26 +0100
Subject: [PATCH 3058/3458] linux*: enable init_on_alloc by default on ppc and
 ppc64 as well

---
 srcpkgs/linux5.10/files/ppc-dotconfig   | 2 +-
 srcpkgs/linux5.10/files/ppc64-dotconfig | 2 +-
 srcpkgs/linux5.11/files/ppc-dotconfig   | 2 +-
 srcpkgs/linux5.11/files/ppc64-dotconfig | 2 +-
 srcpkgs/linux5.4/files/ppc-dotconfig    | 2 +-
 srcpkgs/linux5.4/files/ppc64-dotconfig  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index b41439ce1676..49cfd6e6f5d1 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -7471,7 +7471,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 4579421aac23..ed408edbab54 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -9360,7 +9360,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.11/files/ppc-dotconfig b/srcpkgs/linux5.11/files/ppc-dotconfig
index d47126937ab8..a15dc18fb3f6 100644
--- a/srcpkgs/linux5.11/files/ppc-dotconfig
+++ b/srcpkgs/linux5.11/files/ppc-dotconfig
@@ -7499,7 +7499,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.11/files/ppc64-dotconfig b/srcpkgs/linux5.11/files/ppc64-dotconfig
index 617632c17022..23f15812f32b 100644
--- a/srcpkgs/linux5.11/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.11/files/ppc64-dotconfig
@@ -9428,7 +9428,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index 05dd2bf84ff7..fcf648a73a25 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -6961,7 +6961,7 @@ CONFIG_INIT_STACK_NONE=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
diff --git a/srcpkgs/linux5.4/files/ppc64-dotconfig b/srcpkgs/linux5.4/files/ppc64-dotconfig
index 6fc8230df3d0..9fbfcfe3e700 100644
--- a/srcpkgs/linux5.4/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64-dotconfig
@@ -8910,7 +8910,7 @@ CONFIG_INIT_STACK_NONE=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options

From f25e0e44521b17153c3f0a130b028d56e4820b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Peka=C5=99?= <michal@serpen3x.com>
Date: Sun, 7 Mar 2021 14:11:34 +0100
Subject: [PATCH 3059/3458] greybird-themes: update to 3.22.14.

---
 srcpkgs/greybird-themes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/greybird-themes/template b/srcpkgs/greybird-themes/template
index df395087dfb2..f131777419f8 100644
--- a/srcpkgs/greybird-themes/template
+++ b/srcpkgs/greybird-themes/template
@@ -1,6 +1,6 @@
 # Template file for 'greybird-themes'
 pkgname=greybird-themes
-version=3.22.12
+version=3.22.14
 revision=2
 wrksrc="Greybird-${version}"
 build_style=meson
@@ -11,4 +11,4 @@ maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0"
 homepage="https://github.com/shimmerproject/Greybird"
 distfiles="https://github.com/shimmerproject/Greybird/archive/v${version}.tar.gz"
-checksum=410804cd5daca33cbc5c7c4a179f3a334ced87f408e515fc5d9c083a04bec4bc
+checksum=37fc4b8f83ff667e43e9889f6605a9e5da2ce2f5c5801c1ceef90814fb57b294

From 87edadc2647d74fd8d7f43ec209e1dd5a70737ae 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 Mar 2021 09:24:10 +0700
Subject: [PATCH 3060/3458] libtls: ship /etc/ssl/cert.pem

---
 srcpkgs/libtls/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index cd3d70faa028..070ee2d34fd3 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,11 +1,12 @@
 # Template file for 'libtls'
 pkgname=libtls
 version=3.2.4
-revision=1
+revision=2
 wrksrc="libressl-${version}"
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
 hostmakedepends="automake libtool"
+depends="ca-certificates"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="OpenSSL, ISC"
@@ -48,9 +49,11 @@ pre_configure() {
 do_install() {
 	make -C tls install DESTDIR="$DESTDIR"
 	make -C apps/nc install DESTDIR="$DESTDIR"
-}
-
-post_install() {
+	# libtls expects certs linked to /etc/ssl/cert.pem
+	# instead of OpenSSL's /etc/ssl/certs.pem
+	# Create a symlink for now while awaiting discussion.
+	vmkdir etc/ssl
+	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams

From e0e76583ff4cc9149a2b726c45cd05ba902230c6 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 Mar 2021 09:05:09 +0700
Subject: [PATCH 3061/3458] catgirl: build-style is configure, add
 openssl-devel to makedepends

---
 srcpkgs/catgirl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 6ddf5e3bb620..3814d7595355 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,12 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=1.6
-revision=2
-build_style=gnu-configure
+revision=3
+build_style=configure
+configure_args="--prefix=/usr"
 make_build_target="all"
 hostmakedepends="pkg-config"
-makedepends="libtls-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel openssl-devel"
 short_desc="TLS-only terminal IRC client"
 maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"

From 592c6a1a866eed4cd90675a25642176121d5251c Mon Sep 17 00:00:00 2001
From: Daniel Kroeger <daniel.kroeger@kofrezo.io>
Date: Sun, 7 Mar 2021 19:51:03 +0100
Subject: [PATCH 3062/3458] bumblebee-status: update to 2.1.2.

---
 srcpkgs/bumblebee-status/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template
index 38e784a52ed3..96914a6acd4f 100644
--- a/srcpkgs/bumblebee-status/template
+++ b/srcpkgs/bumblebee-status/template
@@ -1,7 +1,7 @@
 # Template file for 'bumblebee-status'
 pkgname=bumblebee-status
-version=2.0.5
-revision=2
+version=2.1.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-psutil python3-requests"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/tobi-wan-kenobi/bumblebee-status"
 distfiles="$PYPI_SITE/b/bumblebee-status/bumblebee-status-$version.tar.gz
  https://raw.githubusercontent.com/tobi-wan-kenobi/bumblebee-status/v$version/LICENSE"
-checksum="37685b0026997ef0055e14b235297f932fb637d1929db8e0e4af19730a8b73be
+checksum="c0cfd4e795c12a11d37eabb2801dc9e295af92faf3d0eef8a65b8bb7ea8492c2
  7cf86a994584e9e1bfe64c63f4e4b9d9bf757148d7ee2af960a267e79b16eab3"
 skip_extraction=LICENSE
 

From 12b3291409fc4e96f9f33e29e2b4c1a2f0043938 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Sun, 7 Mar 2021 19:55:11 +0100
Subject: [PATCH 3063/3458] rtl8812au-dkms: update to 20210302

---
 srcpkgs/rtl8812au-dkms/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rtl8812au-dkms/template b/srcpkgs/rtl8812au-dkms/template
index 339712464710..feb470776e13 100644
--- a/srcpkgs/rtl8812au-dkms/template
+++ b/srcpkgs/rtl8812au-dkms/template
@@ -1,9 +1,9 @@
 # Template file for 'rtl8812au-dkms'
 pkgname=rtl8812au-dkms
-version=20201214
+version=20210302
 revision=1
 _modver=5.9.3.2
-_gitrev=b95e75064d6aa5b680049a3fe63b2131a3033e3e
+_gitrev=d1bf6dfdef9a14ee80768a80df1852312cee7925
 wrksrc="rtl8812au-${_modver}-${_gitrev}"
 depends="dkms"
 short_desc="Realtek 8812AU/8821AU USB WiFi driver (DKMS)"
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renag.me>"
 license="GPL-2.0-only"
 homepage="http://www.dlink.com"
 distfiles="https://github.com/gordboy/rtl8812au-${_modver}/archive/${_gitrev}.tar.gz"
-checksum=25047a16ed9d6682fc8605dedf28a45625c4c1bbd4124a3aa0a085cd0f4e9cb6
+checksum=f2719d380deba9568ec663a7c70fcb42d15734b96f6ed19ec98733f9121fe9dc
 dkms_modules="rtl8812au ${_modver}"
 
 case "$XBPS_TARGET_MACHINE" in

From f31055926c84a7a49444290271283975b653cbf4 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 6 Mar 2021 22:11:58 -0300
Subject: [PATCH 3064/3458] icewm: update to 2.2.1.

Closes: #29286 [via git-merge-pr]
---
 srcpkgs/icewm/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index e039fc70099b..1eaf2c37ce20 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,22 +1,24 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=1.9.2
+version=2.2.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON
- -DCFGDIR=/etc/icewm"
+ -DCONFIG_XPM=ON -DCONFIG_LIBJPEG=ON -DCFGDIR=/etc/icewm"
 hostmakedepends="asciidoc gettext-devel libtool mkfontdir perl
  pkg-config"
 makedepends="libSM-devel libXft-devel libXinerama-devel libXpm-devel
  libXrandr-devel libao-devel librsvg-devel libsndfile-devel
- libXcomposite-devel libXdamage-devel fribidi-devel"
+ libXcomposite-devel libXdamage-devel fribidi-devel imlib2-devel"
 depends="shared-mime-info"
 short_desc="Window Manager designed for speed, usability, and consistency"
 maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=d40965a74e001f7c514c6581cec1b6dfed1d4b0d5479dd29a816bce9fe0c75ed
+checksum=199a37a395e8788b4c2eeb73c46248654d785b2862b89bb5b01709eb33968dc8
+# broken tests
+make_check=no
 
 # No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok
 CXXFLAGS="-Wno-odr -fno-strict-aliasing"

From e8ee3dfd6ce307f38e0b357069ae08add54a9ef2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 1 Mar 2021 08:03:49 +0100
Subject: [PATCH 3065/3458] options.description: describe portaudio and clean
 up from templates

---
 common/options.description  | 1 +
 srcpkgs/Aegisub/template    | 1 -
 srcpkgs/fmit/template       | 1 -
 srcpkgs/gqrx/template       | 1 -
 srcpkgs/libopenmpt/template | 1 -
 srcpkgs/spotifyd/template   | 1 -
 6 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/options.description b/common/options.description
index b6f538d5be1d..06360211a23f 100644
--- a/common/options.description
+++ b/common/options.description
@@ -58,6 +58,7 @@ desc_option_pam="Enable support for PAM"
 desc_option_pdf="Enable support to preview PDF files"
 desc_option_perl="Enable support for Perl"
 desc_option_png="Enable support for PNG images"
+desc_option_portaudio="Enable support for PortAudio"
 desc_option_ps="Enable support to preview PS files"
 desc_option_pulseaudio="Enable support for the PulseAudio sound server"
 desc_option_python="Enable support for Python"
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 580dde47a0df..2ddf6c24ee6e 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -23,7 +23,6 @@ build_options_default="fftw"
 
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
-desc_option_portaudio="Enable support for portaudio"
 
 LDFLAGS+=" -pthread"
 
diff --git a/srcpkgs/fmit/template b/srcpkgs/fmit/template
index 8750a40db14a..a3d59f8c5e6d 100644
--- a/srcpkgs/fmit/template
+++ b/srcpkgs/fmit/template
@@ -19,7 +19,6 @@ checksum=8dc123c84c19d6a9a62b303015255718705d5b0b8448a330d3815dd7f9688b02
 
 build_options="alsa jack portaudio"
 build_options_default="alsa jack portaudio"
-desc_option_portaudio="Cross-platform audio API"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-multimedia-devel qt5-svg-devel"
diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 8fc8f01bbc4c..1fe79b02e27f 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -22,7 +22,6 @@ checksum=7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9
 build_options="gr_audio portaudio"
 vopt_conflict gr_audio portaudio
 desc_option_gr_audio="Enable support for GNU Radio audio (ALSA and JACK)"
-desc_option_portaudio="Enable support for Portaudio"
 
 post_install() {
 	vinstall gqrx.desktop 644 usr/share/applications
diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 55e49689fef5..abac187c2df4 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -25,7 +25,6 @@ post_install() {
 # Package build options
 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}"
diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index 8dd5947d2690..2e21b38230c3 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -16,7 +16,6 @@ distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=47b3d9a87a9bc8ff5a46b9ba3ccb5ea0b305964c6f334e601a0316697d8bcd4a
 
 build_options="alsa pulseaudio portaudio dbus"
-desc_option_portaudio="Enable PortAudio backend"
 build_options_default="alsa pulseaudio portaudio dbus"
 
 export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"

From 9f8ade1ec5d37fe2686f37ec07dbd36e9087cb4b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 6 Mar 2021 20:59:56 +0100
Subject: [PATCH 3066/3458] detox: update to 1.4.2.

---
 srcpkgs/detox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/detox/template b/srcpkgs/detox/template
index dd21cdc36276..3c4682301242 100644
--- a/srcpkgs/detox/template
+++ b/srcpkgs/detox/template
@@ -1,6 +1,6 @@
 # Template file for 'detox'
 pkgname=detox
-version=1.4.1
+version=1.4.2
 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=fd71aa31abc82b1ec8b7ce996cd70062939e9c165b106f395beced3706c5ea17
+checksum=40af25c00a55227cdddaa54d8a1b18fb47112f4fd72efabc325dd8e540b804df
 
 pre_configure() {
 	autoreconf --install

From 7e32be0f40eb079134dc40e83e86ffd89647dd5d Mon Sep 17 00:00:00 2001
From: Caleb Gingles <nairou@gmail.com>
Date: Wed, 24 Feb 2021 14:04:34 -0500
Subject: [PATCH 3067/3458] herbstluftwm: update to 0.9.2

---
 srcpkgs/herbstluftwm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index a76fb7bd9112..99e4876933b1 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,10 +1,10 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.1
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
-makedepends="libXrandr-devel libXinerama-devel libglib-devel"
+makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel freetype-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="http://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
 distfiles="http://herbstluftwm.org/tarballs/${pkgname}-${version}.tar.gz"
-checksum=1e16277127e24f119b0f110b66a2723b9987bf70e4db0b2ec20c9fb4e9549864
+checksum=6844e304761f7b1c4e9217d6a6ac7068bcd94e67ddb3269db2d219874c866e2b
 
 post_install() {
 	vlicense LICENSE

From b442fbc6fef93c898e3538972360785e82bb7c55 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 6 Mar 2021 20:37:10 +0100
Subject: [PATCH 3068/3458] unrar: update to 6.0.4.

---
 srcpkgs/unrar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index 816fea1964c2..f3a6ceded883 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,6 +1,6 @@
 # Template file for 'unrar'
 pkgname=unrar
-version=6.0.3
+version=6.0.4
 revision=1
 wrksrc=unrar
 short_desc="Unarchiver for .rar files (non-free version)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:freeware"
 homepage="https://www.rarlab.com/rar_add.htm"
 distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
-checksum=1def53392d879f9e304aa6eac1339cf41f9bce1111a2f5845071665738c4aca0
+checksum=130197e495d6e2c2ee790a5beee123edeed642508be13f0159672e5397aca6c1
 repository=nonfree
 
 do_build() {

From f2b395d845b3b90ea12ff0536043b89648d42945 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 6 Mar 2021 21:31:51 +0200
Subject: [PATCH 3069/3458] lrzip: update to 0.641.

---
 srcpkgs/lrzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index e1850b324a4b..2ec52997c8e8 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -1,6 +1,6 @@
 # Template file for 'lrzip'
 pkgname=lrzip
-version=0.640
+version=0.641
 revision=1
 build_style="gnu-configure"
 hostmakedepends="perl automake libtool"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lrzip.kolivas.org/"
 distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz"
-checksum=30d0be2dd839b81895806a0f537f942888359b3d115554599fd9ab9f5b97a231
+checksum=9b6b4bb1ae76dafbaab96ec9d50d41af5fed45a6c4f2e06feea828c2cd8025c0
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh

From 4ebfa36dee4e828cf11479c3afc45220e5ca31fc Mon Sep 17 00:00:00 2001
From: David Anguita <david@davidanguita.name>
Date: Sat, 6 Mar 2021 09:36:03 +0100
Subject: [PATCH 3070/3458] liberation-fonts-ttf: update to 2.1.3.

---
 srcpkgs/liberation-fonts-ttf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/liberation-fonts-ttf/template b/srcpkgs/liberation-fonts-ttf/template
index dab424245516..80aef5151c47 100644
--- a/srcpkgs/liberation-fonts-ttf/template
+++ b/srcpkgs/liberation-fonts-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'liberation-fonts-ttf'
 pkgname=liberation-fonts-ttf
-version=2.1.2
+version=2.1.3
 revision=1
 wrksrc=${pkgname%-*}-${version}
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ license="OFL-1.1"
 homepage="https://github.com/liberationfonts/liberation-fonts"
 changelog="https://raw.githubusercontent.com/liberationfonts/liberation-fonts/devel/ChangeLog"
 distfiles="https://github.com/liberationfonts/liberation-fonts/archive/${version}.tar.gz"
-checksum=4c292068fa1bd68712619c5f0ed8f6e48beb9dc9e314afd33dd8e77b3f7ef6e6
+checksum=53ec96f3bb0f54f5524c0bc18be76408ebb3a78134cfcb7c25d9d2c8fb5b78c6
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {

From 0726dcb7bfbaaf31bd35055dec3d9699a253fc05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 6 Mar 2021 09:13:40 +0100
Subject: [PATCH 3071/3458] qpdf: update to 10.3.0.

---
 srcpkgs/qpdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 9ad808360cf6..ec7cea0c97bd 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.2.0
+version=10.3.0
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=4c627307cb40ddcf2b293dafa3943ce5744a72d7c1614e129b6acaef0ea771d3
+checksum=8e537617de95906e06677c1760ed14ab7f216cd86ea93e2860e453c67811e8e6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 23f2c6e6d2e48911262cb4b4f1fd39d34f8521ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 6 Mar 2021 08:37:59 +0100
Subject: [PATCH 3072/3458] doomretro: update to 4.0.5.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index b2e2ce4fe4b4..77d9bdf36622 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.0.4
+version=4.0.5
 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=d8e65732d07c7fcf31d49587039f50d9728425744990c75cb636fe57c36cfca1
+checksum=13ccdbc9b2f4ff742ecd6b5aa942c2a203b9c70d2cb517a2cc0098633254fd6d

From 1c363183a4cb1fa1e45b0de2e4213c8120760bee Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 5 Mar 2021 23:18:31 +0200
Subject: [PATCH 3073/3458] font-vazir: update to 27.2.2.

---
 srcpkgs/font-vazir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-vazir/template b/srcpkgs/font-vazir/template
index 4bed98c410a9..a475608952d8 100644
--- a/srcpkgs/font-vazir/template
+++ b/srcpkgs/font-vazir/template
@@ -1,6 +1,6 @@
 # Template file for 'font-vazir'
 pkgname=font-vazir
-version=27.2.0
+version=27.2.2
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="linarcx <linarcx@gmail.com>"
 license="OFL-1.1"
 homepage="https://github.com/rastikerdar/vazir-font"
 distfiles="https://github.com/rastikerdar/vazir-font/releases/download/v${version}/vazir-font-v${version}.zip"
-checksum=29dd19de15983dd3b027f9760ef47c262e95d9e006326adc2c486245d9395a41
+checksum=41242a8fecec467f547118a9fa6b14a9bd5c7e8f1d8f88f418c811f4b4695501
 
 font_dirs="/usr/share/fonts/TTF"
 

From d0add51f27ad4831adc09a5b9efc00a82becc51f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 12:57:45 +0100
Subject: [PATCH 3074/3458] help2man: update to 1.48.2.

---
 srcpkgs/help2man/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index 8df644013cb8..e28126e3126f 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -1,6 +1,6 @@
 # Template file for 'help2man'
 pkgname=help2man
-version=1.47.16
+version=1.48.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl-Locale-gettext"
@@ -10,5 +10,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/help2man"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=3ef8580c5b86e32ca092ce8de43df204f5e6f714b0cd32bc6237e6cd0f34a8f4
+checksum=20cb36111df91d61741a20680912ab0e4c59da479c3fb05837c6f0a8cb7cb467
 lib32disabled=yes

From 864c1167e728b112d618198df1aee40e7c54e53e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 5 Mar 2021 21:19:02 +0300
Subject: [PATCH 3075/3458] gallery-dl: update to 1.17.0

---
 srcpkgs/gallery-dl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 3630b3f141dc..7acebe307b3e 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.5
+version=1.17.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ 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="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
-checksum=96217375bb95b76af628c2d9d917cd2a8ade38857f70ceecd7021ae12cbf48b3
+checksum=adf50cdb9b6344e51b5109e56fdb461af52f56c81992a9989fa8ef738235b611
 
 do_check() {
 	make test

From 5c19a2a69c6a2106a5bdc4758487a6be5e8fefcb Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 5 Mar 2021 12:01:16 +0100
Subject: [PATCH 3076/3458] python3-html5lib: update to 1.1

---
 srcpkgs/python3-html5lib/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template
index 5db4d4d9cc78..11d27069e0ad 100644
--- a/srcpkgs/python3-html5lib/template
+++ b/srcpkgs/python3-html5lib/template
@@ -1,26 +1,19 @@
 # Template file for 'python3-html5lib'
 pkgname=python3-html5lib
-version=1.0.1
-revision=5
+version=1.1
+revision=1
 wrksrc="html5lib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-six python3-webencodings"
-checkdepends="$depends python3-pytest python3-mock python3-lxml"
 short_desc="Python3 HTML parser based on the WHATWG HTML5 specification"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/html5lib/html5lib-python"
 distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
-checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
+checksum=b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f
+make_check=no # tests fail, should be fixed upstream in a new release
 
-pre_build() {
-	sed -i '/setuptools>=/d' setup.py
-}
-do_check() {
-	export PYTHONPATH=$PWD/build/lib
-	: requires more Python modules
-}
 post_install() {
 	vlicense LICENSE
 }

From 6765ed327d1a4afa1d432e04a5cf1ebc4622f1e3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Mar 2021 11:42:36 +0100
Subject: [PATCH 3077/3458] dislocker: update to 0.7.3, fix license

---
 srcpkgs/dislocker/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index b000cc7ab9c5..a5580034c6fd 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,13 +1,13 @@
 # Template file for 'dislocker'
 pkgname=dislocker
-version=0.7.1
-revision=4
+version=0.7.3
+revision=1
 build_style=cmake
 configure_args="-DLIB_INSTALL_DIR=lib"
 makedepends="mbedtls-devel fuse-devel"
 short_desc="FUSE driver to read/write Windows Bitlocker-ed volumes under Linux"
 maintainer="Samsky <samsky72@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/Aorimn/dislocker"
 distfiles="https://github.com/Aorimn/${pkgname}/archive/v${version}.tar.gz"
-checksum=742fb5c1b3ff540368ced54c29eae8b488ae5a5fcaca092947e17c2d358a6762
+checksum=8d5275577c44f2bd87f6e05dd61971a71c0e56a9cbedf000bd38deadd8b6c1e6

From 053aa8fde9a3a19643dc35b85e948363d80704c5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Mar 2021 11:35:40 +0100
Subject: [PATCH 3078/3458] direnv: update to 2.2.7.

---
 srcpkgs/direnv/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index af1824cc9e94..37c362268e41 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,6 +1,6 @@
 # Template file for 'direnv'
 pkgname=direnv
-version=2.24.0
+version=2.27.0
 revision=1
 build_style=go
 go_import_path=github.com/direnv/direnv
@@ -10,10 +10,12 @@ license="MIT"
 homepage="https://direnv.net/"
 changelog="https://raw.githubusercontent.com/direnv/direnv/master/CHANGELOG.md"
 distfiles="https://github.com/direnv/direnv/archive/v${version}.tar.gz"
-checksum=a0993912bc6e89580bc8320d3c9b3e70ccd6aa06c1d847a4d9174bee8a8b9431
+checksum=9dc5ce43c63d9d9ff510c6bcd6ae06f3f2f907347e7cbb2bb6513bfb0f151621
 
 post_install() {
 	vlicense LICENSE
+	vman man/direnv-fetchurl.1
 	vman man/direnv-stdlib.1
+	vman man/direnv.toml.1
 	vman man/direnv.1
 }

From 61068fcd7e9180d30ea57c2cc0d6b15b56f0e7c5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 5 Mar 2021 10:47:23 -0800
Subject: [PATCH 3079/3458] gocloc: update to 0.4.1.

---
 srcpkgs/gocloc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 11660af865ef..01577bb057d9 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,6 +1,6 @@
 # Template file for 'gocloc'
 pkgname=gocloc
-version=0.3.3
+version=0.4.1
 revision=1
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
 homepage="https://github.com/hhatto/gocloc"
 distfiles="https://github.com/hhatto/gocloc/archive/v${version}.tar.gz"
-checksum=308461beea124991c1558d8278e3a7cc0c8411c5730d444ebbd54187edeb688d
+checksum=528be5009996b4177936be508aa494c289adddf58e4694b1a36067bda433f783
 
 post_install() {
 	vlicense LICENSE

From 914bf3a3407c533f564cf4dc8e5da5b2e2ae85b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 01:15:51 -0300
Subject: [PATCH 3080/3458] diffoscope: remove rpm-python3 dependency.

Unnecessary for local usage with most of the objects Void users deal
with, and it can detect that the library isn't available at runtime.
---
 srcpkgs/diffoscope/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index c07d20d86612..2d35c8b26136 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,15 +1,14 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
 version=167
-revision=1
+revision=2
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
 make_check_args="-k not((test_wasm)and((test_identification)or(test_no_differences)))"
 hostmakedepends="python3-setuptools"
 depends="python3-magic python3-libarchive-c python3-setuptools
  python3-argcomplete binwalk python3-defusedxml python3-distro
- python3-jsondiff python3-PyPDF2 python3-pyxattr rpm-python3
- python3-tlsh"
+ python3-jsondiff python3-PyPDF2 python3-pyxattr python3-tlsh"
 checkdepends="${depends} python3-pytest"
 short_desc="In-depth comparison of files, archives, and directories"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From daf5b5d22fe57e4f47627f25786e533989bc0ab0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Fri, 5 Mar 2021 11:16:18 +0100
Subject: [PATCH 3081/3458] atlantis: update to 0.16.1.

---
 srcpkgs/atlantis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index 97b606a364a0..9b2052c1e39d 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,6 +1,6 @@
 # Template file for 'atlantis'
 pkgname=atlantis
-version=0.15.0
+version=0.16.1
 revision=1
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
@@ -10,4 +10,4 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://runatlantis.io"
 distfiles="https://github.com/runatlantis/atlantis/archive/v${version}.tar.gz"
-checksum=2a2d94d86ac9d84a050e4766bb9e012d239d268ccafdc548571624f46bc701da
+checksum=23828bba56e6ae372b35668ab7a1055ecdd37076391760801f4436f4c9a33680

From b65db18fb080c789f994aa0bb4d4b8c49343e305 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 Mar 2021 10:09:05 +0700
Subject: [PATCH 3082/3458] openmpi: set $libdir relative to $prefix

openmpi inventes its own version of AC_CONFIG_SUBDIRS, passing $libdir
relatives to $exec_prefix without initialising $exec_prefix will pass
$libdir as NONE/lib{32,64}.

We can't set $exec_prefix relative to $prefix because autotools will
expand the value only twice. See c96738a6e9, (common/gnu-configure-args:
set exec_prefix to ${prefix}, 2021-02-23) and 9bdf2f6e4d, (Revert
"common/gnu-configure-args: set exec_prefix to ${prefix}", 2021-03-05)
---
 srcpkgs/openmpi/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index c0eeb69b1e3a..696765fbd403 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -3,7 +3,8 @@ pkgname=openmpi
 version=4.1.0
 revision=3
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr"
+configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr
+ --libdir=\${prefix}/lib${XBPS_TARGET_WORDSIZE}"
 hostmakedepends="gcc-fortran libgomp-devel perl pkg-config automake libtool"
 makedepends="libgfortran-devel libgomp-devel libhwloc-devel zlib-devel libevent-devel"
 conf_files="

From c438369e0d745705b50803f8568d4a1ae21fae71 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 01:18:33 +0100
Subject: [PATCH 3083/3458] libfm: update to 1.3.2.

---
 srcpkgs/libfm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libfm/template b/srcpkgs/libfm/template
index 127b283217b4..be9425847037 100644
--- a/srcpkgs/libfm/template
+++ b/srcpkgs/libfm/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/libfm-extra"
 #
 pkgname=libfm
-version=1.3.1
-revision=2
+version=1.3.2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-udisks --disable-static --with-gtk=3"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://pcmanfm.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pcmanfm/${pkgname}-${version}.tar.xz"
-checksum=96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4
+checksum=a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5
 conf_files="/etc/xdg/libfm/libfm.conf"
 
 pre_configure() {

From 44f48820677f8a38ea71c8182b0e3727bbbb841a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 01:18:39 +0100
Subject: [PATCH 3084/3458] libfm-extra: update to 1.3.2.

---
 srcpkgs/libfm-extra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfm-extra/template b/srcpkgs/libfm-extra/template
index f65272bb4e45..b9a2dd2f227e 100644
--- a/srcpkgs/libfm-extra/template
+++ b/srcpkgs/libfm-extra/template
@@ -4,7 +4,7 @@
 # A CYCLIC DEPENDENCY: libfm <-> menu-cache
 #
 pkgname=libfm-extra
-version=1.3.1
+version=1.3.2
 revision=1
 wrksrc="libfm-${version}"
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://pcmanfm.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pcmanfm/libfm-${version}.tar.xz"
-checksum=96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4
+checksum=a5042630304cf8e5d8cff9d565c6bd546f228b48c960153ed366a34e87cad1e5
 
 post_install() {
 	# Remove conflicting symlink with libfm.

From cd3bedc456524af2c66c7991ec4af2719112ce8a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 01:18:42 +0100
Subject: [PATCH 3085/3458] pcmanfm: update to 1.3.2.

---
 srcpkgs/pcmanfm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanfm/template b/srcpkgs/pcmanfm/template
index 11c55fd36a32..300e881d7c1e 100644
--- a/srcpkgs/pcmanfm/template
+++ b/srcpkgs/pcmanfm/template
@@ -1,7 +1,7 @@
 # Template file for 'pcmanfm'
 pkgname=pcmanfm
-version=1.3.1
-revision=2
+version=1.3.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-gtk=3"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://pcmanfm.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=6804043b3ee3a703edde41c724946174b505fe958703eadbd7e0876ece836855
+checksum=14cb7b247493c4cce65fbb5902611e3ad00a7a870fbc1e50adc50428c5140cf7
 conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf"
 
 post_install() {

From fc147820b6540bc9af4cf195466117216137d7bc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 01:02:40 +0100
Subject: [PATCH 3086/3458] lilv: update to 0.24.12.

depend on libsndfile for lv2apply
---
 srcpkgs/lilv/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lilv/template b/srcpkgs/lilv/template
index 0777011faa28..07f123dcb67b 100644
--- a/srcpkgs/lilv/template
+++ b/srcpkgs/lilv/template
@@ -1,17 +1,18 @@
 # Template file for 'lilv'
 pkgname=lilv
-version=0.24.10
+version=0.24.12
 revision=1
 build_style=waf3
 configure_args="--dyn-manifest"
 hostmakedepends="pkg-config"
-makedepends="python3-devel serd-devel sord-devel sratom-devel lv2"
+makedepends="python3-devel serd-devel sord-devel sratom-devel libsndfile-devel
+ lv2"
 short_desc="Simple yet powerful C API for using LV2 plugins"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="http://drobilla.net/software/lilv/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
-checksum=d1bba93d6ddacadb5e742fd10ad732727edb743524de229c70cc90ef81ffc594
+checksum=26a37790890c9c1f838203b47f5b2320334fe92c02a4d26ebbe2669dbd769061
 
 post_install() {
 	vlicense COPYING

From 1b499d6a1319599ab738d2e9da9924d8bc63ddb3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 01:41:21 +0100
Subject: [PATCH 3087/3458] taglib: update to 1.12.

patches were applied upstream
---
 srcpkgs/taglib/patches/CVE-2017-12678.patch | 40 ----------------
 srcpkgs/taglib/patches/CVE-2018-11439.patch | 51 ---------------------
 srcpkgs/taglib/template                     |  9 ++--
 3 files changed, 4 insertions(+), 96 deletions(-)
 delete mode 100644 srcpkgs/taglib/patches/CVE-2017-12678.patch
 delete mode 100644 srcpkgs/taglib/patches/CVE-2018-11439.patch

diff --git a/srcpkgs/taglib/patches/CVE-2017-12678.patch b/srcpkgs/taglib/patches/CVE-2017-12678.patch
deleted file mode 100644
index 4bd9f2be175e..000000000000
--- a/srcpkgs/taglib/patches/CVE-2017-12678.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001
-From: "Stephen F. Booth" <me@sbooth.org>
-Date: Sun, 23 Jul 2017 10:11:09 -0400
-Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame
-
-If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame
-which causes problems in rebuildAggregateFrames() when it is assumed
-that TDRC is a TextIdentificationFrame
-
-Upstream-Status: Backport
-[https://github.com/taglib/taglib/pull/831/commits/eb9ded1206f18f2c319157337edea2533a40bea6]
-
-CVE: CVE-2017-12678
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-index 759a9b7b..9347ab86 100644
---- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
-+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const
-      tag->frameList("TDAT").size() == 1)
-   {
-     TextIdentificationFrame *tdrc =
--      static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
-+      dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
-     UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front());
- 
--    if(tdrc->fieldList().size() == 1 &&
-+    if(tdrc &&
-+       tdrc->fieldList().size() == 1 &&
-        tdrc->fieldList().front().size() == 4 &&
-        tdat->data().size() >= 5)
-     {
--- 
-2.13.5
-
diff --git a/srcpkgs/taglib/patches/CVE-2018-11439.patch b/srcpkgs/taglib/patches/CVE-2018-11439.patch
deleted file mode 100644
index cdd66e67f725..000000000000
--- a/srcpkgs/taglib/patches/CVE-2018-11439.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 272648ccfcccae30e002ccf34a22e075dd477278 Mon Sep 17 00:00:00 2001
-From: Scott Gayou <github.scott@gmail.com>
-Date: Mon, 4 Jun 2018 11:34:36 -0400
-Subject: [PATCH] Fixed OOB read when loading invalid ogg flac file. (#868)
-
-This CVE is caused by a failure to check the minimum length
-of a ogg flac header. This header is detailed in full at:
-https://xiph.org/flac/ogg_mapping.html. Added more strict checking
-for entire header.
-
-Upstream-Status: Backport
-[https://github.com/taglib/taglib/pull/869/commits/272648ccfcccae30e002ccf34a22e075dd477278]
-
-CVE: CVE-2018-11439
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- taglib/ogg/flac/oggflacfile.cpp | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp
-index 53d0450..07ea9dc 100644
---- a/taglib/ogg/flac/oggflacfile.cpp
-+++ b/taglib/ogg/flac/oggflacfile.cpp
-@@ -231,11 +231,21 @@ void Ogg::FLAC::File::scan()
- 
-   if(!metadataHeader.startsWith("fLaC"))  {
-     // FLAC 1.1.2+
-+    // See https://xiph.org/flac/ogg_mapping.html for the header specification.
-+    if(metadataHeader.size() < 13)
-+      return;
-+
-+    if(metadataHeader[0] != 0x7f)
-+      return;
-+
-     if(metadataHeader.mid(1, 4) != "FLAC")
-       return;
- 
--    if(metadataHeader[5] != 1)
--      return; // not version 1
-+    if(metadataHeader[5] != 1 && metadataHeader[6] != 0)
-+      return; // not version 1.0
-+
-+    if(metadataHeader.mid(9, 4) != "fLaC")
-+      return;
- 
-     metadataHeader = metadataHeader.mid(13);
-   }
--- 
-2.7.4
-
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index d385b4ad26ff..05b6f143efee 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,18 +1,17 @@
 # Template file for 'taglib'
 pkgname=taglib
-version=1.11.1
-revision=4
-patch_args="-Np1"
+version=1.12
+revision=1
 build_style=cmake
 configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
 hostmakedepends="pkg-config"
 makedepends="zlib-devel"
 short_desc="Library for accessing ID tags in various media files"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later, MPL-1.1"
 homepage="https://taglib.github.io/"
-license="LGPL-2.1, MPL-1.1"
 distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b
+checksum=b5a56f78a8bd962aaaec992b25a031f541b949b6eb30aa232bd6d5fa17cf8fa8
 
 taglib-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 349e6f0cded41e402fa5323deebab428ad64f110 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 00:54:07 +0100
Subject: [PATCH 3088/3458] lv2: update to 1.18.2.

---
 srcpkgs/lv2/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 45d201caef04..5577167b3b87 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -1,15 +1,16 @@
 # Template file for 'lv2'
 pkgname=lv2
-version=1.18.0
+version=1.18.2
 revision=1
 build_style=waf3
+hostmakedepends="pkg-config"
 makedepends="libsndfile-devel gtk+-devel"
 short_desc="Plugin standard for audio systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="http://lv2plug.in"
 distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
-checksum=90a3e5cf8bdca81b49def917e89fd6bba1d5845261642cd54e7888df0320473f
+checksum=4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e
 python_version=3
 lib32disabled=yes
 

From 706396cd0d78db7841001aeaacb6924895bcc47b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 00:24:31 +0100
Subject: [PATCH 3089/3458] mousepad: update to 0.5.3.

---
 srcpkgs/mousepad/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 7f8dec12f036..7159c772fa11 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,6 +1,6 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.2
+version=0.5.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,5 +11,6 @@ short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
+changelog="https://git.xfce.org/apps/mousepad/tree/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=30adc5631a4e551df7b3e17ddc1d10e9980080f96518dedccc32170cb18efb8e
+checksum=e7208bb9e96a1525d3358a64f9cdd165005078e84e81984a953a2a03491fcaa8

From 2c6f210a1851bd6b4b44fe389066f7bfdc1db045 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 00:44:14 +0100
Subject: [PATCH 3090/3458] imlib2: update to 1.7.1.

patch was applied upstream
---
 srcpkgs/imlib2/patches/be.patch | 26 --------------------------
 srcpkgs/imlib2/template         |  6 +++---
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/imlib2/patches/be.patch

diff --git a/srcpkgs/imlib2/patches/be.patch b/srcpkgs/imlib2/patches/be.patch
deleted file mode 100644
index bdc93aeffaf4..000000000000
--- a/srcpkgs/imlib2/patches/be.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 92d3153fee9f915cf2bdbc92a7551e5a83985e81 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun, 9 Aug 2020 21:00:46 +0200
-Subject: [PATCH] Fix big endian build
-
----
- src/modules/loaders/loader_argb.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git src/modules/loaders/loader_argb.c src/modules/loaders/loader_argb.c
-index ec58ca3..b915b7b 100644
---- src/modules/loaders/loader_argb.c
-+++ src/modules/loaders/loader_argb.c
-@@ -7,6 +7,9 @@ load2(ImlibImage * im, int load_data)
-    int                 w = 0, h = 0, alpha = 0;
-    DATA32             *ptr;
-    int                 y;
-+#ifdef WORDS_BIGENDIAN
-+   int                 l;
-+#endif
- 
-    rc = LOAD_FAIL;
- 
--- 
-2.28.0
-
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index d10ee1ce8761..c25e300a103a 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,7 +1,7 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.0
-revision=3
+version=1.7.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=fde6cc188a35e34eff251ee249d2b5624aa0d85f83a689237ec2fe90ceca718a
+checksum=af30cf36e956febf18f9d33a81a4b43fea8f761ce74a67715d2ad157bb92c090
 
 post_install() {
 	vlicense COPYING

From ecf5c460310ab4dedfb67da166b00eaad5c27f86 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Thu, 4 Mar 2021 16:33:30 +0100
Subject: [PATCH 3091/3458] pipewire: update to 0.3.23

---
 .../pipewire/patches/autostart-media-session.patch    | 11 +++++++++++
 srcpkgs/pipewire/template                             |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/pipewire/patches/autostart-media-session.patch

diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch
new file mode 100644
index 000000000000..2051a868d463
--- /dev/null
+++ b/srcpkgs/pipewire/patches/autostart-media-session.patch
@@ -0,0 +1,11 @@
+--- src/daemon/pipewire.conf.in.orig	2021-03-04 16:54:52.950015583 +0100
++++ src/daemon/pipewire.conf.in	2021-03-04 16:55:13.766016281 +0100
+@@ -203,7 +203,7 @@
+     # but it is better to start it as a systemd service.
+     # Run the session manager with -h for options.
+     #
+-    @comment@"@media_session_path@" = { args = "" }
++    "@media_session_path@" = { args = "" }
+     #
+     # You can optionally start the pulseaudio-server here as well
+     # but it is better to start it as a systemd service.
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 7072e95fa015..7a7a6199a1be 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.22
+version=0.3.23
 revision=1
 build_style=meson
 configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false
@@ -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=5db2caf41af79cd9e343d07a3804c63b8b243c1d74e926181058e29771d4b691
+checksum=e9a9030032ba8f3b6f9e300dbf755ab439340cd4cbeb3e1bba6f1a18d2c9da92
 conf_files="/etc/pipewire/pipewire.conf"
 
 replaces="libpulseaudio-pipewire>=0"

From bc0c6bc65aff9a32a0cb70d14cbf473e60fd8632 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 4 Mar 2021 12:26:19 +0300
Subject: [PATCH 3092/3458] RyzenAdj: update to 0.7.0

---
 srcpkgs/RyzenAdj/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/RyzenAdj/template b/srcpkgs/RyzenAdj/template
index 9c6c03cf4fdf..fa5a2aa511d5 100644
--- a/srcpkgs/RyzenAdj/template
+++ b/srcpkgs/RyzenAdj/template
@@ -1,6 +1,6 @@
 # Template file for 'RyzenAdj'
 pkgname=RyzenAdj
-version=0.5.2
+version=0.7.0
 revision=1
 archs="x86_64*"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="maciozo <maciozo@maciozo.com>"
 license="LGPL-3.0-only"
 homepage="https://github.com/FlyGoat/RyzenAdj"
 distfiles="https://github.com/FlyGoat/RyzenAdj/archive/v${version}.tar.gz"
-checksum=b78558e7af71e798d3a3f1a1c526be4e51eeb515dc2c563cbd8dd34805a528cf
+checksum=fff8a08e657ba35f919bd564fbe2e15e7c615ac6e2a357ffcc3472069e8081f6
 
 do_install() {
 	vbin build/ryzenadj

From 1644f52051c7dfbaa34ea9cea856d29f3b589865 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 4 Mar 2021 09:44:11 +0100
Subject: [PATCH 3093/3458] zstd: update to 1.4.9.

---
 srcpkgs/zstd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template
index be4ca70abe6a..dfb4eecb549c 100644
--- a/srcpkgs/zstd/template
+++ b/srcpkgs/zstd/template
@@ -1,6 +1,6 @@
 # Template file for 'zstd'
 pkgname=zstd
-version=1.4.8
+version=1.4.9
 revision=1
 bootstrap=yes
 makedepends="zlib-devel liblzma-devel liblz4-devel"
@@ -9,8 +9,8 @@ short_desc="Fast real-time compression algorithm - CLI tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="http://www.zstd.net"
-distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz"
-checksum=f176f0626cb797022fbf257c3c644d71c1c747bb74c32201f9203654da35e9fa
+distfiles="https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz"
+checksum=29ac74e19ea28659017361976240c4b5c5c24db3b89338731a6feb97c038d293
 
 do_build() {
 	make ${makejobs}

From f535004ac2dc493f11440a9514c982b9b6e92394 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 3 Mar 2021 20:45:32 +0300
Subject: [PATCH 3094/3458] xonsh: update to 0.9.27

---
 srcpkgs/xonsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index 20abdd5d4435..732d1ca301fb 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,6 +1,6 @@
 # Template file for 'xonsh'
 pkgname=xonsh
-version=0.9.26
+version=0.9.27
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://xon.sh/"
 changelog="https://raw.githubusercontent.com/xonsh/xonsh/master/CHANGELOG.rst"
 distfiles="https://github.com/xonsh/xonsh/archive/${version}.tar.gz"
-checksum=ab2da2d2e07420a9730af0ae69001db7553173f22a213534529394acb98c70f1
+checksum=e9f2b40d94fa0e4bafada8a0d8c9db9a16ad7be2a3f1acf3b1c8955b12d4e1c6
 register_shell="/bin/xonsh"
 # FIXME: fails with multiple AttributeErrors
 make_check=extended

From 0ff1d5a158327f18090c0ce687bf61f0532d16dd Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Mar 2021 13:14:38 +0100
Subject: [PATCH 3095/3458] autocutsel: update to 0.10.1.

---
 srcpkgs/autocutsel/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/autocutsel/template b/srcpkgs/autocutsel/template
index 59648a29e0a4..e537939d0cd9 100644
--- a/srcpkgs/autocutsel/template
+++ b/srcpkgs/autocutsel/template
@@ -1,7 +1,7 @@
 # Template file for 'autocutsel'
 pkgname=autocutsel
-version=0.10.0
-revision=6
+version=0.10.1
+revision=1
 build_style=gnu-configure
 makedepends="libXaw-devel"
 short_desc="Synchronize the two copy/paste buffers used by X applications"
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/sigmike/autocutsel"
 distfiles="https://github.com/sigmike/autocutsel/releases/download/$version/autocutsel-$version.tar.gz"
-checksum=a2376330aa1a65f36621595a5a4eb5c2cabc16854b69d66c285f11f89bd05e3f
+checksum=f17e06d42f7494436d4b26f4be0b6b0da39481c0400c96778e4b905b6341eb17

From 9b920740ccd00b9ecf46a4e5823fbc3858d5e010 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Mar 2021 12:27:55 +0100
Subject: [PATCH 3096/3458] udftools: update to 2.3.

---
 srcpkgs/udftools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/udftools/template b/srcpkgs/udftools/template
index b46aace67ea7..9cbe55489301 100644
--- a/srcpkgs/udftools/template
+++ b/srcpkgs/udftools/template
@@ -1,6 +1,6 @@
 # Template file for 'udftools'
 pkgname=udftools
-version=2.2
+version=2.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Pierre Allegraud <lyzech@yahoo.fr>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/pali/udftools/"
 distfiles="https://github.com/pali/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=d67ce203d71d828619d6d3791ab33eefab4bc506e0ee73355ab6c2f91d52448e
+checksum=750dcf5c797765eb42265e0a56d1a99f97f94b7f6f4534263a5410503f0caf59

From beefb0610a3dcb45c8ee9d356c4c8c1964a777e5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Mar 2021 12:05:43 +0100
Subject: [PATCH 3097/3458] volnoti: remove package

Development stopped 8 years ago, no tagged releases.
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/volnoti/template          | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/volnoti/template

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79242e53c692..0447e59e9e36 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -254,6 +254,7 @@ replaces="
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
  v8<=3.24.35.33_4
+ volnoti<=0.1_1
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
diff --git a/srcpkgs/volnoti/template b/srcpkgs/volnoti/template
deleted file mode 100644
index bfc500af4eda..000000000000
--- a/srcpkgs/volnoti/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'volnoti'
-pkgname=volnoti
-version=0.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="git pkg-config"
-makedepends="gdk-pixbuf-devel gtk+-devel dbus-glib-devel"
-depends="dbus-glib gdk-pixbuf gtk+ librsvg"
-short_desc="Lightweight volume notification"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="GPL-3"
-homepage="https://www.github.com/davidbrazdil/volnoti"
-distfiles="http://github.com/downloads/davidbrazdil/volnoti/$pkgname-$version.tar.gz"
-checksum=3f505372a90bc8c103286f23fc9e688527523dc55045cae6e812c1152a4257cc

From 54494cffc4b9df7353dd19dde94ec444b1400ac8 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 Mar 2021 10:47:52 +0700
Subject: [PATCH 3098/3458] mutt: update to 2.0.6.

---
 srcpkgs/mutt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 7bede2a16e9a..91a9a7b0c8c0 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.0.5
-revision=2
+version=2.0.6
+revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -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=e21d5aec0d3110f89d390929e56a38794a94f5843120d9ff59b21da78fd0004d
+checksum=81e31c45895fd624747f19106aa2697d2aa135049ff2e9e9db0a6ed876bcb598
 
 post_install() {
 	# provided by mime-types

From f41d526e1cc8ad1eaa66ea5e508d953288950be5 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Mon, 1 Mar 2021 21:08:34 +0100
Subject: [PATCH 3099/3458] glances: update to 3.1.6.2

---
 srcpkgs/glances/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index 0598978094c0..58fc1a562089 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,6 +1,6 @@
 # Template file for 'glances'
 pkgname=glances
-version=3.1.5
+version=3.1.6.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/nicolargo/glances"
 distfiles="https://github.com/nicolargo/glances/archive/v${version}.tar.gz"
-checksum=e60ea1274e882f9d64d16c12690bd71dcc70ebe7e93690d773275f92fa126b24
+checksum=1eddc35a887159096eb4ca3e09dd144f5e60f4879b1e662478dbc18b39d77817
 
 post_install() {
 	vsconf conf/glances.conf

From 7fd20147e46ab76647a319987c9b3137d9347914 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Tue, 2 Mar 2021 11:27:19 +0100
Subject: [PATCH 3100/3458] xlunch: update to 4.7.0.

---
 srcpkgs/xlunch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index cc0edddd1e0b..8c8eafcb029b 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -1,6 +1,6 @@
 # Template file for 'xlunch'
 pkgname=xlunch
-version=4.5.4
+version=4.7.0
 revision=1
 build_style=gnu-makefile
 make_build_target=xlunch
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://xlunch.org/"
 distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz"
-checksum=a62443f3423edcc5dbd3bf70e62919a528fb5f204bd2e7e75bba6aa37a63d65c
+checksum=08728beba2a86b1e8f0cccf14903b7e6625e099425b6a254418c75636f2515e6
 
 do_install() {
 	vbin xlunch

From 6ab602e2c018ccff1cba888aff89bfc04b70b1ba Mon Sep 17 00:00:00 2001
From: AviKav <avikav@avikav.net>
Date: Sun, 28 Feb 2021 21:59:53 -0500
Subject: [PATCH 3101/3458] nomad: update to 1.0.4.

---
 srcpkgs/nomad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ddaf4f6b78e9..b89e3baf033d 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,6 +1,6 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.0.1
+version=1.0.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=1dca9ebb1636fc8ef005d9c6eed8cf10fbfc3d7c9ff7307606454142d858f419
+checksum=24f7d7853af6aa2c92645bddd0cbfa44797bc44d5375c4d53b52698d8c5968be
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From 7004d47042c1477b0438b3f6a8518d71bc69f081 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Wed, 3 Mar 2021 17:34:27 +0100
Subject: [PATCH 3102/3458] mDNSResponder: update to 1310.80.1.

---
 .../mDNSResponder/patches/Clients-dns-sd.c.patch | 16 ++++++++++++++++
 srcpkgs/mDNSResponder/template                   |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/mDNSResponder/patches/Clients-dns-sd.c.patch

diff --git a/srcpkgs/mDNSResponder/patches/Clients-dns-sd.c.patch b/srcpkgs/mDNSResponder/patches/Clients-dns-sd.c.patch
new file mode 100644
index 000000000000..54a373644e53
--- /dev/null
+++ b/srcpkgs/mDNSResponder/patches/Clients-dns-sd.c.patch
@@ -0,0 +1,16 @@
+--- Clients/dns-sd.c.orig	2021-01-26 20:47:47 UTC
++++ Clients/dns-sd.c
+@@ -58,11 +58,13 @@
+ //#define TEST_NEW_CLIENTSTUB 1
+ 
+ #include <ctype.h>
++#include <stdarg.h>         // For va_list
+ #include <stdio.h>          // For stdout, stderr
+ #include <stdlib.h>         // For exit()
+ #include <string.h>         // For strlen(), strcpy()
+ #include <errno.h>          // For errno, EINTR
+ #include <time.h>
++#include <sys/param.h>      // For MIN
+ #include <sys/types.h>      // For u_char
+ #ifdef APPLE_OSX_mDNSResponder
+ #include <inttypes.h>       // For PRId64
diff --git a/srcpkgs/mDNSResponder/template b/srcpkgs/mDNSResponder/template
index 2222dc1ad347..c0425e7b34ee 100644
--- a/srcpkgs/mDNSResponder/template
+++ b/srcpkgs/mDNSResponder/template
@@ -1,6 +1,6 @@
 # Template file for 'mDNSResponder'
 pkgname=mDNSResponder
-version=878.260.1
+version=1310.80.1
 revision=1
 hostmakedepends="flex byacc"
 short_desc="Implements the Bonjour/Zeroconf protocol"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://opensource.apple.com/"
 distfiles="https://opensource.apple.com/tarballs/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3cc71582e8eee469c2de8ecae1d769e7f32b3468dfb7f2ca77f1dee1f30a7d1e
+checksum=097662447e1535573484697861d9f50eceaf2c52ec2742e451ee6ffe9bbf3e75
 
 conf_files="/etc/nss_mdns.conf"
 conflicts="nss-mdns>=0"

From cdd2c1711a0e59237c92527768aa6891b15bc571 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:24:31 +0700
Subject: [PATCH 3103/3458] build-style/qmake: look for modules in target

- With this added, we can remove qt5*-devel from hostmakedepends
---
 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 90f541b7bd1c..25d62258f7fb 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -37,6 +37,7 @@ 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}

From e562b66524eda011ab59f58568541f391c448a6f 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 Mar 2021 21:42:07 +0700
Subject: [PATCH 3104/3458] srcpkgs: remove qt5-*-devel enmass from
 hostmakedepends

---
 srcpkgs/2048-qt/template               |  2 +-
 srcpkgs/FeatherPad/template            |  6 +-----
 srcpkgs/Fritzing/template              |  6 +-----
 srcpkgs/LibreCAD/template              |  3 +--
 srcpkgs/QLC+/template                  |  3 +--
 srcpkgs/UEFITool/template              |  2 +-
 srcpkgs/YACReader/template             |  4 +---
 srcpkgs/Z80Explorer/template           |  4 ----
 srcpkgs/actiona/template               |  7 +------
 srcpkgs/biblioteq/template             |  4 +---
 srcpkgs/chatterino2/template           | 18 ++++++++++++------
 srcpkgs/chessx/template                |  6 +-----
 srcpkgs/clipgrab/template              |  7 +------
 srcpkgs/cmst/template                  |  6 +-----
 srcpkgs/cool-retro-term/template       |  2 +-
 srcpkgs/cutechess-gui/template         |  6 +-----
 srcpkgs/cutter/template                |  3 +--
 srcpkgs/dialogbox/template             |  2 +-
 srcpkgs/eqonomize/template             |  5 +----
 srcpkgs/fingerprint-gui/template       |  2 --
 srcpkgs/fmit/template                  |  7 ++-----
 srcpkgs/focuswriter/template           |  6 +-----
 srcpkgs/gede/template                  |  6 +-----
 srcpkgs/ghostwriter/template           |  3 +--
 srcpkgs/goldendict/template            |  4 ----
 srcpkgs/imagewriter/template           |  6 +-----
 srcpkgs/jamulus/template               |  6 +-----
 srcpkgs/kristall/template              |  2 +-
 srcpkgs/kvantum/template               |  5 -----
 srcpkgs/leocad/template                |  2 +-
 srcpkgs/libcommuni/template            |  6 +-----
 srcpkgs/librepcb/template              |  4 ----
 srcpkgs/lumina/template                |  6 +-----
 srcpkgs/merkaartor/template            |  4 ----
 srcpkgs/minitube/template              |  6 +-----
 srcpkgs/mpc-qt/template                |  2 +-
 srcpkgs/mumble/template                |  4 ----
 srcpkgs/notepadqq/template             |  6 +-----
 srcpkgs/octoxbps/template              |  6 +-----
 srcpkgs/olive/template                 |  2 +-
 srcpkgs/openscad/template              |  6 +-----
 srcpkgs/orion/template                 |  6 +-----
 srcpkgs/pencil2d/template              |  6 +-----
 srcpkgs/phototonic/template            |  6 +-----
 srcpkgs/plume-creator/template         |  6 ------
 srcpkgs/qarma/template                 |  5 +----
 srcpkgs/qcas/template                  |  6 +-----
 srcpkgs/qdirstat/template              |  6 +-----
 srcpkgs/qgo/template                   |  6 +-----
 srcpkgs/qml-box2d/template             |  6 +-----
 srcpkgs/qmltermwidget/template         |  2 +-
 srcpkgs/qoauth-qt5/template            |  6 +-----
 srcpkgs/qownnotes/template             |  7 +------
 srcpkgs/qpdfview/template              |  2 +-
 srcpkgs/qscintilla-qt5/template        |  6 +-----
 srcpkgs/qt5-styleplugins/template      |  2 +-
 srcpkgs/qt5-webengine/template         |  7 +------
 srcpkgs/qt5-webview/template           |  2 +-
 srcpkgs/qt5ct/template                 |  6 +-----
 srcpkgs/qt5pas/template                |  6 +-----
 srcpkgs/qtav/template                  |  2 +-
 srcpkgs/qtcreator/template             | 10 +++-------
 srcpkgs/qtfm/template                  |  5 +----
 srcpkgs/quiterss/template              |  2 +-
 srcpkgs/qwt/template                   |  6 +-----
 srcpkgs/qxmledit/template              |  6 +-----
 srcpkgs/radeon-profile-daemon/template |  5 +----
 srcpkgs/radeon-profile/template        |  5 +----
 srcpkgs/retroshare/template            |  3 +--
 srcpkgs/rssguard/template              |  5 +----
 srcpkgs/shotcut/template               |  5 +----
 srcpkgs/signon-ui/template             |  2 +-
 srcpkgs/smtube/template                |  2 +-
 srcpkgs/stremio-shell/template         |  4 ----
 srcpkgs/texmaker/template              |  6 +-----
 srcpkgs/texstudio/template             |  5 +----
 srcpkgs/textosaurus/template           |  6 +-----
 srcpkgs/touchegg/template              |  6 +-----
 srcpkgs/vapoursynth-editor/template    |  6 +-----
 srcpkgs/vokoscreen/template            |  4 ----
 srcpkgs/wkhtmltopdf/template           |  7 +------
 srcpkgs/wpa_gui/template               |  2 +-
 srcpkgs/xaos/template                  |  2 +-
 srcpkgs/ykpers-gui/template            |  6 +-----
 srcpkgs/zrandr/template                |  5 +----
 85 files changed, 89 insertions(+), 324 deletions(-)

diff --git a/srcpkgs/2048-qt/template b/srcpkgs/2048-qt/template
index b8ce1f21fe8d..79b1342ff915 100644
--- a/srcpkgs/2048-qt/template
+++ b/srcpkgs/2048-qt/template
@@ -3,7 +3,7 @@ pkgname=2048-qt
 version=0.1.6
 revision=1
 build_style=qmake
-hostmakedepends="qt5-declarative-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-quickcontrols xdg-utils"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index 8558f2835382..cfff3296010f 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -3,7 +3,7 @@ pkgname=FeatherPad
 version=0.17.2
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-tools-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="libX11-devel libXext-devel qt5-x11extras-devel qt5-svg-devel hunspell-devel"
 short_desc="Lightweight Qt5 plain-text editor for Linux"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
@@ -11,7 +11,3 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
 checksum=2e706beeec7d2664b888bc908febae1e4bfe014b3c1d22aece6088a8d023d45c
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel qt5-svg-devel"
-fi
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index ea09c1b8d44c..d97ab1654a52 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -5,7 +5,7 @@ revision=5
 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
 wrksrc="fritzing-app-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-serialport-devel qt5-svg-devel boost-devel libgit2-devel"
 depends="qt5-plugin-sqlite"
 short_desc="Software for electronics prototyping"
@@ -17,10 +17,6 @@ distfiles="https://github.com/${pkgname}/${pkgname}-app/archive/${version}.tar.g
 checksum="2475a95aad2c1536eef3fdb72665c5c16590644b45bd110a0cde223c916625b8
  2d5882f0180d04c582ef418fd286bf1d04142409d316a4cd5c9ce3e2d91434dd"
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-serialport-devel qt5-svg-devel"
-fi
-
 post_extract() {
 	# looks for libgit2 and boost in the source tree
 	# make it use the system libraries
diff --git a/srcpkgs/LibreCAD/template b/srcpkgs/LibreCAD/template
index 26202b4a8b58..3a5224f907ee 100644
--- a/srcpkgs/LibreCAD/template
+++ b/srcpkgs/LibreCAD/template
@@ -3,7 +3,7 @@ pkgname=LibreCAD
 version=2.1.3
 revision=3
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config ImageMagick"
+hostmakedepends="qt5-qmake pkg-config ImageMagick qt5-host-tools"
 makedepends="qt5-devel qt5-svg-devel boost-devel muparser-devel librsvg-devel"
 short_desc="2D Computer-aided design (CAD) software"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
@@ -13,7 +13,6 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
 checksum=74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06
 
 if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
 	configure_args+=" BOOST_DIR=${XBPS_CROSS_BASE}/usr"
 fi
 
diff --git a/srcpkgs/QLC+/template b/srcpkgs/QLC+/template
index 0331d187d37d..38322eb305cc 100644
--- a/srcpkgs/QLC+/template
+++ b/srcpkgs/QLC+/template
@@ -4,8 +4,7 @@ version=4.12.3
 revision=1
 wrksrc=qlcplus-QLC-_$version
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-host-tools
- qt5-multimedia-devel qt5-script-devel"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="eudev-libudev-devel qt5-devel qt5-multimedia-devel
  qt5-script-devel alsa-lib-devel libftdi1-devel libusb-compat-devel
  libsndfile-devel libmad-devel"
diff --git a/srcpkgs/UEFITool/template b/srcpkgs/UEFITool/template
index ba5ae9dda41d..5ce8215f0ccd 100644
--- a/srcpkgs/UEFITool/template
+++ b/srcpkgs/UEFITool/template
@@ -4,7 +4,7 @@ version=A56
 revision=1
 build_wrksrc="UEFITool"
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel"
 short_desc="UEFI firmware image viewer and editor"
 maintainer="Kacper Słomiński <kacper.slominski72@gmail.com>"
diff --git a/srcpkgs/YACReader/template b/srcpkgs/YACReader/template
index e22b11bffddd..e49b201e6845 100644
--- a/srcpkgs/YACReader/template
+++ b/srcpkgs/YACReader/template
@@ -4,9 +4,7 @@ version=9.7.1
 revision=1
 wrksrc=yacreader-${version}
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-script-devel qt5-declarative-devel
- qt5-quickcontrols qt5-multimedia-devel poppler-qt5-devel
- libunarr-devel"
+hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-script-devel qt5-declarative-devel qt5-quickcontrols
  qt5-multimedia-devel poppler-qt5-devel qrencode-devel
  glu-devel libunarr-devel"
diff --git a/srcpkgs/Z80Explorer/template b/srcpkgs/Z80Explorer/template
index 1c7c52d8fbca..f11a0e970695 100644
--- a/srcpkgs/Z80Explorer/template
+++ b/srcpkgs/Z80Explorer/template
@@ -15,10 +15,6 @@ distfiles="https://github.com/gdevic/Z80Explorer/archive/v${version}.tar.gz>${pk
 checksum="8140eaeff215e49df2c0abb7c10f84c4c721adaced6a756d30e584348078b29b
  f6980e5bf3cadcc050d70a359fae7813d3d3b1805935a57dea564caed67b3192"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" ${makedepends}"
-fi
-
 post_extract() {
 	mv ../${pkgname}_Z80-${_z80_githash} resource
 	vsed -i ${pkgname}.pro -e "s;/opt/\$\${TARGET}/bin;/usr/libexec/${pkgname};"
diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index bd14f268aaef..e520d1eac996 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -3,7 +3,7 @@ pkgname=actiona
 version=3.10.1
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake"
+hostmakedepends="pkg-config qt5-plugin-mysql qt5-qmake qt5-host-tools"
 makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel
  qt5-multimedia-devel qt5-script-devel qt5-speech-devel qt5-tools-devel
  qt5-x11extras-devel qt5-xmlpatterns-devel"
@@ -15,11 +15,6 @@ homepage="https://actiona.tools/"
 distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=447065e380f8f37db4c8af01df8e1b9d7189cd256205f758845b71d8de6f37ea
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel qt5-multimedia-devel qt5-script-devel qt5-speech-devel"
-	hostmakedepends+=" qt5-tools-devel qt5-x11extras-devel qt5-xmlpatterns-devel"
-fi
-
 post_build() {
 	lrelease-qt5 locale/*.ts
 }
diff --git a/srcpkgs/biblioteq/template b/srcpkgs/biblioteq/template
index 742e7b012912..23f62e225ced 100644
--- a/srcpkgs/biblioteq/template
+++ b/srcpkgs/biblioteq/template
@@ -4,6 +4,7 @@ version=2020.01.01
 revision=1
 build_style=qmake
 configure_args="-o Makefile"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="libpqxx-devel qt5-devel poppler-cpp-devel poppler-qt5-devel
  sqlite-devel yaz-devel"
 depends="qt5-plugin-sqlite"
@@ -21,9 +22,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) configure_args+=" biblioteq.pro" ;;
 esac
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel poppler-cpp-devel"
-fi
 
 pre_configure() {
 	sed -i -e 's|biblioteq.conf|/etc/biblioteq.conf|' \
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 7aec8859d726..f69730b3a9fe 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -7,8 +7,10 @@ _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
 _serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-svg-devel qt5-multimedia-devel
- libcommuni-devel pkg-config"
+configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
+ INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
+ INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
+hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-svg-devel qt5-multimedia-devel
  boost-devel rapidjson libcommuni-devel websocketpp
  qtkeychain-qt5-devel"
@@ -34,10 +36,14 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 post_extract() {
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/"* lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/"* lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/"* lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/"* lib/serialize/
+	rmdir lib/signals
+	rmdir lib/settings
+	rmdir lib/humanize
+	rmdir lib/serialize
+	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
+	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
+	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
+	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
 }
 
 pre_configure() {
diff --git a/srcpkgs/chessx/template b/srcpkgs/chessx/template
index 774af4b4818a..5caec7718d73 100644
--- a/srcpkgs/chessx/template
+++ b/srcpkgs/chessx/template
@@ -3,7 +3,7 @@ pkgname=chessx
 version=1.5.6
 revision=1
 build_style=qmake
-hostmakedepends="qt5-tools"
+hostmakedepends="qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-speech-devel pulseaudio-devel"
 short_desc="Open Source chess database"
 maintainer="cipr3s <cipr3s@gmx.com>"
@@ -12,10 +12,6 @@ homepage="https://chessx.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz"
 checksum=d09a4b534a909c5f1a398c64065049a2fdf30497bc81ccbdf0d940412364d205
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-multimedia-devel qt5-speech-devel qt5-svg-devel"
-fi
-
 do_install() {
 	vinstall unix/${pkgname}.desktop 644 usr/share/applications
 	vinstall data/images/${pkgname}.png 644 usr/share/pixmaps
diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index d67d4a3c13c7..b234229ac805 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -4,6 +4,7 @@ version=3.9.6
 revision=1
 build_style=qmake
 configure_args=clipgrab.pro
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-webengine-devel qt5-webchannel-devel
  qt5-location-devel qt5-devel qt5-quickcontrols2-devel
  qt5-declarative-devel"
@@ -15,12 +16,6 @@ homepage="https://clipgrab.org"
 distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
 checksum=d6b42ed8687d3ca49b0b4b6e4312f0161cf2dbcd33e286e96be797bc30730d6d
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends=" qt5-location-devel qt5-quickcontrols2-devel
-	 qt5-declarative-devel qt5-webchannel-devel qt5-webengine-devel
-	 qt5-host-tools qt5-devel"
-fi
-
 do_install() {
 	vbin clipgrab
 	vinstall icon.png 644 usr/share/pixmaps clipgrab.png
diff --git a/srcpkgs/cmst/template b/srcpkgs/cmst/template
index 83ee03b44e40..4960f3645c9f 100644
--- a/srcpkgs/cmst/template
+++ b/srcpkgs/cmst/template
@@ -3,7 +3,7 @@ pkgname=cmst
 version=2020.11.01
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="connman"
 short_desc="Qt GUI for Connman"
@@ -13,10 +13,6 @@ homepage="https://github.com/andrew-bibb/cmst"
 distfiles="https://github.com/andrew-bibb/cmst/archive/${version}.tar.gz"
 checksum=0e445f81afdb51cd288653bc1597488d64846de9cc552f265c5b806716402adb
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 post_install() {
 	vlicense text/LICENSE
 }
diff --git a/srcpkgs/cool-retro-term/template b/srcpkgs/cool-retro-term/template
index 04e8ea5e5af0..797d4bbc86e3 100644
--- a/srcpkgs/cool-retro-term/template
+++ b/srcpkgs/cool-retro-term/template
@@ -3,7 +3,7 @@ pkgname=cool-retro-term
 version=1.1.1
 revision=1
 build_style=qmake
-hostmakedepends="automake qt5-qmake qt5-declarative-devel"
+hostmakedepends="automake qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-declarative-devel"
 depends="qt5-graphicaleffects qt5-quickcontrols qmltermwidget qt5-plugin-sqlite"
 short_desc="Good looking terminal emulator which mimics the old cathode display"
diff --git a/srcpkgs/cutechess-gui/template b/srcpkgs/cutechess-gui/template
index e3a5ccd6fcc7..aba0a87b0c4c 100644
--- a/srcpkgs/cutechess-gui/template
+++ b/srcpkgs/cutechess-gui/template
@@ -4,7 +4,7 @@ version=1.2.0
 revision=1
 wrksrc=cutechess-${version}
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-svg-devel"
 short_desc="GUI for playing chess"
 maintainer="Imran Khan <imrankhan@teknik.io>"
@@ -13,10 +13,6 @@ homepage="https://github.com/cutechess/cutechess"
 distfiles="https://github.com/cutechess/cutechess/archive/${version}.tar.gz"
 checksum=d0e1b2c9c2eaccf0f8c4d5e5fe7e169358f5de9606bd27de3f9d1ce4ddcdb0bc
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel qt5-svg-devel"
-fi
-
 do_install() {
 	vbin projects/gui/cutechess
 	vinstall dist/linux/cutechess.desktop 644 usr/share/applications
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index ed82d82ac9c7..7142c048f53c 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -5,8 +5,7 @@ revision=2
 build_wrksrc=src
 build_style=qmake
 configure_args="CUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/RadareOrg/Cutter/plugins"
-hostmakedepends="pkg-config qt5-declarative-devel qt5-location-devel
- qt5-svg-devel qt5-tools-devel radare2"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools radare2"
 makedepends="capstone-devel python3-devel qt5-declarative-devel
  qt5-location-devel qt5-svg-devel radare2"
 short_desc="GUI for radare2 written in C++ and QT"
diff --git a/srcpkgs/dialogbox/template b/srcpkgs/dialogbox/template
index 2c7f488cbf3d..bdf95c2ad451 100644
--- a/srcpkgs/dialogbox/template
+++ b/srcpkgs/dialogbox/template
@@ -3,7 +3,7 @@ pkgname=dialogbox
 version=1.0
 revision=2
 build_style=qmake
-hostmakedepends="qt5-host-tools qt5-devel"
+hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel"
 short_desc="Scriptable engine with customizable GUI for shell scripts"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
diff --git a/srcpkgs/eqonomize/template b/srcpkgs/eqonomize/template
index 85655e4ce90e..6b5c1b6b7f7d 100644
--- a/srcpkgs/eqonomize/template
+++ b/srcpkgs/eqonomize/template
@@ -3,6 +3,7 @@ pkgname=eqonomize
 version=1.5.0
 revision=1
 build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-charts-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Personal accounting software, with focus on efficiency and ease of use"
@@ -12,7 +13,3 @@ homepage="http://eqonomize.github.io"
 changelog="https://raw.githubusercontent.com/Eqonomize/Eqonomize/master/ChangeLog"
 distfiles="https://github.com/Eqonomize/Eqonomize/releases/download/v${version}/${pkgname}-${version}.tar.gz"
 checksum=6ca5383d49f65aa521faf4103b7d2910bad9dd277319a1ce4d92669d2d490672
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="qt5-charts-devel"
-fi
diff --git a/srcpkgs/fingerprint-gui/template b/srcpkgs/fingerprint-gui/template
index a17832fe13f9..08d226569eb8 100644
--- a/srcpkgs/fingerprint-gui/template
+++ b/srcpkgs/fingerprint-gui/template
@@ -23,8 +23,6 @@ if [ "$CROSS_BUILD" ]; then
 	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtGui"
 	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets"
 	CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5/QtXml"
-
-	hostmakedepends="qt5-x11extras-devel"
 fi
 
 # This one is needed even when out of cross-compilation
diff --git a/srcpkgs/fmit/template b/srcpkgs/fmit/template
index a3d59f8c5e6d..246dceb594d3 100644
--- a/srcpkgs/fmit/template
+++ b/srcpkgs/fmit/template
@@ -5,7 +5,7 @@ revision=1
 build_style=qmake
 configure_args="CONFIG+=acs_qt CONFIG+=$(vopt_if alsa acs_alsa)
  CONFIG+=$(vopt_if jack acs_jack) CONFIG+=$(vopt_if portaudio acs_portaudio)"
-hostmakedepends="itstool pkg-config qt5-tools gettext"
+hostmakedepends="itstool pkg-config qt5-tools gettext qt5-qmake qt5-host-tools"
 makedepends="$(vopt_if alsa alsa-lib-devel) fftw-devel $(vopt_if jack jack-devel)
  $(vopt_if portaudio portaudio-devel) pulseaudio-devel qt5-multimedia-devel
  qt5-svg-devel"
@@ -19,7 +19,4 @@ checksum=8dc123c84c19d6a9a62b303015255718705d5b0b8448a330d3815dd7f9688b02
 
 build_options="alsa jack portaudio"
 build_options_default="alsa jack portaudio"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-multimedia-devel qt5-svg-devel"
-fi
+desc_option_portaudio="Cross-platform audio API"
diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template
index 9bb4a5e9c549..6fb6e7f99355 100644
--- a/srcpkgs/focuswriter/template
+++ b/srcpkgs/focuswriter/template
@@ -3,7 +3,7 @@ pkgname=focuswriter
 version=1.7.6
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="hunspell-devel pulseaudio-devel qt5-multimedia-devel"
 short_desc="Simple, distraction-free word processor with a hide-away interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,7 +11,3 @@ license="GPL-3.0-or-later"
 homepage="https://gottcode.org/focuswriter/"
 distfiles="https://github.com/gottcode/focuswriter/archive/v${version}.tar.gz"
 checksum=bbf70def7d86ee18cabe9f8ac3922ebbf4dfdb36893df3e6fa3e026acfcb2057
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-multimedia-devel"
-fi
diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template
index 2d30af7ff9d1..5cb8bbcec9d4 100644
--- a/srcpkgs/gede/template
+++ b/srcpkgs/gede/template
@@ -4,7 +4,7 @@ version=2.16.2
 revision=1
 build_wrksrc=src
 build_style=qmake
-hostmakedepends="python qt5-qmake"
+hostmakedepends="python qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="gdb ctags"
 short_desc="Graphical frontend (GUI) to GDB written in Qt"
@@ -14,10 +14,6 @@ homepage="http://acidron.com/gede"
 distfiles="http://gede.acidron.com/uploads/source/${pkgname}-${version}.tar.xz"
 checksum=32c390099d9755ec54836a04ef82ffcd315bd6912525714f626b3eb87db248a1
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 do_install() {
 	cd $wrksrc
 	python2 build.py install --prefix="${PKGDESTDIR}/usr" install
diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index 1dae729b6d29..4219a7f13aee 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -3,8 +3,7 @@ pkgname=ghostwriter
 version=1.8.1
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-multimedia-devel qt5-svg-devel qt5-webengine-devel
- qt5-webchannel-devel qt5-location-devel qt5-declarative-devel"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="hunspell-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
  qt5-webengine-devel qt5-location-devel qt5-webchannel-devel qt5-declarative-devel"
 depends="hicolor-icon-theme qt5-svg"
diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template
index ee79a69133f1..7553e408d1a7 100644
--- a/srcpkgs/goldendict/template
+++ b/srcpkgs/goldendict/template
@@ -19,10 +19,6 @@ checksum=bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde
 
 CXXFLAGS="-Wno-deprecated"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-tools-devel qt5-webkit-devel qt5-host-tools qt5-svg-devel qt5-x11extras-devel"
-fi
-
 post_install() {
 	chmod 644 ${DESTDIR}/usr/share/pixmaps/goldendict.png
 }
diff --git a/srcpkgs/imagewriter/template b/srcpkgs/imagewriter/template
index 7b82d4f8db04..cd4d3c9af695 100644
--- a/srcpkgs/imagewriter/template
+++ b/srcpkgs/imagewriter/template
@@ -6,6 +6,7 @@ _commit=1d253d960a28f9de4468b0b091c231083f03c1c8
 wrksrc="${pkgname}-${_commit}"
 build_style=qmake
 configure_args="DEFINES=USEUDISKS2"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="desktop-file-utils hicolor-icon-theme udisks2"
 short_desc="Graphical utility for writing raw disk images & hybrid isos to USB keys"
@@ -14,8 +15,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/openSUSE/imagewriter"
 distfiles="https://github.com/openSUSE/imagewriter/archive/${_commit}.tar.gz"
 checksum=7761ee45b16b5841c6b62b091c7f9d0b8c64b14b79d77e9909ca813e1dc9885d
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends="qt5-devel"
-fi
-
diff --git a/srcpkgs/jamulus/template b/srcpkgs/jamulus/template
index 1df45532ce14..098aa9e0d774 100644
--- a/srcpkgs/jamulus/template
+++ b/srcpkgs/jamulus/template
@@ -6,7 +6,7 @@ _version=r${version//./_}
 wrksrc=${pkgname}-${_version}
 build_style=qmake
 configure_args="Jamulus.pro"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel jack-devel"
 short_desc="Play music online. With friends. For free"
 maintainer="KawaiiAmber <japaneselearning101@gmail.com>"
@@ -14,7 +14,3 @@ 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/kristall/template b/srcpkgs/kristall/template
index 1455af6d35bf..a3690383d148 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -4,7 +4,7 @@ version=0.3
 revision=2
 build_wrksrc=src
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel"
 short_desc="Small-Internet Browser"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 34edc24474bb..e8f6c43262ac 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -16,11 +16,6 @@ distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
 checksum=79752525b5636009385864373618e5e747a9fa7047af46d7815e27934c9a3dfd
 nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/21436/steps/shell_3/logs/stdio"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel qt5-svg-devel qt5-x11extras-devel
-	 kwindowsystem-devel"
-fi
-
 post_install() {
 	vdoc doc/Theme-Config.pdf
 	vdoc doc/Theme-Making.pdf
diff --git a/srcpkgs/leocad/template b/srcpkgs/leocad/template
index fa8a093c6c05..9981eaeb3672 100644
--- a/srcpkgs/leocad/template
+++ b/srcpkgs/leocad/template
@@ -5,7 +5,7 @@ revision=1
 _lib_version=20.03
 build_style=qmake
 configure_args="DISABLE_UPDATE_CHECK=1"
-hostmakedepends="qt5-tools-devel unzip"
+hostmakedepends="qt5-host-tools qt5-qmake unzip"
 makedepends="qt5-devel MesaLib-devel"
 short_desc="CAD program for creating virtual LEGO models"
 maintainer="teldra <teldra@rotce.de>"
diff --git a/srcpkgs/libcommuni/template b/srcpkgs/libcommuni/template
index af668a3628b2..eb1dc92d319f 100644
--- a/srcpkgs/libcommuni/template
+++ b/srcpkgs/libcommuni/template
@@ -4,7 +4,7 @@ version=3.5.0
 revision=1
 build_style=qmake
 configure_args="-config release"
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel"
 short_desc="Cross-platform IRC framework written with Qt"
 maintainer="John Regan <john@jrjrtech.com>"
@@ -14,10 +14,6 @@ changelog="https://raw.githubusercontent.com/communi/libcommuni/master/CHANGELOG
 distfiles="https://github.com/communi/libcommuni/archive/v${version}.tar.gz"
 checksum=cc0690129c7963578df9be2127ca5ba9f1e182bfe6c138d84612382e2dc80177
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-declarative-devel"
-fi
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index 68f1ba250f86..670b1bf77a18 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -12,7 +12,3 @@ license="GPL-3.0-or-later"
 homepage="https://librepcb.org"
 distfiles="https://download.librepcb.org/releases/${version}/${pkgname}-${version}-source.zip"
 checksum=f956dfa5b9ad1faffcab7f5dd03f158c2b97a7c82cfc9a09dc4066cbcf0db76a
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
diff --git a/srcpkgs/lumina/template b/srcpkgs/lumina/template
index fb495107e0ba..ed7ef97adfba 100644
--- a/srcpkgs/lumina/template
+++ b/srcpkgs/lumina/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=2
 build_style=qmake
 configure_args="QT5LIBDIR=/usr/lib/qt5 L_ETCDIR=/etc CONFIG+=WITH_I18N"
-hostmakedepends="qt5-host-tools"
+hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-x11extras-devel qt5-multimedia-devel qt5-svg-devel
  qt5-declarative-devel libXrender-devel libXcomposite-devel libXcursor-devel libXdamage-devel
  xcb-util-devel xcb-util-wm-devel xcb-util-image-devel pulseaudio-devel poppler-qt5-devel"
@@ -17,10 +17,6 @@ distfiles="https://github.com/lumina-desktop/lumina/archive/v${version}.tar.gz"
 checksum=f3512fca4d05e3cf3a6ac106f0f16c9618bda9fa546f1d23ffb0eab9a5ce7c8a
 replaces="lumina-git>=0"
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-tools-devel qt5-x11extras-devel qt5-multimedia-devel qt5-svg-devel poppler-qt5-devel"
-fi
-
 post_install() {
 	vlicense LICENSE
 }
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index 4bc96d225c76..17c8d5dc361d 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -15,7 +15,3 @@ distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz
 checksum=16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a
 
 CXXFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel qt5-webkit-devel"
-fi
diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template
index 23ef018ad9f5..ab5cc6591448 100644
--- a/srcpkgs/minitube/template
+++ b/srcpkgs/minitube/template
@@ -3,7 +3,7 @@ pkgname=minitube
 version=3.7
 revision=1
 build_style=qmake
-hostmakedepends="qt5-tools qt5-qmake git"
+hostmakedepends="qt5-tools qt5-host-tools qt5-qmake git"
 makedepends="qt5-devel phonon-qt5-devel qt5-script-devel qt5-declarative-devel
  qt5-plugin-sqlite qt5-x11extras-devel mpv-devel"
 depends="virtual?phonon-qt5-backend desktop-file-utils hicolor-icon-theme"
@@ -14,10 +14,6 @@ homepage="http://flavio.tordini.org/minitube"
 distfiles="https://github.com/flaviotordini/minitube/releases/download/${version}/minitube-${version}.tar.bz2"
 checksum=a8dd0db3f3f8172abc1ea940d3bf533e87c9a4f8a1df2ce38ff2e0cda728107e
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel qt5-declarative-devel"
-fi
-
 pre_configure() {
 	# Provided by Gottox
 	local _api_key=AIzaSyBzMj41taMuHLAF95-y9cTXL4JpPGqMORk
diff --git a/srcpkgs/mpc-qt/template b/srcpkgs/mpc-qt/template
index 28651df5cf43..3e60cb06c896 100644
--- a/srcpkgs/mpc-qt/template
+++ b/srcpkgs/mpc-qt/template
@@ -4,7 +4,7 @@ version=18.08
 revision=1
 build_style=qmake
 configure_args="MPCQT_VERSION=${version}"
-hostmakedepends="pkg-config qt5-qmake qt5-x11extras-devel"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-x11extras-devel mpv-devel"
 short_desc="Clone of Media Player Classic reimplemented in Qt"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 5493688b12eb..7d2c8641571f 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -23,10 +23,6 @@ checksum=615f4ebfc3385d945163f369efd3e910c8b6d0f025797a7eed541515fccb6093
 build_options="jack"
 desc_option_jack="Enable support for the JACK sound server"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
-
 do_install() {
 	vlicense LICENSE
 	vmkdir usr/lib/mumble
diff --git a/srcpkgs/notepadqq/template b/srcpkgs/notepadqq/template
index 12ab7b5fd1f7..8a16e31d31e5 100644
--- a/srcpkgs/notepadqq/template
+++ b/srcpkgs/notepadqq/template
@@ -3,7 +3,7 @@ pkgname=notepadqq
 version=1.4.8
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-tools"
+hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel qt5-webkit-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -13,10 +13,6 @@ license="GPL-3.0-or-later"
 distfiles="https://github.com/notepadqq/notepadqq/archive/v${version}.tar.gz"
 checksum=13fba9abd84c59de27fbe92f74e2763b57588fcf9c88af10ec67313b0abbc9d0
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel qt5-webkit-devel"
-fi
-
 post_install() {
 	# no need for upstream's weird magic, leads to segfaults anyway
 	rm "${DESTDIR}/usr/bin/notepadqq"
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index f6bfc401a7fa..135429b01176 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -3,7 +3,7 @@ pkgname=octoxbps
 version=0.3.0
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="qt5-declarative-devel qtermwidget-devel"
 depends="curl sudo"
 short_desc="Qt-based XBPS front-end"
@@ -14,10 +14,6 @@ changelog="https://raw.githubusercontent.com/aarnt/octoxbps/master/CHANGELOG"
 distfiles="https://github.com/aarnt/octoxbps/archive/v${version}.tar.gz"
 checksum=3c3e1b58c7211a5ef4aac1b1a2f9d71891404b41963f683efccc0f43165c8313
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-declarative-devel"
-fi
-
 post_configure() {
 	local qmake_args
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template
index 6ae58b4b100a..11468a8b04cf 100644
--- a/srcpkgs/olive/template
+++ b/srcpkgs/olive/template
@@ -3,7 +3,7 @@ pkgname=olive
 version=0.1.2
 revision=2
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel pkg-config"
+hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel ffmpeg-devel frei0r-plugins"
 short_desc="Non-linear video editor"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 49fed1660be0..5e846402ddd3 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -3,7 +3,7 @@ pkgname=openscad
 version=2019.05
 revision=3
 build_style=qmake
-hostmakedepends="bison flex pkg-config gettext qt5-qmake"
+hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
 makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
  qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
 short_desc="Solid 3D CAD modeller"
@@ -12,7 +12,3 @@ license="GPL-2.0-or-later"
 homepage="http://www.openscad.org"
 distfiles="http://files.openscad.org/${pkgname}-${version}.src.tar.gz"
 checksum=0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-multimedia-devel"
-fi
diff --git a/srcpkgs/orion/template b/srcpkgs/orion/template
index 0348a824fc60..d69f2ff04dd4 100644
--- a/srcpkgs/orion/template
+++ b/srcpkgs/orion/template
@@ -3,7 +3,7 @@ pkgname=orion
 version=1.6.7
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols2-devel mpv-devel"
 depends="qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects qt5-svg"
 short_desc="Qt-based client for Twitch.tv"
@@ -13,10 +13,6 @@ homepage="https://github.com/alamminsalo/orion"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=19d9c170d0bcf21d47947704d8c8e927cff5140f94cb840b51d2b8574b0149fb
 
-if [ "$CROSS_BUILD" ];then
-	hostmakedepends+=" qt5-host-tools qt5-declarative-devel qt5-svg-devel qt5-quickcontrols2-devel"
-fi
-
 do_install() {
 	vbin orion
 	vinstall distfiles/Orion.desktop 644 usr/share/applications/
diff --git a/srcpkgs/pencil2d/template b/srcpkgs/pencil2d/template
index 435c39a01a93..048dad18db97 100644
--- a/srcpkgs/pencil2d/template
+++ b/srcpkgs/pencil2d/template
@@ -4,7 +4,7 @@ version=0.6.5
 revision=1
 wrksrc=pencil-${version}
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-xmlpatterns-devel qt5-svg-devel qt5-multimedia-devel"
 depends="hicolor-icon-theme ffmpeg qt5-svg qt5-xmlpatterns"
 short_desc="Easy, intuitive tool to make 2D hand-drawn animations"
@@ -14,7 +14,3 @@ homepage="https://pencil2d.org/"
 changelog="https://raw.githubusercontent.com/pencil2d/pencil/master/ChangeLog.md"
 distfiles="https://github.com/${pkgname}/pencil/archive/v${version}.tar.gz"
 checksum=31903c54c8f0a79385cc5f519b380d26524219984e619204820b946c96fc2482
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-xmlpatterns-devel qt5-svg-devel qt5-multimedia-devel"
-fi
diff --git a/srcpkgs/phototonic/template b/srcpkgs/phototonic/template
index 2c4385411816..77ae8bf6a440 100644
--- a/srcpkgs/phototonic/template
+++ b/srcpkgs/phototonic/template
@@ -3,7 +3,7 @@ pkgname=phototonic
 version=2.1
 revision=3
 build_style=qmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel exiv2-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-imageformats"
 short_desc="Lightweight image viewer and organizer for Qt5"
@@ -12,7 +12,3 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/oferkv/phototonic"
 distfiles="https://github.com/oferkv/phototonic/archive/v${version}.tar.gz"
 checksum=a8b2dbc81750efabb65a4732b1704641afd4a4f772ef9c90817871ca2a52f5ef
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template
index 1859404c5e46..3c415a06cdd8 100644
--- a/srcpkgs/plume-creator/template
+++ b/srcpkgs/plume-creator/template
@@ -21,12 +21,6 @@ checksum="
  f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c
  7d473ee7283bc311c7d4dd3311d1e7726df7d45fa0123894265f355b436298e1"
 
-if [  "$CROSS_BUILD" ]; then
-	hostmakedepends+="
- qt5-multimedia-devel qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel hunspell-devel
- libzip-devel quazip-devel"
-fi
-
 post_extract() {
 	mv -f ${wrksrc}/../debian ${wrksrc}/
 	mv -f ${wrksrc}/../resources/themes ${wrksrc}/
diff --git a/srcpkgs/qarma/template b/srcpkgs/qarma/template
index 73ff50d6df8f..40351ba5c360 100644
--- a/srcpkgs/qarma/template
+++ b/srcpkgs/qarma/template
@@ -5,6 +5,7 @@ revision=1
 build_style=qmake
 provides="zenity-${version}_${revision}"
 replaces="zenity>=0"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-x11extras-devel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Tool to create dialog boxes, based on Qt"
@@ -13,10 +14,6 @@ license="GPL-2"
 distfiles="https://github.com/luebking/qarma/archive/${version}.tar.gz"
 checksum=ebce381d2884e4109998bc4a966f1eb08cc549b2725b0f4c5525b30849754794
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel"
-fi
-
 post_install() {
 	ln -s /usr/bin/qarma ${DESTDIR}/usr/bin/zenity
 }
diff --git a/srcpkgs/qcas/template b/srcpkgs/qcas/template
index fad8bda9e406..6c6349022253 100644
--- a/srcpkgs/qcas/template
+++ b/srcpkgs/qcas/template
@@ -4,7 +4,7 @@ version=0.5.3
 revision=1
 build_style=qmake
 configure_args="qcas.pro"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="giac-devel qt5-svg-devel"
 depends="desktop-file-utils giac"
 short_desc="The QT frontend to Giac/Xcas"
@@ -14,10 +14,6 @@ homepage="http://webusers.imj-prg.fr/~frederic.han/qcas/"
 distfiles="https://git.tuxfamily.org/qcas/qcas.git/snapshot/qcas-${version}.tar.gz"
 checksum=06bc5aca9f6e367e75181c633a7d1f3e199f8c7b336c1d43bcafdf41f2cb807c
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
-
 do_install() {
 	vbin qcas
 	vinstall debian/qcas.desktop 644 usr/share/applications
diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template
index 4baa801f60b0..070bd37742bf 100644
--- a/srcpkgs/qdirstat/template
+++ b/srcpkgs/qdirstat/template
@@ -3,7 +3,7 @@ pkgname=qdirstat
 version=1.7
 revision=2
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="zlib-devel qt5-devel"
 short_desc="Qt-based directory statistics (KDirStat without any KDE)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -12,10 +12,6 @@ homepage="https://github.com/shundhammer/qdirstat"
 distfiles="https://github.com/shundhammer/qdirstat/archive/${version}.tar.gz"
 checksum=9a8ec22a19290794147f727bca27deb7e02b4d9c537deb2fd0d3e647621f8c4a
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 post_install() {
 	vman man/qdirstat.1
 }
diff --git a/srcpkgs/qgo/template b/srcpkgs/qgo/template
index be4854302024..82e76ecfafb1 100644
--- a/srcpkgs/qgo/template
+++ b/srcpkgs/qgo/template
@@ -3,7 +3,7 @@ pkgname=qgo
 version=2.1.1
 revision=1
 build_style=qmake
-hostmakedepends="git qt5-qmake qt5-tools"
+hostmakedepends="git qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel qt5-multimedia-devel pulseaudio-devel"
 short_desc="Go/Weiqi/Baduk client that supports the IGS, GTP and SGF protocols"
 maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -11,7 +11,3 @@ license="GPL-2"
 homepage="https://github.com/pzorin/qgo"
 distfiles="https://github.com/xelxebar/${pkgname}/archive/v${version}.tar.gz"
 checksum="e4a36f92abded9536e2bedb5748fd3aba6d150248b1b26a6985763dc4c15434e"
-
-if [ -n "${CROSS_BUILD}" ]; then
-	hostmakedepends+=" qt5-multimedia-devel"
-fi
diff --git a/srcpkgs/qml-box2d/template b/srcpkgs/qml-box2d/template
index 99d599a1b351..2c213c732db1 100644
--- a/srcpkgs/qml-box2d/template
+++ b/srcpkgs/qml-box2d/template
@@ -5,6 +5,7 @@ revision=1
 _commit=b7212d5640701f93f0cd88fbd3a32c619030ae62
 wrksrc="qml-box2d-${_commit}"
 build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel"
 short_desc="Box2D QML plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,11 +13,6 @@ license="Zlib"
 homepage="https://github.com/qml-box2d/qml-box2d"
 distfiles="https://github.com/qml-box2d/qml-box2d/archive/${_commit}.tar.gz"
 checksum=a9071d2a85aafe74cb431e12888cfb92bd19cb91f4f577edd73cd9692d5e152f
-nocross='some things do get wrongly installed into $DESTDIR/$XBPS_CROSS_BASE'
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-declarative-devel"
-fi
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/qmltermwidget/template b/srcpkgs/qmltermwidget/template
index 60de10dfef87..8a5b2fa230eb 100644
--- a/srcpkgs/qmltermwidget/template
+++ b/srcpkgs/qmltermwidget/template
@@ -3,7 +3,7 @@ pkgname=qmltermwidget
 version=0.2.0
 revision=1
 build_style=qmake
-hostmakedepends="qt5-declarative-devel qt5-qmake"
+hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-declarative-devel"
 short_desc="QML port of qtermwidget"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
diff --git a/srcpkgs/qoauth-qt5/template b/srcpkgs/qoauth-qt5/template
index f9fcb6da9057..d5f3f388e1e4 100644
--- a/srcpkgs/qoauth-qt5/template
+++ b/srcpkgs/qoauth-qt5/template
@@ -5,7 +5,7 @@ revision=1
 _gitrev=4b01e9fa5198f9e175f5e8e19868b32101f22b98
 wrksrc="qoauth-${_gitrev}"
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qca-qt5-devel"
 short_desc="Support with OAuth-powered network services"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -16,10 +16,6 @@ checksum=9eef13bd6095d68ba7902514b300c23cb81a69a090ba82ced9d7cdf76a65d8e4
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/Qca-qt5/QtCrypto"
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 pre_configure() {
 	sed -i src/src.pro tests/*/*.pro \
 		-e 's|lib64|lib|' \
diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index 2e5804491514..6b6744b76870 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -3,7 +3,7 @@ pkgname=qownnotes
 version=20.12.0
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-qmake"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="botan-devel qt5-declarative-devel qt5-svg-devel
  qt5-xmlpatterns-devel qt5-websockets-devel qt5-x11extras-devel"
 depends="qt5-plugin-sqlite"
@@ -15,11 +15,6 @@ changelog="https://www.qownnotes.org/changelog/QOwnNotes"
 distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
 checksum=c21352a876fb3cb6cb58fb05536f78ab061b79fec8ced055ff7c9a285674898d
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-declarative-devel qt5-svg-devel
-	 qt5-xmlpatterns-devel qt5-websockets-devel qt5-x11extras-devel"
-fi
-
 pre_build() {
 	sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
 }
diff --git a/srcpkgs/qpdfview/template b/srcpkgs/qpdfview/template
index a9a7efb726d2..19cb2bb34ad9 100644
--- a/srcpkgs/qpdfview/template
+++ b/srcpkgs/qpdfview/template
@@ -4,7 +4,7 @@ version=0.4.18
 revision=2
 build_style=qmake
 configure_args="qpdfview.pro"
-hostmakedepends="pkg-config qt5-host-tools qt5-svg-devel"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="cups-devel djvulibre-devel file-devel libspectre-devel
  poppler-qt5-devel qt5-svg-devel qt5-tools-devel"
 depends="desktop-file-utils hicolor-icon-theme qt5-plugin-sqlite qt5-svg"
diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template
index e7eac8a82f46..5bc6c8530757 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="QScintilla_gpl-${version}"
 build_wrksrc=Qt4Qt5
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 short_desc="Qt5 port of Neil Hodgson's Scintilla C++ editor class"
 maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
@@ -14,10 +14,6 @@ homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"
 checksum=029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="qt5-devel"
-fi
-
 qscintilla-qt5-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index be8a125b466c..98991b16fa39 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -5,7 +5,7 @@ revision=15
 _gitrev=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
 depends="qt5-core>=5.15.2<5.15.3"
 short_desc="Additional style plugins for Qt5"
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index b49665122bb2..edc84557bd3e 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -12,7 +12,7 @@ configure_args="--
  -webengine-kerberos -no-webengine-embedded-build"
 # Rely on auto detection (fails if forced for cross builds) -webengine-alsa
 hostmakedepends="qt5-qmake gperf ninja qt5-host-tools flex pkg-config
- which perl python protobuf"
+ which perl python protobuf nss-devel libevent-devel zlib-devel icu-devel"
 makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  qt5-declarative-devel libevent-devel snappy-devel icu-devel ffmpeg-devel
  libwebp-devel opus-devel cups-devel nss-devel minizip-devel libxslt-devel
@@ -36,11 +36,6 @@ if [ "$build_option_sndio" ]; then
 	configure_args+=" -sndio"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" nss-devel libevent-devel qt5-location-devel
-	 qt5-declarative-devel"
-fi
-
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
diff --git a/srcpkgs/qt5-webview/template b/srcpkgs/qt5-webview/template
index fc2265296fca..807f4d0504c7 100644
--- a/srcpkgs/qt5-webview/template
+++ b/srcpkgs/qt5-webview/template
@@ -4,7 +4,7 @@ version=5.15.2
 revision=1
 wrksrc="qtwebview-everywhere-src-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake perl qt5-declarative-devel"
+hostmakedepends="qt5-qmake perl qt5-host-tools"
 makedepends="qt5-location-devel qt5-webchannel-devel qt5-tools-devel qt5-declarative-devel
  $(vopt_if webengine qt5-webengine-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 4dc23eb21817..02f6e9442fee 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -3,7 +3,7 @@ pkgname=qt5ct
 version=1.1
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-tools"
+hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
 makedepends="qt5-devel"
 depends="qt5-svg"
 short_desc="Qt5 Configuration Tool"
@@ -13,10 +13,6 @@ homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
 checksum=af77c4dbf7f9ba97fe0218648167395bca7bcb2b9c1886a9c98b1e343127ddd2
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 post_install() {
 	vlicense COPYING
 	vinstall ${FILESDIR}/qt5ct.sh 644 etc/profile.d
diff --git a/srcpkgs/qt5pas/template b/srcpkgs/qt5pas/template
index 0d8c75b92404..93113c717035 100644
--- a/srcpkgs/qt5pas/template
+++ b/srcpkgs/qt5pas/template
@@ -4,7 +4,7 @@ version=2.6~beta
 revision=2
 wrksrc=cbindings
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qt5-x11extras-devel"
 short_desc="Qt5 interface bindings for Pascal"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -13,10 +13,6 @@ homepage="https://svn.freepascal.org/svn/lazarus/trunk/lcl/interfaces/qt5/cbindi
 distfiles="${DEBIAN_SITE}/main/libq/libqtpas/libqtpas_${version}.orig.tar.xz"
 checksum=fcc5f695d60d5f72bf501b2fa779e8a1a2636c8d991270b5b3fef3d0e990365c
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel qt5-x11extras-devel"
-fi
-
 post_install() {
 	vinstall qt5.pas 0644 usr/share/pascal/qt5
 }
diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template
index 5687942f7f58..0d85ec076482 100644
--- a/srcpkgs/qtav/template
+++ b/srcpkgs/qtav/template
@@ -4,7 +4,7 @@ version=1.13.0
 revision=1
 wrksrc="QtAV-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-host-tools qt5-svg-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="ffmpeg-devel libass-devel libopenal-devel
  libva-glx-devel libXv-devel pulseaudio-devel
  qt5-declarative-devel qt5-svg-devel
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index cb7bdd6cf539..6080b0da508b 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -5,9 +5,10 @@ revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=qmake
 make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
-hostmakedepends="clang llvm perl pkg-config python3 which"
+hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
+ qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols"
+ qt5-quickcontrols clang llvm"
 depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
 short_desc="Cross-platform IDE for Qt developers"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -18,11 +19,6 @@ checksum=ef6fdcbaebb0d3d37cfdbc68f8b9e94ffeb6f63194564da5ce77760bb7790367
 replaces="qtcreator-data>=0"
 python_version=3
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-declarative-devel qt5-host-tools qt5-script-devel qt5-tools-devel"
-	makedepends+=" clang llvm"
-fi
-
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
diff --git a/srcpkgs/qtfm/template b/srcpkgs/qtfm/template
index f7d177a9339e..fad60da4d104 100644
--- a/srcpkgs/qtfm/template
+++ b/srcpkgs/qtfm/template
@@ -4,6 +4,7 @@ version=6.2.0
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="hicolor-icon-theme"
 short_desc="Lightweight file manager for Linux desktops based on pure Qt"
@@ -13,7 +14,3 @@ homepage="https://github.com/rodlie/qtfm"
 changelog="https://raw.githubusercontent.com/rodlie/qtfm/master/ChangeLog"
 distfiles="https://github.com/rodlie/qtfm/archive/${version}.tar.gz"
 checksum=58c6af502b606e63f96e8aec96b65ca9125be18ecdd5e4680ccaf50e9c40b064
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
diff --git a/srcpkgs/quiterss/template b/srcpkgs/quiterss/template
index 1072961760fe..3c655713acd9 100644
--- a/srcpkgs/quiterss/template
+++ b/srcpkgs/quiterss/template
@@ -3,7 +3,7 @@ pkgname=quiterss
 version=0.19.4
 revision=1
 build_style=qmake
-hostmakedepends="pkg-config qt5-qmake qt5-webkit-devel qt5-multimedia-devel"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="sqlite-devel qt5-webkit-devel qt5-multimedia-devel"
 short_desc="Open-source cross-platform RSS/Atom news feeds reader"
 maintainer="toluschr <toluschr@protonmail.com>"
diff --git a/srcpkgs/qwt/template b/srcpkgs/qwt/template
index d3b3645dcc9f..0e96184000ee 100644
--- a/srcpkgs/qwt/template
+++ b/srcpkgs/qwt/template
@@ -3,7 +3,7 @@ pkgname=qwt
 version=6.1.4
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-svg-devel"
 short_desc="Qt Widgets for Technical Applications"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
@@ -12,10 +12,6 @@ homepage="http://qwt.sourceforge.net/"
 distfiles="https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
 checksum=1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-tools-devel qt5-svg-devel"
-fi
-
 pre_configure() {
 	sed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
 		-e '/^QWT_INSTALL_DOCS/ s|/doc|/share/doc/qwt|' \
diff --git a/srcpkgs/qxmledit/template b/srcpkgs/qxmledit/template
index 64dd9adcac21..7b025b26cab5 100644
--- a/srcpkgs/qxmledit/template
+++ b/srcpkgs/qxmledit/template
@@ -9,6 +9,7 @@ configure_args="QXMLEDIT_INST_DATA_DIR=/usr/share/qxmledit
  QXMLEDIT_INST_LIB_DIR=/usr/lib
  QXMLEDIT_INST_TRANSLATIONS_DIR=/usr/share/qxmledit/translations
  QXMLEDIT_INST_INCLUDE_DIR=/usr/include/qxmledit"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="glu-devel qt5-devel qt5-declarative-devel qt5-scxml-devel
  qt5-script-devel qt5-svg-devel qt5-xmlpatterns-devel"
 short_desc="Simple XML Editor"
@@ -18,11 +19,6 @@ homepage="https://qxmledit.org/"
 distfiles="https://github.com/lbellonda/qxmledit/archive/${version}.tar.gz"
 checksum=e86443d640b2d2486b8278a200e098425c52607f82908a1b5676c42af057caa8
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel qt5-declarative-devel qt5-scxml-devel
-	 qt5-script-devel qt5-svg-devel qt5-xmlpatterns-devel"
-fi
-
 post_install() {
 	vlicense external/qwtplot3d/license.txt
 	vmkdir usr/share/appdata
diff --git a/srcpkgs/radeon-profile-daemon/template b/srcpkgs/radeon-profile-daemon/template
index 63adcb66672e..3e69062fdee4 100644
--- a/srcpkgs/radeon-profile-daemon/template
+++ b/srcpkgs/radeon-profile-daemon/template
@@ -4,6 +4,7 @@ version=20190603
 revision=1
 build_wrksrc=radeon-profile-daemon
 build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 short_desc="Daemon for radeon-profile GUI"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -12,10 +13,6 @@ homepage="https://github.com/marazmista/radeon-profile-daemon"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=bb0145c3dcbced094e28fe993d8f7e77defcfa5dcef3146badcd82d9fb627700
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
-
 do_install() {
 	vbin target/radeon-profile-daemon
 	vsv radeon-profile-daemon
diff --git a/srcpkgs/radeon-profile/template b/srcpkgs/radeon-profile/template
index 82621b8d1b9d..256cf963bdfb 100644
--- a/srcpkgs/radeon-profile/template
+++ b/srcpkgs/radeon-profile/template
@@ -4,6 +4,7 @@ version=20200824
 revision=1
 build_wrksrc=radeon-profile
 build_style=qmake
+hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel qt5-charts-devel libdrm-devel libXrandr-devel"
 short_desc="Application to read current clocks of ATi Radeon cards"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -11,7 +12,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/marazmista/radeon-profile"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=8d378d8ba249f2655783798b8e86ce1eb7a9a1dcd12d29784ba40366583b47af
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-charts-devel"
-fi
diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 6f95e8937616..870bad191a35 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -5,8 +5,7 @@ revision=5
 wrksrc="RetroShare-${version}"
 build_style=qmake
 configure_args="RS_UPNP_LIB=miniupnpc"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools
- qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel"
+hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="ffmpeg-devel libgnome-keyring-devel libmicrohttpd-devel
  libopencv-devel libssh-devel miniupnpc-devel libXScrnSaver-devel libxslt-devel
  pulseaudio-devel qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel
diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index bc5f4ad4ed6e..ab7b3a9918d5 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -4,6 +4,7 @@ version=3.9.0
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel kdeclarative-devel"
 depends="desktop-file-utils qt5-plugin-sqlite"
 short_desc="Simple (yet powerful) Qt5 feed reader"
@@ -13,10 +14,6 @@ homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
 checksum=79ca9cccc6173e3a1f58ff49a5d9896d87e009ecd831619ce4ebe2e4e476d7a4
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-tools-devel kdeclarative-devel"
-fi
-
 post_install() {
 	# Install rssguard icon manually
 	vinstall resources/graphics/rssguard.png 644 usr/share/pixmaps
diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template
index dab37cf9ed5f..27849fb27238 100644
--- a/srcpkgs/shotcut/template
+++ b/srcpkgs/shotcut/template
@@ -4,7 +4,7 @@ version=21.01.29
 revision=1
 build_style=qmake
 configure_args="SHOTCUT_VERSION=VOID-$version DEFINES+=SHOTCUT_NOUPGRADE"
-hostmakedepends="pkg-config qt5-tools"
+hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="gstreamer1-devel lame-devel libvpx-devel mlt-devel mlt-python3
  qt5-declarative-devel qt5-graphicaleffects qt5-multimedia-devel
  qt5-quickcontrols2-devel qt5-webkit-devel qt5-websockets-devel
@@ -19,9 +19,6 @@ checksum=2e55e36d95344758f220b081b1f25f90eb3d0131b0a4af9d65871798079ee961
 
 CXXFLAGS="-DHAVE_LOCALE_H=1"
 
-nocross="https://travis-ci.org/voidlinux/void-packages/jobs/292589547#L1332
-	https://travis-ci.org/voidlinux/void-packages/jobs/292589548#L1337"
-
 post_configure() {
 	# Hack to  make sure that the build_style does not override the
 	# value of LINK when calling the translations Makefile
diff --git a/srcpkgs/signon-ui/template b/srcpkgs/signon-ui/template
index c54737800890..81209631fe06 100644
--- a/srcpkgs/signon-ui/template
+++ b/srcpkgs/signon-ui/template
@@ -3,7 +3,7 @@ pkgname=signon-ui
 version=0.15
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config qt5-webkit-devel qt5-host-tools"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="libaccounts-qt5-devel libnotify-devel libproxy-devel
  qt5-webkit-devel qt5-x11extras-devel signond-devel"
 short_desc="Online Accounts Sign-on UI"
diff --git a/srcpkgs/smtube/template b/srcpkgs/smtube/template
index 2f1a8117a07b..92bea100cf07 100644
--- a/srcpkgs/smtube/template
+++ b/srcpkgs/smtube/template
@@ -8,7 +8,7 @@ make_build_args="
  DATA_PATH=\\\"/usr/share/smtube\\\"
  TRANSLATION_PATH=\\\"/usr/share/smtube/translations\\\"
  DOC_PATH=\\\"/usr/share/doc/smtube\\\""
-hostmakedepends="qt5-script-devel qt5-tools-devel qt5-webkit-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-script-devel qt5-tools-devel qt5-webkit-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Small youtube browser"
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index e26d066c062c..0dacf7511c71 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -26,10 +26,6 @@ checksum="b039dd247af3f0f662ea7915919f3889c97dd5cead7e22198d88a86e386c986a
  d035141496ad41352490464c3fff6492d13fee146edb88afeefc15d07662e89e"
 skip_extraction="server.js stremio.asar"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" ${makedepends}"
-fi
-
 post_extract() {
 	rmdir deps/singleapplication
 	mv ../SingleApplication-${_singleapplication_hash} deps/singleapplication
diff --git a/srcpkgs/texmaker/template b/srcpkgs/texmaker/template
index 4b322e37697f..bd07f0b84ce0 100644
--- a/srcpkgs/texmaker/template
+++ b/srcpkgs/texmaker/template
@@ -3,7 +3,7 @@ pkgname=texmaker
 version=5.0.4
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="poppler-qt5-devel qt5-webkit-devel qt5-script-devel"
 short_desc="Free cross-platform LaTeX editor"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -11,7 +11,3 @@ license="GPL-2.0-or-later"
 homepage="http://www.xm1math.net/texmaker/index.html"
 distfiles="http://www.xm1math.net/$pkgname/$pkgname-$version.tar.bz2"
 checksum=1de3ab3f6d6bee37a7d0b528ca1cbb7ce8e7aef5ec6a4405aff2caf9d12bd0e2
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-webkit-devel qt5-script-devel"
-fi
diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template
index 601a7d048be3..b70789d6e231 100644
--- a/srcpkgs/texstudio/template
+++ b/srcpkgs/texstudio/template
@@ -4,6 +4,7 @@ version=3.1.1
 revision=1
 build_style=qmake
 configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y
+ INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/quazip5
  $(vopt_if phonon PHONON=true) $(vopt_if poppler '' NO_POPPLER_PREVIEW=true)"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel
@@ -24,10 +25,6 @@ desc_option_poppler="build with poppler (=internal pdf preview)"
 
 build_options_default="phonon poppler"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" ${makedepends}"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	aarch64*|ppc*)
diff --git a/srcpkgs/textosaurus/template b/srcpkgs/textosaurus/template
index 6a1f255ad536..5223d1f5566d 100644
--- a/srcpkgs/textosaurus/template
+++ b/srcpkgs/textosaurus/template
@@ -4,7 +4,7 @@ version=0.9.11
 revision=1
 _scommit=b6e583c42b596523aad85906152eb2bcf068f625
 build_style=qmake
-hostmakedepends="pkg-config qt5-tools"
+hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel"
 depends="qt5-svg"
 short_desc="Simple cross-platform text editor based on Qt and Scintilla"
@@ -17,10 +17,6 @@ distfiles="${homepage}/archive/${version}.tar.gz
 checksum="82093b6c8725d104498ce4a66e4cf5a3aa1f057b34600bd5d67413dce9bff2cf
  fad739e3493dea0f7435114ac936dc255d3b1471bd61c7e7349845ab626b95d9"
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
-
 post_extract() {
 	cp -Trp ${XBPS_BUILDDIR}/scintilla-${_scommit} ${wrksrc}/src/libtextosaurus/3rd-party/scintilla
 }
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index 69e831d6800f..e245c3fb1959 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -4,7 +4,7 @@ version=1.1.1
 revision=5
 build_wrksrc=touchegg
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="libXtst-devel geis-devel qt5-devel qt5-x11extras-devel"
 short_desc="Multitouch gesture recognizer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/JoseExposito/touchegg"
 distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
 checksum=daeca6063eeb9d3ee95803699665ce0b6f101bb3ce8421df2676744556c0b8c8
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel"
-fi
diff --git a/srcpkgs/vapoursynth-editor/template b/srcpkgs/vapoursynth-editor/template
index 731fa4095290..19903b77a6e3 100644
--- a/srcpkgs/vapoursynth-editor/template
+++ b/srcpkgs/vapoursynth-editor/template
@@ -5,7 +5,7 @@ revision=1
 _bitbucket_hash=8019bb5a8099
 wrksrc="mystery_keeper-${pkgname}-${_bitbucket_hash}"
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="vapoursynth-devel qt5-devel qt5-websockets-devel"
 depends="vapoursynth"
 short_desc="Cross-platform editor for VapourSynth script"
@@ -15,10 +15,6 @@ homepage="https://bitbucket.org/mystery_keeper/vapoursynth-editor"
 distfiles="${homepage}/get/r${version}.tar.gz"
 checksum=41e09a6c1411536f7a223a16263145b31de4715189cfe2ebe62b4ad69d6ec342
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel qt5-websockets-devel"
-fi
-
 pre_configure() {
 	mv pro/pro.pro .
 }
diff --git a/srcpkgs/vokoscreen/template b/srcpkgs/vokoscreen/template
index 5063c45df7ed..94e4012dfcca 100644
--- a/srcpkgs/vokoscreen/template
+++ b/srcpkgs/vokoscreen/template
@@ -13,8 +13,4 @@ homepage="http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"
 distfiles="https://github.com/vkohaupt/vokoscreen/archive/${version}.tar.gz"
 checksum=7f5d9abfa3b4a1f7ce657838f5169cd80a590be490dacd0ad1751853a38f4245
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-x11extras-devel"
-fi
-
 CFLAGS="-fcommon"
diff --git a/srcpkgs/wkhtmltopdf/template b/srcpkgs/wkhtmltopdf/template
index 3aad19995a29..5703f69fc0c3 100644
--- a/srcpkgs/wkhtmltopdf/template
+++ b/srcpkgs/wkhtmltopdf/template
@@ -3,7 +3,7 @@ pkgname=wkhtmltopdf
 version=0.12.6
 revision=1
 build_style=qmake
-hostmakedepends="qt5-qmake"
+hostmakedepends="qt5-qmake qt5-host-tools"
 configure_args="INSTALLBASE=/usr"
 makedepends="qt5-xmlpatterns-devel qt5-svg-devel qt5-webkit-devel"
 depends="qt5-svg"
@@ -14,11 +14,6 @@ homepage="https://wkhtmltopdf.org"
 distfiles="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/${version}.tar.gz"
 checksum=adcced78492e7366d940c66a1327a85d3ae8c45190f486f545fdaa84cac662f0
 
-if [ "$CROSS_BUILD" ]; then
-	# make qmake happy
-	hostmakedepends+=" ${makedepends}"
-fi
-
 libwkhtmltopdf_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
diff --git a/srcpkgs/wpa_gui/template b/srcpkgs/wpa_gui/template
index 379b5d2a6aac..6f7419123165 100644
--- a/srcpkgs/wpa_gui/template
+++ b/srcpkgs/wpa_gui/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="wpa_supplicant-${version}"
 build_wrksrc="wpa_supplicant/wpa_gui-qt4"
 build_style=qmake
-hostmakedepends="qt5-devel"
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="wpa_supplicant desktop-file-utils"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant -- Graphical User Interface"
diff --git a/srcpkgs/xaos/template b/srcpkgs/xaos/template
index 1b4c9dfd8310..5bc0a5474647 100644
--- a/srcpkgs/xaos/template
+++ b/srcpkgs/xaos/template
@@ -4,7 +4,7 @@ version=4.2.1
 revision=1
 wrksrc="XaoS-release-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake qt5-devel which"
+hostmakedepends="qt5-qmake qt5-host-tools which"
 makedepends="qt5-devel gsl-devel"
 short_desc="Fast interactive real-time fractal zoomer/morpher"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/ykpers-gui/template b/srcpkgs/ykpers-gui/template
index 309b98b9f8e6..43ae33b4301b 100644
--- a/srcpkgs/ykpers-gui/template
+++ b/srcpkgs/ykpers-gui/template
@@ -5,7 +5,7 @@ version=3.1.25
 revision=1
 wrksrc="${_realname}-${version}"
 build_style=qmake
-hostmakedepends="qt5-qmake pkg-config"
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="qt5-devel libusb-compat-devel libyubikey-devel libykpers-devel"
 depends="hicolor-icon-theme"
 short_desc="Yubikey Personalization Tools GUI"
@@ -15,10 +15,6 @@ homepage="https://developers.yubico.com/${_realname}/"
 distfiles="https://developers.yubico.com/${_realname}/Releases/${_realname}-${version}.tar.gz"
 checksum=680b8ba8251c828847ffddd520165ac14927c2c6ee4ae39cfa9022ad7dd9dece
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 post_install() {
 	vlicense COPYING LICENSE
 	vbin build/release/${_realname} ykpers-gui
diff --git a/srcpkgs/zrandr/template b/srcpkgs/zrandr/template
index 27f35145f84d..ac972af7e409 100644
--- a/srcpkgs/zrandr/template
+++ b/srcpkgs/zrandr/template
@@ -3,6 +3,7 @@ pkgname=zrandr
 version=0.3.2
 revision=1
 build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 depends="desktop-file-utils hicolor-icon-theme xrandr"
 short_desc="Simple Qt5 front end for xrandr"
@@ -12,10 +13,6 @@ homepage="https://github.com/fralonra/zrandr"
 distfiles="https://github.com/fralonra/zrandr/archive/v${version}.tar.gz"
 checksum=04ba7dabbec63f3946ee4e1c8970f90a731928017d930c39ad21119775061a51
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
-
 pre_configure() {
 	lrelease -verbose zrandr.pro
 }

From e0ce28c3ef33b06d7fd078be700553bb49d99c58 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 Mar 2021 21:42:43 +0700
Subject: [PATCH 3105/3458] qbittorrent: build-style is gnu-configure

---
 srcpkgs/qbittorrent/template | 66 ++++++------------------------------
 1 file changed, 10 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index b3a5b7fb58a9..2598ea2d282e 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -3,7 +3,10 @@ pkgname=qbittorrent
 version=4.3.3
 revision=2
 create_wrksrc=yes
-build_style=qmake
+build_style=gnu-configure
+build_helper=qmake
+configure_args="--disable-systemd --with-boost=${XBPS_CROSS_BASE}/usr
+ --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
 hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"
 makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel"
 depends="qt5-svg"
@@ -15,10 +18,6 @@ changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=5966fdceab877fa3fedd9776a5f8ec6ce55308048e1d4a16b819d9b650dbc137
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-svg-devel"
-fi
-
 do_extract() {
 	local n=${pkgname}-${version}
 	mkdir -p build-nox build-x11
@@ -27,57 +26,12 @@ do_extract() {
 }
 
 do_configure() {
-	local opts="--prefix=/usr" build opts
-	opts+=" --disable-systemd"
-	opts+=" --with-boost=${XBPS_CROSS_BASE}/usr"
-	opts+=" --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
-	if [ "$CROSS_BUILD" ]; then
-		opts+=" --host=${XBPS_CROSS_TRIPLET}"
-	fi
-	for f in build-x11:--enable-gui:--disable-webui \
-		build-nox:--disable-gui:--enable-webui; do
-		build=${f%%:*}
-		f=${f#*:}
-		opts+=" ${f/:/ }"
-		cd ${wrksrc}/${build}
-		./bootstrap.sh
-		./configure ${opts}
-		echo "[Paths]" > qt.conf
-		echo "Sysroot=${XBPS_CROSS_BASE}" >> qt.conf
-		echo "Prefix=${XBPS_CROSS_BASE}/usr" >> qt.conf
-		echo "ArchData=${XBPS_CROSS_BASE}/usr/lib/qt5" >> qt.conf
-		echo "Data=${XBPS_CROSS_BASE}/usr/share/qt5" >> qt.conf
-		echo "Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt5" >> qt.conf
-		echo "Headers=${XBPS_CROSS_BASE}/usr/include/qt5" >> qt.conf
-		echo "Libraries=${XBPS_CROSS_BASE}/usr/lib" >> qt.conf
-		echo "LibraryExecutables=/usr/lib/qt5/libexec" >> qt.conf
-		echo "Binaries=/usr/lib/qt5/bin" >> qt.conf
-		echo "Tests=${XBPS_CROSS_BASE}/usr/tests" >> qt.conf
-		echo "Plugins=/usr/lib/qt5/plugins" >> qt.conf
-		echo "Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports" >> qt.conf
-		echo "Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml" >> qt.conf
-		echo "Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations" >> qt.conf
-		echo "Settings=${XBPS_CROSS_BASE}/etc/xdg" >> qt.conf
-		echo "Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples" >> qt.conf
-		echo "HostPrefix=/usr" >> qt.conf
-		echo "HostData=/usr/lib/qt5" >> qt.conf
-		echo "HostBinaries=/usr/lib/qt5/bin" >> qt.conf
-		echo "HostLibraries=/usr/lib" >> qt.conf
-		echo "Spec=linux-g++" >> qt.conf
-		echo "TargetSpec=linux-g++" >> qt.conf
-		qmake-qt5 \
-			PREFIX=/usr \
-			LIB=/usr/lib \
-			QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX \
-			QMAKE_CFLAGS="${CFLAGS}" \
-			QMAKE_CXXFLAGS="${CXXFLAGS}" \
-			QMAKE_LFLAGS="${LDFLAGS}" \
-			-qtconf qt.conf
-		if [ "${XBPS_CROSS_BASE}" ]; then
-			vsed -i src/Makefile \
-				-e "s; /usr/lib/libQt5; ${XBPS_CROSS_BASE}/usr/lib/libQt5;g"
-		fi
-	done
+	cd ${wrksrc}/build-x11
+	./bootstrap.sh
+	QT_QMAKE=${XBPS_WRAPPERDIR} ./configure ${configure_args} --enable-gui --disable-webui
+	cd ${wrksrc}/build-nox
+	./bootstrap.sh
+	QT_QMAKE=${XBPS_WRAPPERDIR} ./configure ${configure_args} --disable-gui --enable-webui
 }
 
 do_build() {

From d64cca059037520e4de303694efef254073e0634 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 8 Mar 2021 14:12:27 +1100
Subject: [PATCH 3106/3458] fakeroot: update homepage.

---
 srcpkgs/fakeroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template
index b1ea59cac187..f9d2cf9bb085 100644
--- a/srcpkgs/fakeroot/template
+++ b/srcpkgs/fakeroot/template
@@ -10,7 +10,7 @@ makedepends="acl-devel libcap-devel"
 short_desc="Gives a fake root environment"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-or-later"
-homepage="http://packages.debian.org/fakeroot"
+homepage="https://salsa.debian.org/clint/fakeroot"
 distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.gz"
 checksum=8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c
 

From 3ca376b8ecbc0e1527034dfb7ac29f9886f51cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 00:10:37 -0300
Subject: [PATCH 3107/3458] hunspell: remove libstdc++-devel from depends.

Both compiler packages depend on it already, and its presence makes it
easy to accidentally create build cycles by putting gcc in the
dependency path when it shouldn't be.
---
 srcpkgs/hunspell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template
index 46da84a580e0..929f4b1893e7 100644
--- a/srcpkgs/hunspell/template
+++ b/srcpkgs/hunspell/template
@@ -1,7 +1,7 @@
 # Template file for 'hunspell'
 pkgname=hunspell
 version=1.7.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-ui"
 hostmakedepends="automake bison libtool pkg-config"
@@ -25,7 +25,7 @@ libhunspell1.7_package() {
 }
 
 hunspell-devel_package() {
-	depends="libstdc++-devel ncurses-devel lib${sourcepkg}1.7>=${version}_${revision}"
+	depends="ncurses-devel lib${sourcepkg}1.7>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		# Provides symlinks that don't have versions before the .so and .a parts

From b45ec72301586639e047f6c572f3719da662fd2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 00:13:41 -0300
Subject: [PATCH 3108/3458] aspell: remove libstdc++-devel from depends.

Both compiler packages depend on it already, and its presence makes it
easy to accidentally create build cycles by putting gcc in the
dependency path when it shouldn't be.
---
 srcpkgs/aspell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index f58c1832b9bf..58b8208a1197 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell'
 pkgname=aspell
 version=0.60.8
-revision=3
+revision=4
 build_style=gnu-configure
 # we need to force aspell to use /usr/lib for data for two reasons:
 # - in multilib systems, it should use the native dicts instead of requiring
@@ -38,7 +38,7 @@ libaspell_package() {
 }
 
 aspell-devel_package() {
-	depends="ncurses-devel libstdc++-devel aspell>=${version}_${revision}"
+	depends="ncurses-devel aspell>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From daf42dda2268b29b4cdc909b6dfc95206af695f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 00:14:01 -0300
Subject: [PATCH 3109/3458] flac: remove libstdc++-devel from depends.

Both compiler packages depend on it already, and its presence makes it
easy to accidentally create build cycles by putting gcc in the
dependency path when it shouldn't be.
---
 srcpkgs/flac/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 03c29f4f72a9..1644c37e086e 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
 # Template file for 'flac'
 pkgname=flac
 version=1.3.3
-revision=1
+revision=2
 patch_args="-Np1"
 build_style=gnu-configure
 configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
@@ -34,7 +34,7 @@ libflac_package() {
 }
 
 libflac-devel_package() {
-	depends="libstdc++-devel libogg-devel libflac>=${version}_${revision}"
+	depends="libogg-devel libflac>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 4808e3ea8c4c25debf9488c8ac616827dcf2c911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 00:14:26 -0300
Subject: [PATCH 3110/3458] clucene: remove libstdc++-devel from depends.

Both compiler packages depend on it already, and its presence makes it
easy to accidentally create build cycles by putting gcc in the
dependency path when it shouldn't be.
---
 srcpkgs/clucene/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clucene/template b/srcpkgs/clucene/template
index 99515ee01efc..fe045cb36356 100644
--- a/srcpkgs/clucene/template
+++ b/srcpkgs/clucene/template
@@ -1,7 +1,7 @@
 # Template file for 'clucene'
 pkgname=clucene
 version=2.3.3.4
-revision=8
+revision=9
 wrksrc=${pkgname}-core-${version}
 build_style=cmake
 configure_args="-DENABLE_ASCII_MODE=OFF -DENABLE_PACKAGING=OFF
@@ -48,7 +48,7 @@ do_check() {
 }
 
 clucene-devel_package() {
-	depends="libstdc++-devel ${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 98d431fc25844bce76e3283d1eaa11fbe873792e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 00:15:05 -0300
Subject: [PATCH 3111/3458] poppler: remove libstdc++-devel from depends and
 fix versioning.

Both compiler packages depend on it already, and its presence makes it
easy to accidentally create build cycles by putting gcc in the
dependency path when it shouldn't be.

Don't use '-' for specifying versions, use '>=', which isn't ambiguous.
---
 srcpkgs/poppler/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index a57a5b18e895..ed0db8de7ab6 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -4,7 +4,7 @@
 #
 pkgname=poppler
 version=20.09.0
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir"
 configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -33,7 +33,7 @@ libpoppler102_package() {
 }
 
 poppler-cpp-devel_package() {
-	depends="libstdc++-devel zlib-devel poppler-devel-${version}_${revision} poppler-cpp-${version}_${revision}"
+	depends="zlib-devel poppler-devel>=${version}_${revision} poppler-cpp>=${version}_${revision}"
 	short_desc+=" - C++ bindings (development files)"
 	pkg_install() {
 		vmove usr/include/poppler/cpp
@@ -64,7 +64,7 @@ poppler-devel_package() {
 }
 
 poppler-glib-devel_package() {
-	depends="poppler-devel-${version}_${revision} poppler-glib-${version}_${revision}"
+	depends="poppler-devel>=${version}_${revision} poppler-glib>=${version}_${revision}"
 	short_desc+=" - GLib bindings (development files)"
 	pkg_install() {
 		vmove usr/include/poppler/glib
@@ -90,5 +90,5 @@ poppler-glib_package() {
 poppler-utils_package() {
 	short_desc+=" - utilities (transitional package)"
 	build_style=meta
-	depends="poppler-${version}_${revision}"
+	depends="poppler>=${version}_${revision}"
 }

From bbcd87f39d75613c102da630d75c402eb40034b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 00:15:28 -0300
Subject: [PATCH 3112/3458] icu: remove libstdc++-devel from depends.

Both compiler packages depend on it already, and its presence makes it
easy to accidentally create build cycles by putting gcc in the
dependency path when it shouldn't be.
---
 srcpkgs/icu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 69f3a8336742..261c8ea7fdb9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -3,7 +3,7 @@
 #       next soname bump.
 pkgname=icu
 version=67.1
-revision=1
+revision=2
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
@@ -92,7 +92,7 @@ post_install() {
 }
 
 icu-devel_package() {
-	depends="libstdc++-devel icu-libs>=${version}_${revision}"
+	depends="icu-libs>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 5a30d10e67ba697e948d92981dd518adaacdbb0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 5 Mar 2021 00:15:50 -0300
Subject: [PATCH 3113/3458] opensp: remove libstdc++-devel from depends.

Both compiler packages depend on it already, and its presence makes it
easy to accidentally create build cycles by putting gcc in the
dependency path when it shouldn't be.
---
 srcpkgs/opensp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensp/template b/srcpkgs/opensp/template
index 27e7516a842b..190977fb2d8c 100644
--- a/srcpkgs/opensp/template
+++ b/srcpkgs/opensp/template
@@ -1,7 +1,7 @@
 # Template file for 'opensp'
 pkgname=opensp
 version=1.5.2
-revision=8
+revision=9
 wrksrc="OpenSP-${version}"
 build_style=gnu-configure
 configure_args="--enable-http --enable-default-catalog=/usr/share/sgml/catalog"
@@ -27,7 +27,7 @@ post_install() {
 }
 
 opensp-devel_package() {
-	depends="libstdc++-devel ${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From edb3e7320937df9d8d6ec145ea953c7767edf4ff Mon Sep 17 00:00:00 2001
From: gt7-void <gt7@mail.com>
Date: Sun, 28 Feb 2021 17:32:27 -0300
Subject: [PATCH 3114/3458] owncloudclient: fix #29107

Make it depend on `qt5-svg`, since it's not implied by shlib-requires.
When not installed, icons won't be displayed.
---
 srcpkgs/owncloudclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index 50e6a6de420a..a4f847a28fb3 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,7 +1,7 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
 version=2.7.1
-revision=1
+revision=2
 wrksrc=client-${version}
 build_style=cmake
 configure_args="-Wno-dev -DNO_SHIBBOLETH=TRUE"
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config extra-cmake-modules"
 makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel
  qt5-tools-devel qt5-plugin-odbc qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
  qt5-plugin-sqlite"
-depends="qt5-plugin-sqlite"
+depends="qt5-plugin-sqlite qt5-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
 maintainer="Nathan Owens <ndowens@artixlinux.org>"

From 92b3f9227678b461b92d3110e3d2edbc582dedc2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 26 Feb 2021 18:10:41 +0300
Subject: [PATCH 3115/3458] python3-cloudscraper: remove package

The issue page from github is long gone. The developer does sketchy stuff
(locks down features in paid version, ignores pull requests, ...).
We only packaged this for Komikku, and it already dropped the dependency a
while ago, so I think it's safe to remove this package.
---
 srcpkgs/python3-cloudscraper/template | 23 -----------------------
 srcpkgs/removed-packages/template     |  1 +
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python3-cloudscraper/template

diff --git a/srcpkgs/python3-cloudscraper/template b/srcpkgs/python3-cloudscraper/template
deleted file mode 100644
index ea8b4a975607..000000000000
--- a/srcpkgs/python3-cloudscraper/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python3-cloudscraper'
-pkgname=python3-cloudscraper
-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="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/venomous/cloudscraper"
-distfiles="${PYPI_SITE}/c/cloudscraper/cloudscraper-${version}.tar.gz"
-checksum=db54e8e21f38ca3999c80270d55288ecc236d6ddb75f2ee4d40cfe1a3fb4421e
-
-do_check() {
-	# Needs unpackaged v8eval
-	:
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0447e59e9e36..0ff38b79c6ff 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -215,6 +215,7 @@ replaces="
  python-sqlite<=2.8.3_1
  python-xlib<0.29_1
  python3-Django<=3.0.7_2
+ python3-cloudscraper<=1.2.52_1
  python3-pyPEG2<=2.15.2_7
  qimageblitz<=0.0.6_4
  qucs<=0.0.19_2

From 4cbe7e86a1f88d5b0d35e1c45c3028f9aa3361fb Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Tue, 23 Feb 2021 23:52:31 -0800
Subject: [PATCH 3116/3458] python3-pykwalify: update to 1.8.0.

---
 srcpkgs/python3-pykwalify/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pykwalify/template b/srcpkgs/python3-pykwalify/template
index 232243a560a6..04447f045298 100644
--- a/srcpkgs/python3-pykwalify/template
+++ b/srcpkgs/python3-pykwalify/template
@@ -1,17 +1,20 @@
 # Template file for 'python3-pykwalify'
 pkgname=python3-pykwalify
-version=1.7.0
-revision=4
+version=1.8.0
+revision=1
 wrksrc="pykwalify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-yaml python3-docopt python3-dateutil"
+depends="python3-setuptools python3-ruamel.yaml python3-docopt python3-dateutil"
 short_desc="Python YAML/JSON schema validation library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/Grokzen/pykwalify/"
 distfiles="${PYPI_SITE}/p/pykwalify/pykwalify-${version}.tar.gz"
-checksum=7e8b39c5a3a10bc176682b3bd9a7422c39ca247482df198b402e8015defcceb2
+checksum=796b2ad3ed4cb99b88308b533fb2f559c30fa6efb4fa9fda11347f483d245884
+
+# requires python3-testfixtures, not packaged in void
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 9e7321847ced0fc9759c3f9d6de491490b03c7fb Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Wed, 24 Feb 2021 09:56:16 +0000
Subject: [PATCH 3117/3458] evolution: update to 3.38.4.

---
 srcpkgs/evolution/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 3411930f90bf..e608802a768a 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.3
+version=3.38.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ 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=7fac6226c5626f290b4bdeebd85b1e2c822a250ede53998b4970ddb92585dacd
+checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From f3fbd40d81fe60115ad7ed83620b45d21e4b7c5d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 5 Mar 2021 02:10:48 +0100
Subject: [PATCH 3118/3458] nano: update to 5.6.1.

---
 srcpkgs/nano/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 16bca4f6dbef..980beca9d68e 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
 # Template file for 'nano'
 pkgname=nano
-version=5.5
+version=5.6.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.nano-editor.org/"
 changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS"
 distfiles="https://www.nano-editor.org/dist/v${version%%.*}/nano-${version}.tar.xz"
-checksum=390b81bf9b41ff736db997aede4d1f60b4453fbd75a519a4ddb645f6fd687e4a
+checksum=760d7059e0881ca0ee7e2a33b09d999ec456ff7204df86bee58eb6f523ee8b09
 
 post_install() {
 	vsconf syntax/nanorc.nanorc

From 41814f637800e76b4f81b93998e21574baa4afc3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 4 Mar 2021 18:47:28 -0800
Subject: [PATCH 3119/3458] bind: remove obsolete configuration options

Removed options:
--enable-atomic - removed 9.13.3 (commit 5024)
--enable-fetchlimit - removed pre-bind9
--enable-ipv6 - made default 9.14
--enable-openssl-hash - removed 9.14, default was already yes
--enable-seccomp - removed 9.13.0 (commit 4898)
--enable-sit - removed 9.11, replaced with DNS COOKIE option in configs (commit 4152)
--enable-threads - on-threaded support removed 9.13.3 (commit 5011)
--with-ecdsa - comes from openssl availability (removed 9.14)
--with-eddsa - comes from openssl availability (removed 9.14)
--with-geoip - marked as obsolete in 9.16
--with-randomdev - removed 9.13.0 (commit 4936)
--without-gost - GOST support removed 9.13.1 (commit 4961)

There don't seem to be any new options added that seem like must-haves,
so unless someone speaks up I'm not going to be adding anything right
now.
---
 srcpkgs/bind/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 9ec3bc2241a7..37c2c3b5c3a1 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -5,14 +5,10 @@ revision=2
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
-configure_args="--disable-static --enable-threads --enable-largefile
- --with-libtool --enable-atomic --sysconfdir=/etc/named --enable-epoll
- --enable-ipv6 --with-randomdev=/dev/random --with-ecdsa=yes --with-eddsa=no
- --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 --disable-backtrace
- $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
+configure_args="--disable-static --enable-largefile --with-libtool
+ --sysconfdir=/etc/named --enable-epoll --with-openssl=${XBPS_CROSS_BASE}/usr
+ --with-gssapi=/usr/bin --with-readline --with-tuning=default --without-python
+ --with-libidn2 --disable-backtrace"
 hostmakedepends="automake libtool perl pkg-config"
 makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
  libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"

From 0577c69106b4497034a75dce26f2598ea1b450a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Mar 2021 01:20:33 -0300
Subject: [PATCH 3120/3458] linux5.11: update to 5.11.4.

---
 srcpkgs/linux5.11/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 1b5134062142..9654ab1a73fd 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.3
-revision=2
+version=5.11.4
+revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- 5d0c5b8636d71789a8c1b702c76d95f8426ac0899ede9aa8925671ef29423023"
+ d509c3900cf02a8d9f1692ffcc9d4a27d2b515ad50c0a231d5d00a125e9bd7a8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 86a6d3756daa1ec5869bad9838646cf1c9993f9f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Thu, 4 Mar 2021 03:50:07 -0500
Subject: [PATCH 3121/3458] New package: EmptyEpsilon-2020.11.23

---
 srcpkgs/EmptyEpsilon/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/EmptyEpsilon/template

diff --git a/srcpkgs/EmptyEpsilon/template b/srcpkgs/EmptyEpsilon/template
new file mode 100644
index 000000000000..d8e8e46f2dd8
--- /dev/null
+++ b/srcpkgs/EmptyEpsilon/template
@@ -0,0 +1,24 @@
+# Template file for 'EmptyEpsilon'
+pkgname=EmptyEpsilon
+_ver_major=2020
+_ver_minor=11
+_ver_patch=23
+version="${_ver_major}.${_ver_minor}.${_ver_patch}"
+revision=1
+wrksrc="EmptyEpsilon-EE-${version}"
+build_style=cmake
+configure_args="-DSERIOUS_PROTON_DIR=$XBPS_BUILDDIR/SeriousProton-EE-${version}
+ -DCPACK_PACKAGE_VERSION=${version}
+ -DCPACK_PACKAGE_VERSION_MAJOR=$_ver_major
+ -DCPACK_PACKAGE_VERSION_MINOR=$_ver_minor
+ -DCPACK_PACKAGE_VERSION_PATCH=$_ver_patch"
+hostmakedepends="python3"
+makedepends="SFML-devel glu-devel"
+short_desc="Open source starship bridge simulator"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="GPL-2.0-only"
+homepage="https://daid.github.io/EmptyEpsilon/"
+distfiles="https://github.com/daid/EmptyEpsilon/archive/EE-${version}.tar.gz
+ https://github.com/daid/SeriousProton/archive/EE-${version}.tar.gz>SP-${version}.tar.gz"
+checksum="339df2f3b57135663cb7bd253d7e157c3c5d457137bc6ed4c9651f48e8e6bf0c
+ 7552ab3b2a82735401aba2215ae5bcae5fa2c9946b709ff77e0c2cc5a60abc23"

From 3255439557393eb285a67f8230b2ca2571f28d01 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Sun, 7 Mar 2021 18:16:24 -0800
Subject: [PATCH 3122/3458] New package: loki-2.1.0

---
 srcpkgs/loki/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/loki/template

diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
new file mode 100644
index 000000000000..7e187bf67d6b
--- /dev/null
+++ b/srcpkgs/loki/template
@@ -0,0 +1,15 @@
+# Template file for 'loki'
+pkgname=loki
+version=2.1.0
+revision=1
+build_style=go
+go_import_path="github.com/grafana/loki"
+go_package="${go_import_path}/cmd/loki
+ ${go_import_path}/cmd/logcli
+ ${go_import_path}/cmd/loki-canary"
+short_desc="Like Prometheus, but for logs"
+maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
+license="Apache-2.0"
+homepage="https://grafana.com/oss/loki/"
+distfiles="https://github.com/grafana/loki/archive/v$version.tar.gz"
+checksum=ceccc4e42a7158ca0bc49903a3fbe31c8cd55f85f50bac8a8bba9843b4f8cd6f

From 58ab43516608b73526df906c5dfc4c77f5a21f22 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 3 Mar 2021 03:13:47 +0300
Subject: [PATCH 3123/3458] eiskaltdcpp-qt: update to 2.4.2

+ Remove patches accepted in upstream
+ Update package description
By ericonr:
+ Use gettext-devel instead of -libs to link to libintl.
---
 srcpkgs/eiskaltdcpp-qt/patches/musl.patch | 33 -----------------------
 srcpkgs/eiskaltdcpp-qt/template           | 20 +++++++++-----
 2 files changed, 13 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/musl.patch

diff --git a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
deleted file mode 100644
index 37914871c8b0..000000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 (Q_OS_HAIKU)
-+#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
- #include <execinfo.h>
- 
- #ifdef ENABLE_STACKTRACE
-@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
-         return 0;
-     }
- 
--#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/template b/srcpkgs/eiskaltdcpp-qt/template
index 618fa29772dc..df90ffeb777f 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,7 +1,7 @@
 # Template file for 'eiskaltdcpp-qt'
 pkgname=eiskaltdcpp-qt
-version=2.4.1
-revision=2
+version=2.4.2
+revision=1
 wrksrc="eiskaltdcpp-${version}"
 build_style=cmake
 configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
@@ -9,19 +9,25 @@ hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
 makedepends="bzip2-devel zlib-devel openssl-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"
+short_desc="EiskaltDC++ is a file sharing program using Direct Connect protocols"
 maintainer="Boris Pek <tehnick-8@yandex.ru>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/eiskaltdcpp/eiskaltdcpp"
 distfiles="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v${version}.tar.gz"
-checksum=818f9622ac28d3cf1ae58af0a01e25af702781822b6edeb99c9d05d408a4798f
+checksum=2ed853a57c57aab0e87fdea273a01707184ee425a2aaf9fcd2e0a32c57a2de2c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"
 fi
 
 case $XBPS_TARGET_MACHINE in
-	*-musl) makedepends+=" gettext-libs"
-		configure_args+=' -DCMAKE_EXE_LINKER_FLAGS="-lintl"';;
-	*)      configure_args+=' -DCMAKE_EXE_LINKER_FLAGS="-lpthread"';;
+	# links against libintl.so because it uses LANGUAGE as an env var
+	# and always messes with _nl_msg_cat_cntr (the latter could be patched out,
+	# the first is harder).
+	*-musl) makedepends+=" gettext-devel"
+		configure_args+=' -DCMAKE_EXE_LINKER_FLAGS="-lintl"'
+		CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gettext"
+		;;
+	*) configure_args+=' -DCMAKE_EXE_LINKER_FLAGS="-lpthread"'
+		;;
 esac

From 1c998a1195efbef1245a774689e1e4eb57f13f56 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Mar 2021 18:19:25 +0100
Subject: [PATCH 3124/3458] dovecot: update to 2.3.14.

---
 srcpkgs/dovecot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 84819fd693b1..db1bde7f1880 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.13
-revision=3
+version=2.3.14
+revision=1
 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
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4
+checksum=c8b3d7f3af1e558a3ff0f970309d4013a4d3ce136f8c02a53a3b05f345b9a34a
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From 406e2a610340593fbc44ca8dc29b293462a4473d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Mar 2021 18:19:30 +0100
Subject: [PATCH 3125/3458] dovecot-plugin-pigeonhole: update to 0.5.14.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 7b40b63aaac8..c0ed31b43fa5 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.13
-revision=2
+version=0.5.14
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
 configure_args="--prefix=/usr
@@ -19,7 +18,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17
+checksum=68ca0f78a3caa6b090a469f45c395c44cf16da8fcb3345755b1ca436c9ffb2d2
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 62c8c45661b1204517915e952b165635b9cf65aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Mar 2021 18:31:04 +0100
Subject: [PATCH 3126/3458] perl-PDF-API2: update to 2.039.

---
 srcpkgs/perl-PDF-API2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index 1e5ef0520fec..e3be0d9f1667 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.038
-revision=2
+version=2.039
+revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=7447c4749b02a784f525d3c7ece99d34b0a10475db65096f6316748dd2f9bd09
+checksum=36a74318847fe92ecec45221bc78f209e194f9f979521710a89ef7baa955a123

From 2de3ecb1f7439a6354cc93c16cc30c04a595c475 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 5 Mar 2021 18:31:30 +0100
Subject: [PATCH 3127/3458] progress: update to 0.16.

---
 srcpkgs/progress/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/progress/template b/srcpkgs/progress/template
index e9988680797c..c71302e545ae 100644
--- a/srcpkgs/progress/template
+++ b/srcpkgs/progress/template
@@ -1,6 +1,6 @@
 # Template file for 'progress'
 pkgname=progress
-version=0.15
+version=0.16
 revision=1
 makedepends="ncurses-devel"
 short_desc="Tool for showing the progress of cp, rm, dd and more"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Xfennec/progress"
 distfiles="https://github.com/Xfennec/progress/archive/v${version}.tar.gz"
-checksum=1ed0ac65a912ef1aa605d524eaddaacae92079cf71182096a7c65cbc61687d1b
+checksum=59944ee35f8ae6d62ed4f9b643eee2ae6d03825da288d9779dc43de41164c834
 
 do_build() {
 	${CC} ${CFLAGS} -D_FILE_OFFSET_BITS=64 \

From 5a6b60823a5e49838ec13009aeae3dfa987390ba Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 6 Mar 2021 15:56:58 +0100
Subject: [PATCH 3128/3458] rex: update to 1.13.3.

---
 srcpkgs/rex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rex/template b/srcpkgs/rex/template
index 6160f04baa2d..712f1aa1cf99 100644
--- a/srcpkgs/rex/template
+++ b/srcpkgs/rex/template
@@ -1,6 +1,6 @@
 # Template file for 'rex'
 pkgname=rex
-version=1.13.2
+version=1.13.3
 revision=1
 wrksrc="Rex-${version}"
 build_style=perl-module

From d88f5cf15d82ba9ed2e8bf2d54f2a280b58871d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 7 Mar 2021 14:57:50 +0100
Subject: [PATCH 3129/3458] linux5.10: update to 5.10.21.

---
 srcpkgs/linux5.10/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 6ae77aee534c..0c9e27d86ad2 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,14 +1,14 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.20
-revision=2
+version=5.10.21
+revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 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=9be37146feba42be05137cf900a7d9012990b5a1d5e59bc0c8da1f86952930a3
+checksum=9e7fe6ff1665bb578e8a88e761f6727b7f170a81563b93c1d49bd0bb7d7de2af
 python_version=3
 patch_args="-Np1"
 

From 9eabd9fd87c711310c9853edc41e3ae79ea40b70 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 10:38:38 +0100
Subject: [PATCH 3130/3458] dovecot-plugin-pigeonhole: fix template.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index c0ed31b43fa5..2d39de9842b1 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,7 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
 version=0.5.14
+revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
 configure_args="--prefix=/usr

From ca4bf326d39357f81eb74338f8d56b32f890ade2 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Mon, 8 Mar 2021 01:29:39 -0800
Subject: [PATCH 3131/3458] xbps: Remove untracked virtualpkgs file

---
 srcpkgs/xbps/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 16bf4155e7b9..8f986d22f9f3 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=4
+revision=5
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -48,6 +48,8 @@ post_install() {
 
 	vlicense LICENSE
 	vlicense LICENSE.3RDPARTY
+
+	echo "" > ${DESTDIR}/usr/share/xbps.d/void-virtualpkgs.conf
 }
 
 libxbps_package() {

From e62e7be73d0bece924bc15b3277541a6cb35f2ef Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Mar 2021 15:30:40 +0100
Subject: [PATCH 3132/3458] linux4.19: update to 4.19.179.

---
 srcpkgs/linux4.19/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index fbf723826ac4..9af18aadb339 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,14 +1,14 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.178
-revision=2
+version=4.19.179
+revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 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=0b75ba9fefade4615b22696af7d9b3f06da10a7bb8cc2edae0dfbea8a74196ee
+checksum=499d31a33e763b4b4d5dacf96977cf875fd982363dfb96ca50bb8ada4d243e92
 python_version=2 #unverified
 patch_args="-Np1"
 

From 21007b3cb53b1b5a5d18d4614ff8f91f7d3a02b4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Mar 2021 15:20:45 +0100
Subject: [PATCH 3133/3458] linux5.4: update to 5.4.103.

---
 srcpkgs/linux5.4/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 8944092048b3..b53ccb8ed47e 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,14 +1,14 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.102
-revision=2
+version=5.4.103
+revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 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=fd697ce1c3f6024d4ae77d4eb5a1552199407b60cb8e90bc621e23cbce639aed
+checksum=84e33a7cf1b58d2daafd9726841d648c73970d52879ada83b1cc19e60f179e8b
 python_version=3
 patch_args="-Np1"
 

From 26e6637f359c4f38f5972e0cd15b8074d1ed931c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 11:43:50 +0100
Subject: [PATCH 3134/3458] rex: fix checksum.

---
 srcpkgs/rex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rex/template b/srcpkgs/rex/template
index 712f1aa1cf99..e070740d7620 100644
--- a/srcpkgs/rex/template
+++ b/srcpkgs/rex/template
@@ -20,7 +20,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://www.rexify.org/"
 distfiles="https://cpan.metacpan.org/authors/id/F/FE/FERKI/Rex-${version}.tar.gz"
-checksum=0e994a13374295b9ac0803795b3c7296b73009f22e9210ce8c24716535b690bb
+checksum=16480c86aa0a26413af8c3073a3a31bd857d9496eb31da139102aab9cd31dfae
 
 post_install() {
 	vinstall share/rex-tab-completion.bash 644 usr/share/bash-completion/completions rex

From d68f88d2edfd27768d602ec864bf7857d16f64d7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Mar 2021 11:51:38 +0100
Subject: [PATCH 3135/3458] 0ad: update to 0.0.24b.

---
 srcpkgs/0ad/patches/remove-macos-include.patch | 11 -----------
 srcpkgs/0ad/template                           | 13 ++++---------
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/0ad/patches/remove-macos-include.patch

diff --git a/srcpkgs/0ad/patches/remove-macos-include.patch b/srcpkgs/0ad/patches/remove-macos-include.patch
deleted file mode 100644
index 9e6cc6189c8d..000000000000
--- a/srcpkgs/0ad/patches/remove-macos-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/ps/tests/stub_impl_hack.cpp.orig	2021-03-01 11:33:10.873986567 +0100
-+++ source/ps/tests/stub_impl_hack.cpp	2021-03-01 11:35:37.991089218 +0100
-@@ -13,7 +13,7 @@
- #include <cxxtest/TestMain.h>
- 
- bool suite_TestDummy_init = false;
--#include "/Users/wfg/Jenkins/workspace/macOS-all-bundles/source/ps/tests/stub_impl_hack.h"
-+#include "stub_impl_hack.h"
- 
- static TestDummy suite_TestDummy;
- 
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index f98525f995be..ba58de90f397 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,9 +1,9 @@
 # Template file for '0ad'
 pkgname=0ad
-version=0.0.24
-revision=2
+version=0.0.24b
+revision=1
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
-create_wrksrc=yes
+wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
 makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
  libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
-checksum=00aee2d2f11e48b169be41ddad8090e49f8173c09242fc2fa4a0d44e4763cc53
+checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
 
 CXXFLAGS="-fpermissive"
@@ -27,11 +27,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
-
-do_extract() {
-	bsdtar xJf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}-alpha-unix-build.tar.xz -C ${wrksrc}
-}
-
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		echo "TARGET_LINK_LIBRARIES(nvcore execinfo)" >> \

From 4aeb3c31dafb034cf025e4fc3c61c5b9368b4a99 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 7 Mar 2021 11:51:41 +0100
Subject: [PATCH 3136/3458] 0ad-data: update to 0.0.24b.

---
 srcpkgs/0ad-data/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template
index 0a4c8ab01081..689f6594d3d5 100644
--- a/srcpkgs/0ad-data/template
+++ b/srcpkgs/0ad-data/template
@@ -1,14 +1,14 @@
 # Template file for '0ad-data'
 pkgname=0ad-data
-version=0.0.24
+version=0.0.24b
 revision=1
-create_wrksrc=yes
+wrksrc="${pkgname%-data}-${version}-alpha"
 short_desc="Historically-based real-time strategy game (data files)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="CC-BY-SA-3.0"
 homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"
-checksum=929a55a6aa63c143b7fd20553375878a2e732353dbbcc757fa876b4181fdd75a
+checksum=41f5868379749aa20b96a8fa2e60dc872ebe22047db061c7cc894462e897a32c
 nocross=yes
 
 case "$XBPS_TARGET_MACHINE" in
@@ -16,10 +16,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) broken="no base game available";;
 esac
 
-do_extract() {
-	bsdtar xJf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/0ad-${version}-alpha-unix-data.tar.xz -C ${wrksrc}
-}
-
 do_install() {
 	vmkdir usr/share/0ad/data
 	vmkdir usr/share/0ad/data/tools

From 15b7c5595b4d317507ba9a14cc9e72a59175dba5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:12:58 -0500
Subject: [PATCH 3137/3458] protobuf26: update to 3.15.5.

---
 srcpkgs/protobuf26/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf26/template
index 0d16df82095c..7923c0ed6f18 100644
--- a/srcpkgs/protobuf26/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf26'
 pkgname=protobuf26
-version=3.15.3
+version=3.15.5
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=b10bf4e2d1a7586f54e64a5d9e7837e5188fc75ae69e36f215eb01def4f9721b
+checksum=bc3dbf1f09dba1b2eb3f2f70352ee97b9049066c9040ce0c9b67fb3294e91e4b
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"

From 56a8ad4a8a97451c70504eefc44bb99c31c1c62a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:18:51 -0500
Subject: [PATCH 3138/3458] python3-protobuf: update to 3.15.5.

---
 srcpkgs/python3-protobuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index 387a57b82b54..ed4358613cf7 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.15.3
+version=3.15.5
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=f3348af83391cdb842030e774d9bb01565ed4c62c93554cd1c69723411ec5e9d
+checksum=be8a929c6178bb6cbe9e2c858be62fa08966a39ae758a8493a88f0ed1efb6097
 
 build_options="cppext"
 build_options_default="cppext"

From 85069bc1cd1bba7e636c7c780edf3c3f40ca535a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:09:34 -0500
Subject: [PATCH 3139/3458] grpc: update to 1.36.2.

---
 srcpkgs/grpc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 708cd5b6518a..b28e2cba73dc 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.36.0
-revision=3
+version=1.36.2
+revision=1
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -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="1a5127c81487f4e3e57973bb332f04b9159f94d860c207e096d8a587d371edbd
+checksum="51403542b19e9ed5d3b6551ce4a828e17883a1593d4ca408b098f04b0767d202
  62c27e7a633e965a2f40ff16b487c3b778eae440bab64cad83b34ef1cbe3aa93"
 
 if [ "$CROSS_BUILD" ]; then

From cec4b7e94f3fbc779d7ec36f739255c9af131391 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:15:00 -0500
Subject: [PATCH 3140/3458] python3-grpcio: update to 1.36.1.

---
 srcpkgs/python3-grpcio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 38515f13aae4..41815f9c5c16 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.36.0
-revision=2
+version=1.36.1
+revision=1
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -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=70b11805bc9385fcd24e15bcdc5bd8bed463026cd2227d9fdd1ebda612ba0cd9
+checksum=a66ea59b20f3669df0f0c6a3bd57b985e5b2d1dcf3e4c29819bb8dc232d0fd38
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 0526a6e450169ebc06706212cf4ccdfa14f60634 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:15:03 -0500
Subject: [PATCH 3141/3458] python3-grpcio-tools: update to 1.36.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 c2169c719e87..f03ea0368c4b 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.36.0
+version=1.36.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=7f15ca23d3371134dbba784cc29c4115e7e61e5dc8e9b4eb02f2b152ec43adf6
+checksum=80ef584f7b917f575e4b8f2ec59cd4a4d98c2046e801a735f3136b05742a36a6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From deb478639274e095af3181061059d5749dffd16e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:15:12 -0500
Subject: [PATCH 3142/3458] python3-Pillow: update to 8.1.2.

---
 srcpkgs/python3-Pillow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
index d4c9d3fd1dea..4f6757ef4a03 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
-version=8.1.1
+version=8.1.2
 revision=1
 wrksrc="Pillow-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="custom:PIL"
 homepage="https://python-pillow.org"
 changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=f6fc18f9c9c7959bf58e6faf801d14fafb6d4717faaf6f79a68c8bb2a13dcf20
+checksum=b07c660e014852d98a00a91adfbe25033898a9d90a8f39beb2437d22a203fc44
 
 do_check() {
 	PYTHONPATH=$(cd build/lib.linux-* && pwd) python3 -m pytest

From 00bfe953f0b19c670f1f71bf702aca7754d2aba4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:15:16 -0500
Subject: [PATCH 3143/3458] python3-Pygments: update to 2.8.1.

---
 srcpkgs/python3-Pygments/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index e45d3ac0b523..094a4f365a25 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.8.0
+version=2.8.1
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=37a13ba168a02ac54cc5891a42b1caec333e59b66addb7fa633ea8a6d73445c0
+checksum=2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 do_check() {

From 9025fb5c6192c381606eae31c562b4194ab64b9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:17:28 -0500
Subject: [PATCH 3144/3458] python3-hypothesis: update to 6.6.0.

---
 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 fb95bef37cff..49e37d638f66 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.3.4
+version=6.6.0
 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=fc1af533c251e7668922ecf0d38c90b7eb5f9b1bcc5ecb28d9e99b04a6fa398e
+checksum=77a22432d69a821084857b81ab899e51d38f8ed43eb920595db570a128a96f55
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 1e96f0bcc27eedcd63c70764235f6de56002b5d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:19:33 -0500
Subject: [PATCH 3145/3458] python3-pytools: update to 2021.1.2.

---
 srcpkgs/python3-pytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index bdeab1325db3..27159ef8f6ee 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.1
+version=2021.1.2
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=073ae22a0ae946e2db97164f2eb24a599cd3a51430384aa40859dffd73056c40
+checksum=551b4add9547b85bfad68ff3f13930c3087644f5e24e84b99c82301c302d08d6
 
 post_install() {
 	vlicense LICENSE

From 9aa9773e670e5a0d6f96c196cd130d062c88b9ee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:20:11 -0500
Subject: [PATCH 3146/3458] python3-setuptools_scm: update to 5.0.2.

---
 srcpkgs/python3-setuptools_scm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools_scm/template b/srcpkgs/python3-setuptools_scm/template
index 4031cf0ed60e..c1b46ed73d1d 100644
--- a/srcpkgs/python3-setuptools_scm/template
+++ b/srcpkgs/python3-setuptools_scm/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools_scm'
 pkgname=python3-setuptools_scm
-version=5.0.1
+version=5.0.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/pypa/setuptools_scm"
 distfiles="${PYPI_SITE}/s/setuptools_scm/setuptools_scm-${version}.tar.gz"
-checksum=c85b6b46d0edd40d2301038cdea96bb6adc14d62ef943e75afb08b3e7bcf142a
+checksum=83a0cedd3449e3946307811a4c7b9d89c4b5fd464a2fb5eeccd0a5bb158ae5c8
 
 post_install() {
 	vlicense LICENSE

From d179a4a1537ee07e4b0f77f58a58f4b9bf2a3aa6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:20:46 -0500
Subject: [PATCH 3147/3458] python3-tifffile: update to 2021.3.5.

---
 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 e49ac544e0e6..7f5b99d8aff2 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.2.26
+version=2021.3.5
 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=a68e523f92ebaaa8e5503a9c2e165837e1d5faecc0379ecafc7881122f4fda1f
+checksum=0428401dc72ff6f3ea0d21ea2f7d728f854521cb7a895c4056dbbfb3b6227e14
 
 post_install() {
 	vlicense LICENSE

From bfa7592ac59ed243b799c2066d322a61e2265912 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 8 Mar 2021 09:21:34 -0500
Subject: [PATCH 3148/3458] xpra: update to 4.1.1.

---
 srcpkgs/xpra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index fa7e05e87fca..73cb2de90061 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,7 +1,7 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.1
-revision=2
+version=4.1.1
+revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
 hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=a8413b34015b7c55f1226776f87bd1a01c427c3a25b4ebf4eb8b79c64b52cc8a
+checksum=7958ddd3aadcffad5e06c80e44e54d7528db73ed68f8cd2e64753ae15f62e177
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 5a263ebd0ab888e2405a72f06dc35fd62d88aea0 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 8 Mar 2021 15:57:41 +0100
Subject: [PATCH 3149/3458] rclone: update to 1.54.1.

---
 srcpkgs/rclone/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 3c793deb6d10..849afadf336c 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.54.0
-revision=2
+version=1.54.1
+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://downloads.rclone.org/v${version}/rclone-v${version}.tar.gz"
-checksum=95f952dc059b842bd40338458b77657f7b5a1680c4ca837a3adcf83b63c8fda1
+checksum=378a4fd9f3fc47d51413ba48e31a275c972a9e31f3483d46c196ab26f8f1d7e7
 
 pre_build() {
 	if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then

From d1afdb503e0ffac07badd55a1e99621216074540 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 8 Mar 2021 16:21:27 +0100
Subject: [PATCH 3150/3458] conky: update to 1.12.1.

---
 srcpkgs/conky/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index b53d5dc34d57..8b95a628edfb 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,6 +1,7 @@
 # Template file for 'conky'
+# Keep in sync with 'conky-cli'
 pkgname=conky
-version=1.11.6
+version=1.12.1
 revision=1
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
@@ -18,7 +19,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=e7c01e4910744851e05f85f0a0aab3f5068215b1af850515189ac40e7deeb26d
+checksum=c95ac686a1095d29c2f44cfc3849b80ce9a0aba1e054fd6105d10af04bb2d8a8
 
 post_install() {
 	vmkdir etc/conky

From 5afc55fda735aae081e7d04a2171a6a911146643 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 8 Mar 2021 16:21:44 +0100
Subject: [PATCH 3151/3458] conky-cli: update to 1.12.1.

---
 srcpkgs/conky-cli/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 4dcfd8deb731..b61bdcca0504 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,6 +1,7 @@
 # Template file for 'conky-cli'
+# Keep in sync with 'conky'
 pkgname=conky-cli
-version=1.11.6
+version=1.12.1
 revision=1
 wrksrc="${pkgname/-cli/}-${version}"
 build_style=cmake
@@ -17,7 +18,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=e7c01e4910744851e05f85f0a0aab3f5068215b1af850515189ac40e7deeb26d
+checksum=c95ac686a1095d29c2f44cfc3849b80ce9a0aba1e054fd6105d10af04bb2d8a8
 
 provides="conky-${version}_${revision}"
 conflicts="conky>=0"

From 01232826a51242df1841d98af61dfcbb70804b3f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 8 Mar 2021 23:47:44 +1100
Subject: [PATCH 3152/3458] asio: update to 1.18.1.

---
 srcpkgs/asio/template | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/asio/template b/srcpkgs/asio/template
index c1d970e87777..1b30df2c7850 100644
--- a/srcpkgs/asio/template
+++ b/srcpkgs/asio/template
@@ -1,6 +1,6 @@
 # Template file for 'asio'
 pkgname=asio
-version=1.18.0
+version=1.18.1
 revision=1
 build_style=gnu-configure
 short_desc="Cross-platform C++ library for ASynchronous network I/O"
@@ -8,15 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSL-1.0"
 homepage="http://think-async.com/Asio/"
 distfiles="${SOURCEFORGE_SITE}/asio/asio-${version}.tar.bz2"
-checksum=9d539e7c09aa6394d512c433c5601c1f26dc4975f022ad7d5e8e57c3b635b370
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) # Enable strerror_r(3) version for musl libc
-			vsed -e "/#define ASIO_IMPL_ERROR_CODE_IPP/a #define MUSL_LIBC" \
-				-i ${wrksrc}/include/asio/impl/error_code.ipp
-	esac
-}
+checksum=4af9875df5497fdd507231f4b7346e17d96fc06fe10fd30e2b3750715a329113
 
 post_install() {
 	vlicense LICENSE_1_0.txt

From 2f371409903789240a8d885c82052a7dc7cea527 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Mar 2021 18:57:53 +0200
Subject: [PATCH 3153/3458] ktorrent: update to 20.12.3.

---
 srcpkgs/ktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktorrent/template b/srcpkgs/ktorrent/template
index b448b8a4fe21..3fc5c4d1c541 100644
--- a/srcpkgs/ktorrent/template
+++ b/srcpkgs/ktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'ktorrent'
 pkgname=ktorrent
-version=20.12.1
+version=20.12.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEM_GEOIP=ON"
@@ -15,7 +15,7 @@ maintainer="Norbert Vegh <vegh@norvegh.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/internet/ktorrent"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktorrent-${version}.tar.xz"
-checksum=8c5f52d9b4597c117c0ed189c2ada3b9716bc0d5ceb53fde66f6a009bee68354
+checksum=28d3db3ed5b672e943e50d482855e48d6088022620b088b261f4eeb7ea42f289
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 2e0cbb89ca876bd9f9114e068c348bdfd3da8b0a Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Wed, 3 Mar 2021 11:50:35 +0100
Subject: [PATCH 3154/3458] yq-go: update to 4.6.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 e48daf02eae4..55601f5ae852 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.1
+version=4.6.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=bdd078847a74245e4c09af3dc31cdb482588398f342a8db4c019115a8495ebad
+checksum=a843b90e4e86efa310284823ab6f1249e4ae3c6aa5df4d61c10b0fdc543b267d
 
 do_check() {
 	go test -v

From 6aa875d0429ba790606149e20d357bd2b2a97a91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 21:16:47 +0100
Subject: [PATCH 3155/3458] qt5-webengine: update to 5.15.3.

---
 ...a_audio_linux_audio_manager_linux.cc.patch | 43 ----------
 ...src_3rdparty_chromium_media_BUILD.gn.patch | 12 ---
 ...dparty_chromium_media_audio_BUILD.gn.patch | 23 -----
 ...ty_chromium_media_media__options.gni.patch | 12 ---
 ...te-instead-of-_libc_fpstate-on-linux.patch | 42 ---------
 .../patches/0001-mus-cstring.patch            | 10 +++
 .../patches/0004-musl-no-mallinfo.patch       | 11 ++-
 .../qt5-webengine/patches/0015-yasm-nls.patch | 13 ---
 .../patches/0021-sandbox-sched_getparam.patch |  8 +-
 .../patches/0089-enable-ppc64.patch           | 16 ++--
 .../patches/0090-qtwebengine-ppc64.patch      | 41 ++-------
 .../qt5-webengine/patches/0100-sndio.patch    |  2 +-
 .../qt5-webengine/patches/0101-sndio.patch    | 85 +++++++++++++++++++
 .../qt5-webengine/patches/0110-size_t.patch   |  6 +-
 srcpkgs/qt5-webengine/template                | 55 ++++++------
 srcpkgs/qt5-webengine/update                  |  1 +
 16 files changed, 155 insertions(+), 225 deletions(-)
 delete mode 100644 srcpkgs/qt5-webengine/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
 delete mode 100644 srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
 delete mode 100644 srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
 delete mode 100644 srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0001-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0001-mus-cstring.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0015-yasm-nls.patch
 create mode 100644 srcpkgs/qt5-webengine/patches/0101-sndio.patch
 create mode 100644 srcpkgs/qt5-webengine/update

diff --git a/srcpkgs/qt5-webengine/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch b/srcpkgs/qt5-webengine/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
deleted file mode 100644
index cf8e81b11d67..000000000000
--- a/srcpkgs/qt5-webengine/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/chromium/media/audio/linux/audio_manager_linux.cc b/chromium/media/audio/linux/audio_manager_linux.cc
-index 5d703549372..9e60b40c749 100644
---- media/audio/linux/audio_manager_linux.cc
-+++ media/audio/linux/audio_manager_linux.cc
-@@ -20,6 +20,10 @@
- #include "media/audio/pulse/audio_manager_pulse.h"
- #include "media/audio/pulse/pulse_util.h"
- #endif
-+#if defined(USE_SNDIO)
-+#include <sndio.h>
-+#include "media/audio/openbsd/audio_manager_openbsd.h"
-+#endif
- 
- namespace media {
- 
-@@ -27,7 +31,8 @@ enum LinuxAudioIO {
-   kPulse,
-   kAlsa,
-   kCras,
--  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
-+  kSndio,
-+  kAudioIOMax = kSndio  // Must always be equal to largest logged entry.
- };
- 
- std::unique_ptr<media::AudioManager> CreateAudioManager(
-@@ -41,6 +46,17 @@ std::unique_ptr<media::AudioManager> CreateAudioManager(
-   }
- #endif
- 
-+#if defined(USE_SNDIO)
-+  struct sio_hdl * hdl = NULL;
-+  if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) != NULL) {
-+    sio_close(hdl);
-+    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax +1);
-+    return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
-+                                               audio_log_factory);
-+  }
-+  DVLOG(1) << "Sndio is not available on the OS";
-+#endif
-+
- #if defined(USE_PULSEAUDIO)
-   pa_threaded_mainloop* pa_mainloop = nullptr;
-   pa_context* pa_context = nullptr;
diff --git a/srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch b/srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
deleted file mode 100644
index ec6040026688..000000000000
--- a/srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- media/BUILD.gn	2020-03-24 10:16:30.000000000 +0100
-+++ -	2020-04-06 14:32:27.960817513 +0200
-@@ -65,6 +65,9 @@
-   if (use_cras) {
-     defines += [ "USE_CRAS" ]
-   }
-+  if (use_sndio) {
-+    defines += [ "USE_SNDIO" ]
-+  }
- }
- 
- # Internal grouping of the configs necessary to support sub-folders having their
diff --git a/srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch b/srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
deleted file mode 100644
index b3700eef8980..000000000000
--- a/srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- media/audio/BUILD.gn	2020-03-24 10:16:30.000000000 +0100
-+++ -	2020-04-06 14:31:28.871450217 +0200
-@@ -232,9 +232,19 @@
-     deps += [ "//media/base/android:media_jni_headers" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux && use_sndio) {
-     sources += [ "linux/audio_manager_linux.cc" ]
-   }
-+  if (use_sndio) {
-+    libs += [ "sndio" ]
-+    sources += [
-+      "openbsd/audio_manager_openbsd.cc",
-+      "sndio/sndio_input.cc",
-+      "sndio/sndio_input.h",
-+      "sndio/sndio_output.cc",
-+      "sndio/sndio_output.h"
-+   ]
-+ }
- 
-   if (use_alsa) {
-     libs += [ "asound" ]
diff --git a/srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch b/srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
deleted file mode 100644
index 14807d8e1d36..000000000000
--- a/srcpkgs/qt5-webengine/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- media/media_options.gni	2020-03-24 10:16:30.000000000 +0100
-+++ -	2020-04-06 14:29:22.958630783 +0200
-@@ -114,6 +114,9 @@
-   # Enables runtime selection of ALSA library for audio.
-   use_alsa = false
- 
-+  # Enables runtime selection of sndio library for audio.
-+  use_sndio = false
-+
-   # Alsa should be used on non-Android, non-Mac POSIX systems.
-   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
-   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt5-webengine/patches/0001-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch b/srcpkgs/qt5-webengine/patches/0001-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch
deleted file mode 100644
index 3e787d1374ea..000000000000
--- a/srcpkgs/qt5-webengine/patches/0001-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h	2018-06-15 09:47:20.000000000 +0200
-+++ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h	2018-09-07 22:21:28.521763716 +0200
-@@ -50,7 +50,7 @@
-   //   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);
---- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc	2018-06-15 09:47:20.000000000 +0200
-+++ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc	2018-09-07 22:21:45.766762688 +0200
-@@ -49,7 +49,7 @@
- }
- 
- 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 @@
- }
- 
- 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;
---- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h	2018-06-15 09:47:20.000000000 +0200
-+++ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h	2018-09-07 23:36:32.049495285 +0200
-@@ -48,7 +48,7 @@
- #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/qt5-webengine/patches/0001-mus-cstring.patch b/srcpkgs/qt5-webengine/patches/0001-mus-cstring.patch
new file mode 100644
index 000000000000..d4b22c77ce96
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0001-mus-cstring.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc	2021-03-08 10:30:42.504006604 +0100
++++ -	2021-03-08 10:31:27.415366585 +0100
+@@ -8,6 +8,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
++#include <cstring>
+ 
+ #include "base/files/file_util.h"
+ #include "base/files/scoped_file.h"
diff --git a/srcpkgs/qt5-webengine/patches/0004-musl-no-mallinfo.patch b/srcpkgs/qt5-webengine/patches/0004-musl-no-mallinfo.patch
index b47e3774bbc3..36900f907833 100644
--- a/srcpkgs/qt5-webengine/patches/0004-musl-no-mallinfo.patch
+++ b/srcpkgs/qt5-webengine/patches/0004-musl-no-mallinfo.patch
@@ -18,14 +18,14 @@
  #endif
  
    MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
---- qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc    2020-03-26 22:17:18.000000000 +0100
-++++ -  2020-04-08 13:30:26.065577091 +0200
-@@ -100,14 +100,14 @@
+--- qtwebengine/src/3rdparty/chromium/base/process/process_metrics_posix.cc	2021-02-23 16:36:59.000000000 +0100
++++ -	2021-03-07 21:03:38.579424720 +0100
+@@ -119,14 +119,14 @@
    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)
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
    struct mallinfo minfo = mallinfo();
  #if BUILDFLAG(USE_TCMALLOC)
    return minfo.uordblks;
@@ -37,4 +37,3 @@
    // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
    return 0;
  #endif
-
diff --git a/srcpkgs/qt5-webengine/patches/0015-yasm-nls.patch b/srcpkgs/qt5-webengine/patches/0015-yasm-nls.patch
deleted file mode 100644
index 22ac0420764f..000000000000
--- a/srcpkgs/qt5-webengine/patches/0015-yasm-nls.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h
-index 9e36539..f588083 100644
---- qtwebengine/src/3rdparty/chromium//third_party/yasm/source/config/linux/config.h
---- qtwebengine/src/3rdparty/chromium//third_party/yasm/source/config/linux/config.h
-@@ -5,7 +5,7 @@
- #define CPP_PROG "gcc -E"
- 
- /* */
--#define ENABLE_NLS 1
-+/* #undef ENABLE_NLS 1 */
- 
- /* Define to 1 if you have the `abort' function. */
- #define HAVE_ABORT 1
diff --git a/srcpkgs/qt5-webengine/patches/0021-sandbox-sched_getparam.patch b/srcpkgs/qt5-webengine/patches/0021-sandbox-sched_getparam.patch
index a574b994abc1..d8c6aa15cf66 100644
--- a/srcpkgs/qt5-webengine/patches/0021-sandbox-sched_getparam.patch
+++ b/srcpkgs/qt5-webengine/patches/0021-sandbox-sched_getparam.patch
@@ -3,9 +3,9 @@ musl uses them for pthread_getschedparam()
 
 source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
 
---- a/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc	2020-09-01 13:02:34.000000000 +0200
-+++ -	2020-09-10 19:16:13.884275822 +0200
-@@ -88,11 +88,18 @@
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc	2021-02-23 16:36:59.000000000 +0100
++++ -	2021-03-07 21:13:44.992079145 +0100
+@@ -93,11 +93,18 @@
      case __NR_sysinfo:
      case __NR_times:
      case __NR_uname:
@@ -21,6 +21,6 @@ source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8a
      case __NR_sched_getscheduler:
      case __NR_sched_setscheduler:
 +#endif
-       return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
      case __NR_prlimit64:
        // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt5-webengine/patches/0089-enable-ppc64.patch b/srcpkgs/qt5-webengine/patches/0089-enable-ppc64.patch
index 4cbec77d11bc..4fb19ccdd2e5 100644
--- a/srcpkgs/qt5-webengine/patches/0089-enable-ppc64.patch
+++ b/srcpkgs/qt5-webengine/patches/0089-enable-ppc64.patch
@@ -10,24 +10,24 @@ Subject: [PATCH 1/3] Enable ppc64 builds
 
 diff --git a/configure.pri b/configure.pri
 index 3a144e3f8..cabe8b24a 100644
---- a/configure.pri
-+++ b/configure.pri
-@@ -144,6 +144,7 @@ defineTest(qtConfTest_detectArch) {
-     contains(QT_ARCH, "i386")|contains(QT_ARCH, "x86_64"): return(true)
+--- a/configure.pri	2021-02-24 10:45:58.000000000 +0100
++++ -	2021-03-07 21:18:43.124754796 +0100
+@@ -144,6 +144,7 @@
      contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
      contains(QT_ARCH, "mips"): return(true)
+     contains(QT_ARCH, "mips64"): return(true)
 +    contains(QT_ARCH, "power64"): return(true)
      qtLog("Architecture not supported.")
      return(false)
  }
 diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
 index 512e2523b..e31123654 100644
---- a/mkspecs/features/functions.prf
-+++ b/mkspecs/features/functions.prf
-@@ -87,6 +87,7 @@ defineReplace(gnArch) {
-     contains(qtArch, "arm64"): return(arm64)
+--- a/mkspecs/features/functions.prf	2021-02-24 10:45:58.000000000 +0100
++++ -	2021-03-07 21:19:21.345036293 +0100
+@@ -107,6 +107,7 @@
      contains(qtArch, "mips"): return(mipsel)
      contains(qtArch, "mips64"): return(mips64el)
+     contains(qtArch, "mips64el"): return(mips64el)
 +    contains(qtArch, "power64"): return(ppc64)
      return(unknown)
  }
diff --git a/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch b/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch
index 31cfa708409f..43a29601a7ef 100644
--- a/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch
+++ b/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch
@@ -1006,10 +1006,10 @@ index 000000000..07728e087
 +//TODO: is it necessary to redefine ucontext on PPC64?
 +
 +#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-diff --git a/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
+diff --git a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
 index 443e9114b..6df5678d6 100644
---- a/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ b/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/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"
@@ -1702,16 +1702,16 @@ diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memo
 index 43c86314c..27325b813 100644
 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
 +++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+@@ -57,8 +57,9 @@
  
    EXPECT_EQ(0U, allocator.pages_allocated());
-   uint8_t *p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
 +  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
    ASSERT_FALSE(p == NULL);
 -  EXPECT_EQ(3U, allocator.pages_allocated());
 +  EXPECT_EQ(expected_pages, allocator.pages_allocated());
    for (unsigned i = 1; i < 10; ++i) {
-     uint8_t *p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
      ASSERT_FALSE(p == NULL);
 diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
 index ccc9f1459..debaed4d6 100644
@@ -3178,8 +3178,7 @@ index 58bfa8f83..8fc37c464 100644
 +#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)
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
           sig == SIGPIPE ||
           sig == SIGSEGV ||
  #if defined(OS_MACOSX)
@@ -3395,28 +3394,6 @@ index 597d8b6e5..99d1ec0c7 100644
       (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/src/3rdparty/chromium/third_party/node/node.py b/src/3rdparty/chromium/third_party/node/node.py
-index 8097e2c49..10e6a16ea 100755
---- a/src/3rdparty/chromium/third_party/node/node.py
-+++ b/src/3rdparty/chromium/third_party/node/node.py
-@@ -10,11 +10,12 @@ import sys
- 
- 
- def GetBinaryPath():
--  return os_path.join(os_path.dirname(__file__), *{
--    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
--    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
--    'Windows': ('win', 'node.exe'),
--  }[platform.system()])
-+  return "/usr/bin/node"
-+  #return os_path.join(os_path.dirname(__file__), *{
-+  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
-+  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
-+  #  'Windows': ('win', 'node.exe'),
-+  #}[platform.system()])
- 
- 
- def RunNode(cmd_parts, stdout=None):
 diff --git a/src/3rdparty/chromium/third_party/pffft/src/pffft.c b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
 index bdac4d784..51e0f2cac 100644
 --- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
@@ -3524,7 +3501,7 @@ diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/di
 index dd9ab457e..c005d9599 100644
 --- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
 +++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
+@@ -30,11 +30,7 @@
    static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
  
    if (!diff_proc) {
@@ -3534,7 +3511,7 @@ index dd9ab457e..c005d9599 100644
 -    diff_proc = &VectorDifference_C;
 -#else
 +#if defined(WEBRTC_ARCH_X86_FAMILY)
-     bool have_sse2 = WebRtc_GetCPUInfo(kSSE2) != 0;
+     bool have_sse2 = 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) {
diff --git a/srcpkgs/qt5-webengine/patches/0100-sndio.patch b/srcpkgs/qt5-webengine/patches/0100-sndio.patch
index 38e18d89a6b2..4224f15fbd68 100644
--- a/srcpkgs/qt5-webengine/patches/0100-sndio.patch
+++ b/srcpkgs/qt5-webengine/patches/0100-sndio.patch
@@ -7,7 +7,7 @@
 +    qtConfig(webengine-sndio) {
 +        gn_args += use_sndio=true
 +    } else {
-+       gn_args += use_sndio=true
++       gn_args += use_sndio=false
 +    }
 +
      !packagesExist(libpci): gn_args += use_libpci=false
diff --git a/srcpkgs/qt5-webengine/patches/0101-sndio.patch b/srcpkgs/qt5-webengine/patches/0101-sndio.patch
new file mode 100644
index 000000000000..c60f690596d3
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0101-sndio.patch
@@ -0,0 +1,85 @@
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -20,6 +20,10 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include <sndio.h>
++#include "media/audio/openbsd/audio_manager_openbsd.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -27,7 +31,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio  // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -41,6 +46,17 @@ std::unique_ptr<media::AudioManager> CreateAudioManager(
+   }
+ #endif
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl * hdl = NULL;
++  if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax +1);
++    return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
++                                               audio_log_factory);
++  }
++  DVLOG(1) << "Sndio is not available on the OS";
++#endif
++
+ #if defined(USE_PULSEAUDIO)
+   pa_threaded_mainloop* pa_mainloop = nullptr;
+   pa_context* pa_context = nullptr;
+--- a/src/3rdparty/chromium/media/BUILD.gn	2020-03-24 10:16:30.000000000 +0100
++++ -	2020-04-06 14:32:27.960817513 +0200
+@@ -65,6 +65,9 @@
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+ }
+ 
+ # Internal grouping of the configs necessary to support sub-folders having their
+--- a/src/3rdparty/chromium/media/media_options.gni	2020-03-24 10:16:30.000000000 +0100
++++ -	2020-04-06 14:29:22.958630783 +0200
+@@ -114,6 +114,9 @@
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enables runtime selection of sndio library for audio.
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn	2021-02-23 16:36:59.000000000 +0100
++++ -	2021-03-07 22:00:34.889682069 +0100
+@@ -238,6 +238,17 @@
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "openbsd/audio_manager_openbsd.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
diff --git a/srcpkgs/qt5-webengine/patches/0110-size_t.patch b/srcpkgs/qt5-webengine/patches/0110-size_t.patch
index 224072e37cae..462e3202279f 100644
--- a/srcpkgs/qt5-webengine/patches/0110-size_t.patch
+++ b/srcpkgs/qt5-webengine/patches/0110-size_t.patch
@@ -1,6 +1,6 @@
---- a/src/3rdparty/chromium/third_party/angle/include/platform/Platform.h	2020-05-06 16:21:29.000000000 +0200
-+++ b/src/3rdparty/chromium/third_party/angle/include/platform/Platform.h	2020-09-04 00:31:10.504555635 +0200
-@@ -236,11 +236,11 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h	2021-02-23 16:36:59.000000000 +0100
++++ -	2021-03-07 21:44:25.477989726 +0100
+@@ -239,11 +239,11 @@
  using ProgramKeyType   = std::array<uint8_t, 20>;
  using CacheProgramFunc = void (*)(PlatformMethods *platform,
                                    const ProgramKeyType &key,
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index edc84557bd3e..42c136e03a5e 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,17 +1,19 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.2
-revision=2
+version=5.15.3
+revision=1
+_commit=a059e7404a6db799f4da0ad696e65ae9c854b4b0
+_chromium_commit=d9d9e606cb34b1b4ac0f44de132b1eb10763f1f6
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-everywhere-src-${version}"
+wrksrc="qtwebengine-${_commit}"
 build_style=qmake
 configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
  -webengine-pepper-plugins -webengine-printing-and-pdf -webengine-proprietary-codecs
  -webengine-pulseaudio -webengine-spellchecker -webengine-webrtc -webengine-geolocation
- -webengine-kerberos -no-webengine-embedded-build"
+ -webengine-kerberos -no-webengine-embedded-build $(vopt_if sndio '' '-no')-webengine-sndio"
 # Rely on auto detection (fails if forced for cross builds) -webengine-alsa
-hostmakedepends="qt5-qmake gperf ninja qt5-host-tools flex pkg-config
+hostmakedepends="qt5-qmake gperf ninja qt5-host-tools flex pkg-config nodejs
  which perl python protobuf nss-devel libevent-devel zlib-devel icu-devel"
 makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  qt5-declarative-devel libevent-devel snappy-devel icu-devel ffmpeg-devel
@@ -24,18 +26,15 @@ short_desc="Cross-platform application and UI framework (QT5) - WebEngine compon
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebengine-everywhere-src-${version}.tar.xz"
-checksum=c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0
+distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+ https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
+checksum="8e86257d25a641939d50c14de2049b384c371fcb70a60a289dc5426be0423b40
+ ee97e569529a60729e3c6b7317011fd2cc40600079e90c4afa2e5ea9edcd58ef"
 patch_args="-Np1"
 
 build_options="sndio"
 build_options_default=""
 
-
-if [ "$build_option_sndio" ]; then
-	configure_args+=" -sndio"
-fi
-
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
@@ -112,20 +111,21 @@ _cleanup_wrksrc_leak() {
 		-e "s;${wrksrc}/qtbase;/usr/lib/qt5;g" \;
 }
 
+post_extract() {
+	rmdir ${wrksrc}/src/3rdparty
+	mv -v ${wrksrc}/../qtwebengine-chromium-${_chromium_commit} ${wrksrc}/src/3rdparty
+	# ¯\_(ツ)_/¯
+	mkdir -p ${wrksrc}/.git ${wrksrc}/src/3rdparty/chromium/.git
+}
+
 post_patch() {
-	if [ "$build_option_sndio" ]; then
-		mkdir -p ${wrksrc}/src/3rdparty/chromium/media/audio/{sndio,openbsd}
-		cp ${FILESDIR}/sndio-files/sndio_*put.* \
-			${wrksrc}/src/3rdparty/chromium/media/audio/sndio
-		cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \
-			${wrksrc}/src/3rdparty/chromium/media/audio/openbsd
-		for f in "${FILESDIR}"/sndio-patches/*.patch; do
-			cd src/3rdparty/chromium/
-			echo "Applying $f"
-			patch -Np0 -i "$f"
-			cd "$wrksrc"
-		done
-	fi
+	mkdir -p ${wrksrc}/src/3rdparty/chromium/media/audio/{sndio,openbsd}
+	cp ${FILESDIR}/sndio-files/sndio_*put.* \
+		${wrksrc}/src/3rdparty/chromium/media/audio/sndio
+	cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \
+		${wrksrc}/src/3rdparty/chromium/media/audio/openbsd
+	# Eternal 5.15.2, this can't ever be increased since other components are 5.15.2
+	sed -e "/^MODULE_VERSION/s/5.*/5.15.2/" -i .qmake.conf
 }
 
 pre_configure() {
@@ -163,10 +163,13 @@ pre_configure() {
 
 pre_build() {
 	export NINJAJOBS=${makejobs}
+	# Qt used to preped ulimit in front of $$QMAKE_LINK
+	# but they do not do this anymore if ccache is in use
+	ulimit -n 4096
 }
 
 qt5-webengine-devel_package() {
-	depends="qt5-devel>=${version} ${sourcepkg}>=${version}_${revision}"
+	depends="qt5-devel>=5.15.2_1 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/qt5-webengine/update b/srcpkgs/qt5-webengine/update
new file mode 100644
index 000000000000..405c90aeb6be
--- /dev/null
+++ b/srcpkgs/qt5-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/5-/}-everywhere-src"

From 57f992866e9d81b1e3b181405c4a93ed24303f60 Mon Sep 17 00:00:00 2001
From: Reed Wade <reedwade@misterbanal.net>
Date: Tue, 2 Mar 2021 19:46:15 +0100
Subject: [PATCH 3156/3458] qt5-webengine: enable WebRTC screen sharing via
 PipeWire

closes #29191
---
 srcpkgs/qt5-webengine/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 42c136e03a5e..795ad3a968d1 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -11,7 +11,8 @@ configure_args="--
  -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
  -webengine-pepper-plugins -webengine-printing-and-pdf -webengine-proprietary-codecs
  -webengine-pulseaudio -webengine-spellchecker -webengine-webrtc -webengine-geolocation
- -webengine-kerberos -no-webengine-embedded-build $(vopt_if sndio '' '-no')-webengine-sndio"
+ -webengine-kerberos -no-webengine-embedded-build $(vopt_if sndio '' '-no')-webengine-sndio
+ $(vopt_if pipewire '' '-no')-webengine-webrtc-pipewire"
 # Rely on auto detection (fails if forced for cross builds) -webengine-alsa
 hostmakedepends="qt5-qmake gperf ninja qt5-host-tools flex pkg-config nodejs
  which perl python protobuf nss-devel libevent-devel zlib-devel icu-devel"
@@ -21,7 +22,7 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- $(vopt_if sndio sndio-devel)"
+ $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
@@ -32,8 +33,9 @@ checksum="8e86257d25a641939d50c14de2049b384c371fcb70a60a289dc5426be0423b40
  ee97e569529a60729e3c6b7317011fd2cc40600079e90c4afa2e5ea9edcd58ef"
 patch_args="-Np1"
 
-build_options="sndio"
-build_options_default=""
+build_options="sndio pipewire"
+build_options_default="pipewire"
+desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 4476d49aeada0f088a38c8502ab5a9a5fd27f03d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Mar 2021 18:43:51 +0100
Subject: [PATCH 3157/3458] openssl: fix ppcle support

---
 srcpkgs/openssl/patches/xxx-ppcle.patch | 53 +++++++++++++++++++++++++
 srcpkgs/openssl/template                |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/openssl/patches/xxx-ppcle.patch

diff --git a/srcpkgs/openssl/patches/xxx-ppcle.patch b/srcpkgs/openssl/patches/xxx-ppcle.patch
new file mode 100644
index 000000000000..09f1da8ca196
--- /dev/null
+++ b/srcpkgs/openssl/patches/xxx-ppcle.patch
@@ -0,0 +1,53 @@
+commit 56e07856a7a9f7ce3582b8cf3843f252691475a6
+Author: q66 <daniel@octaforge.org>
+Date:   Fri Mar 5 18:36:01 2021 +0100
+
+    add ppcle support
+
+diff --git Configurations/10-main.conf Configurations/10-main.conf
+index 8dc3e85..18f10c9 100644
+--- Configurations/10-main.conf
++++ Configurations/10-main.conf
+@@ -665,6 +665,11 @@ my %targets = (
+         perlasm_scheme   => "linux32",
+         lib_cppflags     => add("-DB_ENDIAN"),
+     },
++    "linux-ppcle" => {
++        inherit_from     => [ "linux-generic32", asm("ppc32_asm") ],
++        perlasm_scheme   => "linux32le",
++        lib_cppflags     => add("-DL_ENDIAN"),
++    },
+     "linux-ppc64" => {
+         inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
+         cflags           => add("-m64"),
+diff --git config config
+index 26225ca..6a1e830 100755
+--- config
++++ config
+@@ -543,6 +543,7 @@ case "$GUESSOS" in
+ 	fi
+ 	;;
+   ppc64le-*-linux2) OUT="linux-ppc64le" ;;
++  ppcle-*-linux2) OUT="linux-ppcle" ;;
+   ppc-*-linux2) OUT="linux-ppc" ;;
+   mips64*-*-linux2)
+ 	echo "WARNING! If you wish to build 64-bit library, then you have to"
+diff --git crypto/poly1305/asm/poly1305-ppc.pl crypto/poly1305/asm/poly1305-ppc.pl
+index e5d6933..3283f6b 100755
+--- crypto/poly1305/asm/poly1305-ppc.pl
++++ crypto/poly1305/asm/poly1305-ppc.pl
+@@ -314,10 +314,10 @@ $code.=<<___;
+ 	beq-	Lno_key
+ ___
+ $code.=<<___	if ($LITTLE_ENDIAN);
+-	lw	$h0,0($inp)		# load key material
+-	lw	$h1,4($inp)
+-	lw	$h2,8($inp)
+-	lw	$h3,12($inp)
++	lwz	$h0,0($inp)		# load key material
++	lwz	$h1,4($inp)
++	lwz	$h2,8($inp)
++	lwz	$h3,12($inp)
+ ___
+ $code.=<<___	if (!$LITTLE_ENDIAN);
+ 	li	$h1,4
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 53d7f3abf022..da0193d1fc54 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -34,6 +34,7 @@ case $XBPS_TARGET_MACHINE in
 	aarch64*) configure_args+=" linux-aarch64";;
 	ppc64le*) configure_args+=" linux-ppc64le";;
 	ppc64*) configure_args+=" linux-ppc64";;
+	ppcle*) configure_args+=" linux-ppcle";;
 	ppc*) configure_args+=" linux-ppc";;
 	arm*) configure_args+=" linux-armv4";;
 	mips*) configure_args+=" linux-mips32 -mips32";;

From d4ce4523e750944c861fde8c42acaaffddbb06e2 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Thu, 4 Mar 2021 21:59:09 +0100
Subject: [PATCH 3158/3458] ffmpeg: update to 4.3.2.

---
 .../patches/x86-yuv2rgb-crash-fix.patch       | 59 -------------------
 srcpkgs/ffmpeg/template                       |  6 +-
 2 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch

diff --git a/srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch b/srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch
deleted file mode 100644
index 1438ac4ee269..000000000000
--- a/srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ba3e771a42c29ee02c34e7769cfc1b2dbc5c760a Mon Sep 17 00:00:00 2001
-From: James Almer <jamrial@gmail.com>
-Date: Sun, 12 Jul 2020 21:32:01 -0300
-Subject: [PATCH] x86/yuv2rgb: fix crashes when storing data on unaligned
- buffers
-
-Regression since fc6a5883d6af8cae0e96af84dda0ad74b360a084 on SSSE3 enabled
-CPUs.
-
-Fixes ticket #8747
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libswscale/x86/yuv_2_rgb.asm | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git libswscale/x86/yuv_2_rgb.asm b/libswscale/x86/yuv_2_rgb.asm
-index 575a84d921e9..003dff1f259c 100644
---- libswscale/x86/yuv_2_rgb.asm
-+++ libswscale/x86/yuv_2_rgb.asm
-@@ -268,9 +268,9 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters
-     por    m2, m7
-     por    m1, m6          ; g5  b5  r6  g6  b6  r7  g7  b7  r8  g8  b8  r9  g9  b9  r10 g10
-     por    m2, m3          ; b10 r11 g11 b11 r12 g12 b12 r13 g13 b13 r14 g14 b14 r15 g15 b15
--    mova [imageq], m0
--    mova [imageq + 16], m1
--    mova [imageq + 32], m2
-+    movu [imageq], m0
-+    movu [imageq + 16], m1
-+    movu [imageq + 32], m2
- %endif ; mmsize = 16
- %else ; PACK RGB15/16/32
-     packuswb m0, m1
-@@ -300,10 +300,10 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters
-     punpckhwd m_green, m_red
-     punpcklwd m5, m6
-     punpckhwd m_alpha, m6
--    mova [imageq + 0], m_blue
--    mova [imageq + 8  * time_num], m_green
--    mova [imageq + 16 * time_num], m5
--    mova [imageq + 24 * time_num], m_alpha
-+    movu [imageq + 0], m_blue
-+    movu [imageq + 8  * time_num], m_green
-+    movu [imageq + 16 * time_num], m5
-+    movu [imageq + 24 * time_num], m_alpha
- %else ; PACK RGB15/16
- %define depth 2
- %if cpuflag(ssse3)
-@@ -342,8 +342,8 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters
-     mova m2, m0
-     punpcklbw m0, m1
-     punpckhbw m2, m1
--    mova [imageq], m0
--    mova [imageq + 8 * time_num], m2
-+    movu [imageq], m0
-+    movu [imageq + 8 * time_num], m2
- %endif ; PACK RGB15/16
- %endif ; PACK RGB15/16/32
- 
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 7a23a7900298..76c9423d02fe 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,15 +1,15 @@
 # Template file for 'ffmpeg'
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
-version=4.3.1
-revision=7
+version=4.3.2
+revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb
+checksum=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel

From 1ba00e511959fbacd1c6673a57c291a9bc122ef6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 5 Mar 2021 23:12:02 +0200
Subject: [PATCH 3159/3458] font-3270: update to 2.3.0.

---
 srcpkgs/font-3270/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-3270/template b/srcpkgs/font-3270/template
index 3b929784700d..17ace4ab031b 100644
--- a/srcpkgs/font-3270/template
+++ b/srcpkgs/font-3270/template
@@ -1,7 +1,7 @@
 # Template file for 'font-3270'
 pkgname=font-3270
-version=2.0.4
-revision=2
+version=2.3.0
+revision=1
 wrksrc="3270font-${version}"
 build_style=gnu-makefile
 make_build_target="font"
@@ -11,7 +11,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/rbanffy/3270font"
 distfiles="https://github.com/rbanffy/3270font/archive/v${version}.tar.gz"
-checksum=a845a966d71fdefe8e3cba1bbce5feaf2c11818a4b1113570cb71b84c0c10302
+checksum=c29b6bb4efb95c8d85a53bd7a89146e52e0ee5901bb9acd31d3ae394913ebe5b
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {

From a91e238a59c23c135c87cddb1d8beba14d1c3436 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:16:24 +0100
Subject: [PATCH 3160/3458] kColorPicker: update to 0.1.5.

---
 common/shlibs                 | 2 +-
 srcpkgs/kColorPicker/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a911b3892cbc..11ca26f6bb45 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -511,8 +511,8 @@ libkdexoauth2.so.3 kdepim-runtime-17.12.3_1
 libakonadi-filestore.so.5 kdepim-runtime-17.12.3_1
 libmaildir.so.5 kdepim-runtime-17.12.3_1
 libfolderarchivesettings.so.5 kdepim-runtime-17.12.3_1
-libkColorPicker.so.0.1.4 kColorPicker-0.1.4_1
 libkImageAnnotator.so.0.4.0 kImageAnnotator-0.4.0_1
+libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
 libicuio.so.67 icu-libs-67.1_1
diff --git a/srcpkgs/kColorPicker/template b/srcpkgs/kColorPicker/template
index ff348dfaf147..337263c2a3d9 100644
--- a/srcpkgs/kColorPicker/template
+++ b/srcpkgs/kColorPicker/template
@@ -1,6 +1,6 @@
 # Template file for 'kColorPicker'
 pkgname=kColorPicker
-version=0.1.4
+version=0.1.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=ON -DBUILD_EXAMPLE=OFF -DBUILD_SHARED_LIBS=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/DamirPorobic/kColorPicker"
 distfiles="https://github.com/DamirPorobic/kColorPicker/archive/v${version}.tar.gz"
-checksum=3036d00cce2a8cc6a0bc87a9a3ff629e21adbdaa509e41f23a2ef1661d537c72
+checksum=fe6f6c540f3921cc7097f1e5cf001883f814a9c2678c85b7f78fb7a2ba2a8c34
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 52d50d57d2061ad500d98ddb54902c62dfe87bfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:16:30 +0100
Subject: [PATCH 3161/3458] kImageAnnotator: update to 0.4.1.

---
 common/shlibs                    | 2 +-
 srcpkgs/kImageAnnotator/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 11ca26f6bb45..b39ab2945e0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -511,7 +511,7 @@ libkdexoauth2.so.3 kdepim-runtime-17.12.3_1
 libakonadi-filestore.so.5 kdepim-runtime-17.12.3_1
 libmaildir.so.5 kdepim-runtime-17.12.3_1
 libfolderarchivesettings.so.5 kdepim-runtime-17.12.3_1
-libkImageAnnotator.so.0.4.0 kImageAnnotator-0.4.0_1
+libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
diff --git a/srcpkgs/kImageAnnotator/template b/srcpkgs/kImageAnnotator/template
index 9a7fecc803cb..0b731a6f5238 100644
--- a/srcpkgs/kImageAnnotator/template
+++ b/srcpkgs/kImageAnnotator/template
@@ -1,6 +1,6 @@
 # Template file for 'kImageAnnotator'
 pkgname=kImageAnnotator
-version=0.4.0
+version=0.4.1
 revision=1
 build_style=cmake
 # XXX: Tests don't build
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/DamirPorobic/kImageAnnotator"
 distfiles="https://github.com/DamirPorobic/kImageAnnotator/archive/v${version}.tar.gz"
-checksum=4ce8b9853e7c55cffd5eb5fe42ca89ead55db5f432be1b715e6f2804f7e8287d
+checksum=64e62f7379a0741f675515e57c21311ebbc6544da8c8a003a5a1ec4964902ac8
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 1df5c4268d3e370ef8ea042e42878e3928be61e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:16:38 +0100
Subject: [PATCH 3162/3458] ksnip: update to 1.8.1.

---
 srcpkgs/ksnip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksnip/template b/srcpkgs/ksnip/template
index 429eff085f90..b0de5c518d27 100644
--- a/srcpkgs/ksnip/template
+++ b/srcpkgs/ksnip/template
@@ -1,6 +1,6 @@
 # Template file for 'ksnip'
 pkgname=ksnip
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/DamirPorobic/ksnip"
 distfiles="https://github.com/DamirPorobic/ksnip/archive/v${version}.tar.gz"
-checksum=25f858925c692866edabd3fc5f4b20c55cb3aa61b8c0ca391aafbf81538271f1
+checksum=1842628cc444d83bc16170285e313b740219aa2d4a0ad3b630a91a6cea39de59

From c300c597ac107b94c82badb2f01b4a6908de4260 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 5 Mar 2021 10:33:44 -0800
Subject: [PATCH 3163/3458] R-cran-lifecycle: update to 1.0.0

Adopt.

Change license to MIT, was relicensed:
https://github.com/r-lib/lifecycle/issues/57
---
 srcpkgs/R-cran-lifecycle/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index d9c68d9803e4..e3a2af69c4e6 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -1,12 +1,16 @@
 # Template file for 'R-cran-lifecycle'
 pkgname=R-cran-lifecycle
-version=0.2.0
-revision=2
+version=1.0.0
+revision=1
 build_style=R-cran
 makedepends="R-cran-glue R-cran-rlang"
 depends="R-cran-glue R-cran-rlang"
 short_desc="Manage the Life Cycle of your Package Functions"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-only"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
 homepage="https://github.com/r-lib/lifecycle"
-checksum=29746e8dee05d4e36f9c612e8c7a903a4f648a36b3b94c9776e518c38a412224
+checksum=03334ab213f2ad49a49e184e73f2051e04d35d43f562db903e68243cd2ec0f8e
+
+post_install() {
+	vlicense LICENSE
+}

From 3e2c377581dacc09385d6c0d7b8fed59c53c9db1 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 5 Mar 2021 10:41:17 -0800
Subject: [PATCH 3164/3458] R-cran-dplyr: update to 1.0.5

---
 srcpkgs/R-cran-dplyr/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/R-cran-dplyr/template b/srcpkgs/R-cran-dplyr/template
index accff9c5957c..46e0fe526326 100644
--- a/srcpkgs/R-cran-dplyr/template
+++ b/srcpkgs/R-cran-dplyr/template
@@ -1,19 +1,19 @@
 # Template file for 'R-cran-dplyr'
 pkgname=R-cran-dplyr
-version=1.0.4
+version=1.0.5
 revision=1
 build_style=R-cran
 makedepends="R-cran-ellipsis R-cran-generics R-cran-glue R-cran-lifecycle
  R-cran-magrittr R-cran-R6 R-cran-rlang R-cran-tibble R-cran-tidyselect
  R-cran-vctrs"
 depends="R-cran-ellipsis R-cran-generics R-cran-glue>=1.3.2
- R-cran-lifecycle>=0.2.0 R-cran-magrittr>=1.5 R-cran-R6 R-cran-rlang>=0.4.7
- R-cran-tibble>=2.1.3 R-cran-tidyselect>=1.1.0 R-cran-vctrs>=0.3.2"
+ R-cran-lifecycle>=1.0.0 R-cran-magrittr>=1.5 R-cran-R6 R-cran-rlang>=0.4.10
+ R-cran-tibble>=2.1.3 R-cran-tidyselect>=1.1.0 R-cran-vctrs>=0.3.5"
 short_desc="Grammar of Data Manipulation for R"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
 homepage="https://dplyr.tidyverse.org/"
-checksum=9bf68f71d1519432bad08089fc254b872c990c5a40b32a7e63b03d49f88e093a
+checksum=7541a09c66ecb40736e25bc9ec9591f26ec4ee67c99823b4ac855760b5c96e70
 
 post_install() {
 	vlicense LICENSE

From 134de6969e1f6fe01c8f113092a00b2580d27399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 8 Mar 2021 19:38:10 +0100
Subject: [PATCH 3165/3458] homebank: update to 5.5.1.

---
 srcpkgs/homebank/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 34ca327ed00e..707ae59fb402 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5
+version=5.5.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -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=dedaa6b02c505cd02c0ec2dd8b2ba4e0cc9d1f45a01eab0da60ab1bc2a7e6c75
+checksum=9bb39eaad3c4c68d2bcbe21e2f6c4a5274e3a3f385afb2b2ff73ae5fd998da08
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 0f58b526e69d99da205e25d13e45b07a6d3eaf27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 8 Mar 2021 19:21:00 +0100
Subject: [PATCH 3166/3458] croc: update to 8.6.9.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 7285728d0ab4..86c972ffbcf1 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=8.6.8
+version=8.6.9
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=71dc45ab9511bc2a8807562632a6393e264ac59c500d6a17e2e1b01269d4d8e3
+checksum=0ef4359916e02fd7c754bda7093c924310729e002a06cfe015ea57b34b522cbf
 
 post_install() {
 	vlicense LICENSE

From f2eda20cc39f2a8ac022d91120293cd115574d41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:30:53 +0100
Subject: [PATCH 3167/3458] pioneer: update to 20210203.

---
 srcpkgs/pioneer/patches/i686-alignof.patch | 23 ----------------------
 srcpkgs/pioneer/template                   |  7 ++++---
 2 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/pioneer/patches/i686-alignof.patch

diff --git a/srcpkgs/pioneer/patches/i686-alignof.patch b/srcpkgs/pioneer/patches/i686-alignof.patch
deleted file mode 100644
index a28367b8fe53..000000000000
--- a/srcpkgs/pioneer/patches/i686-alignof.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/pioneerspacesim/pioneer/issues/4691
----
---- src/scenegraph/Serializer.orig.h	2019-10-09 13:49:04.000000000 +0200
-+++ src/scenegraph/Serializer.h	2019-10-09 18:47:05.238671730 +0200
-@@ -23,14 +23,14 @@
- // where possible, prefer serializing state information via JSON instead.
- namespace Serializer {
- 	static_assert((sizeof(Uint32) == 4 && alignof(Uint32) == 4), "Int32 is sized differently on this platform and will not serialize properly.");
--	static_assert((sizeof(Uint64) == 8 && alignof(Uint64) == 8), "Int64 is sized differently on this platform and will not serialize properly.");
-+	static_assert((sizeof(Uint64) == 8 && alignof(Uint64) <= 8), "Int64 is sized differently on this platform and will not serialize properly.");
- 	static_assert((sizeof(Color) == 4 && alignof(Color) == 1), "Color is padded differently on this platform and will not serialize properly.");
- 	static_assert((sizeof(vector2f) == 8 && alignof(vector2f) == 4), "Vector2f is padded differently on this platform and will not serialize properly.");
--	static_assert((sizeof(vector2d) == 16 && alignof(vector2d) == 8), "Vector2d is padded differently on this platform and will not serialize properly.");
-+	static_assert((sizeof(vector2d) == 16 && alignof(vector2d) <= 8), "Vector2d is padded differently on this platform and will not serialize properly.");
- 	static_assert((sizeof(vector3f) == 12 && alignof(vector3f) == 4), "Vector3f is padded differently on this platform and will not serialize properly.");
--	static_assert((sizeof(vector3d) == 24 && alignof(vector3d) == 8), "Vector3d is padded differently on this platform and will not serialize properly.");
-+	static_assert((sizeof(vector3d) == 24 && alignof(vector3d) <= 8), "Vector3d is padded differently on this platform and will not serialize properly.");
- 	static_assert((sizeof(Quaternionf) == 16 && alignof(Quaternionf) == 4), "Quaternionf is padded differently on this platform and will not serialize properly.");
--	static_assert((sizeof(Aabb) == 56 && alignof(Aabb) == 8), "Aabb is padded differently on this platform and will not serialize properly.");
-+	static_assert((sizeof(Aabb) == 56 && alignof(Aabb) <= 8), "Aabb is padded differently on this platform and will not serialize properly.");
- 
- 	class Writer {
- 	public:
diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index ad0f19559488..40812890ec7a 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,8 +1,9 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20200203
-revision=2
+version=20210203
+revision=1
 build_style=cmake
+make_build_target="all build-data"
 configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
  -DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
 hostmakedepends="automake pkg-config"
@@ -14,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=3055d63c1bd3377c3794eee830a8adbd650b178bad9e927531e38cb5d5838694
+checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"

From 9f062084fa161e4164ce31a2d820592eab5eef2c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 8 Mar 2021 15:35:16 +0100
Subject: [PATCH 3168/3458] serd: update to 0.30.10.

enable tests
---
 srcpkgs/serd/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/serd/template b/srcpkgs/serd/template
index f639412f20cc..b024f166830b 100644
--- a/srcpkgs/serd/template
+++ b/srcpkgs/serd/template
@@ -1,6 +1,6 @@
 # Template file for 'serd'
 pkgname=serd
-version=0.30.6
+version=0.30.10
 revision=1
 build_style=waf3
 short_desc="Lightweight C library for RDF syntax"
@@ -8,7 +8,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="http://drobilla.net/software/serd/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
-checksum=f5a2c74c659d8b318059068f135a43a3771491c367b6947e053a713b23cd37ef
+checksum=affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf
+
+if [ "${XBPS_CHECK_PKGS}" ]; then
+	configure_args+=" --test"
+fi
+
+do_check() {
+	./waf test
+}
 
 post_install() {
 	vlicense COPYING

From 9400f77c33d60b30e5d75da95cd4c0e9a66bf2b3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 8 Mar 2021 20:35:11 +0100
Subject: [PATCH 3169/3458] libshout-idjc: update to 2.4.4.

---
 srcpkgs/libshout-idjc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libshout-idjc/template b/srcpkgs/libshout-idjc/template
index 41ae070d8704..93b730460e9e 100644
--- a/srcpkgs/libshout-idjc/template
+++ b/srcpkgs/libshout-idjc/template
@@ -1,6 +1,6 @@
 # Template file for 'libshout-idjc'
 pkgname=libshout-idjc
-version=2.4.3
+version=2.4.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://idjc.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/libshoutidjc.idjc.p/${pkgname}-${version}.tar.gz"
-checksum=3bb1b9b2c2bbb8936556e92c5099cfa5b691be3e22d0ff1b8e1251ec929e960c
+checksum=8bcfb805b4a440929244e588b018b5f466724a5d922a1dc1522253dfdf433fe5
 
 pre_configure() {
 	autoreconf -fi

From fd903b5fa4c31598e4c38a259326edda3445c73d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 8 Mar 2021 20:28:16 +0100
Subject: [PATCH 3170/3458] libshout: update to 2.4.5.

---
 srcpkgs/libshout/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libshout/template b/srcpkgs/libshout/template
index eca2c9a704d6..88209dc06dca 100644
--- a/srcpkgs/libshout/template
+++ b/srcpkgs/libshout/template
@@ -1,6 +1,6 @@
 # Template file for 'libshout'
 pkgname=libshout
-version=2.4.3
+version=2.4.5
 revision=1
 build_style=gnu-configure
 makedepends="libtheora-devel libvorbis-devel speex-devel"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://www.icecast.org/"
 distfiles="http://downloads.xiph.org/releases/libshout/libshout-${version}.tar.gz"
-checksum=0d8af55d1141bf90710bcd41a768c9cc5adb251502a0af1dd22c8da215d40dfe
+checksum=d9e568668a673994ebe3f1eb5f2bee06e3236a5db92b8d0c487e1c0f886a6890
 
 post_install() {
 	vinstall shout.pc 644 usr/lib/pkgconfig

From 32733ff49457e3809a404a2779896302d01817ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 22 Feb 2021 20:02:13 -0300
Subject: [PATCH 3171/3458] giac: missing dependencies and fixes

 - makedepend on mpfr-devel: used for arbitrary precision floats,
   otherwise they are limited to double precision (53 bits ~ 13 digits)

 - makedepend on pari-devel: used for number theory functions

 - fix one line of test output to match a change in pari

 - fix a bug in invmod which resulted in a test fail (chk_xavier)

 - increase stacksize in musl which is needed for tests to pass

In addition to the two new makedepends, there is a small patch that
fixes one line of test output to match a change in pari.

With this commit, all 12 tests pass in glibc and in musl.

See #28989 for the original issue.
---
 common/shlibs                        |  1 +
 srcpkgs/giac/patches/invmod.patch    | 14 ++++++++++++++
 srcpkgs/giac/patches/pari_2_11.patch | 17 +++++++++++++++++
 srcpkgs/giac/template                |  7 +++++--
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/giac/patches/invmod.patch
 create mode 100644 srcpkgs/giac/patches/pari_2_11.patch

diff --git a/common/shlibs b/common/shlibs
index b39ab2945e0f..42f37d8a08bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3964,4 +3964,5 @@ libopenaptx.so.0 libopenaptx-0.2.0_1
 libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
+libpari-gmp.so.7 pari-2.13.0_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
diff --git a/srcpkgs/giac/patches/invmod.patch b/srcpkgs/giac/patches/invmod.patch
new file mode 100644
index 000000000000..6aab28d72531
--- /dev/null
+++ b/srcpkgs/giac/patches/invmod.patch
@@ -0,0 +1,14 @@
+--- src/modpoly.cc.orig	2020-02-18 10:07:10.000000000 -0300
++++ src/modpoly.cc	2021-03-08 02:18:09.443740199 -0300
+@@ -92,7 +92,10 @@
+   gen invenv(const gen & g,environment * env){
+     if (g.type==_USER)
+       return g._USERptr->inv();
+-    return invmod(g,env->modulo);
++    if (env->moduloon)
++      return invmod(g,env->modulo);
++    else
++      return gen(1)/g;
+   }
+
+   /*
diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch
new file mode 100644
index 000000000000..7bd12dd1ce7b
--- /dev/null
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@@ -0,0 +1,17 @@
+Change test output for PARI 2.11
+
+See https://trac.sagemath.org/ticket/25567
+and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102
+
+diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
+--- check/TP11-sol.cas.out1	2014-10-21 10:51:48.000000000 +0200
++++ check/TP11-sol.cas.out1	2018-08-07 17:04:12.528052773 +0200
+@@ -10,7 +10,7 @@
+ 1073741824000000000000000000061203284109000000000000000000000000008409,
+ 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
+ "Done",
+-matrix[[2,7,1],[3,2,1],[389,2,1],[733,2,1],[156904374622257604823879982847602392900751802349981470895277241,2,matrix[[2,13,1],[3,3,1],[5,2,1],[7,2,1],[56467,2,1],[6553084925887974620811527,2,matrix[[2,5,1],[19,2,1],[71,2,1],[126823,2,1]]]]]],
++1,
+ 0,
+ [],
+ 1,
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index ba2d1a55b739..ca95534498f2 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,11 +1,11 @@
 # Template file for 'giac'
 pkgname=giac
 version=1.5.0.87
-revision=3
+revision=4
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
 makedepends="fltk-devel gmp-devel gsl-devel lapack-devel
- libjpeg-turbo-devel libpng-devel readline-devel"
+ libjpeg-turbo-devel libpng-devel readline-devel mpfr-devel pari-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Free computer algebra system"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,6 +14,9 @@ homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
 checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4
 
+# need more than 4*65536 stack, see try_parse() in gen.cc line 11812
+LDFLAGS="-Wl,-z,stack-size=2097152"
+
 post_install() {
 	# remove duplicates
 	rm -r ${DESTDIR}/usr/share/doc

From 755482fe6c16381e5069bcfb50159ded979bdda3 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 8 Mar 2021 22:16:27 +0100
Subject: [PATCH 3172/3458] teams-bin: update to 1.4.00.4855.

---
 srcpkgs/teams-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/teams-bin/template b/srcpkgs/teams-bin/template
index 896093cc414e..bd40abe82386 100644
--- a/srcpkgs/teams-bin/template
+++ b/srcpkgs/teams-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'teams-bin'
 pkgname=teams-bin
-version=1.3.00.30857
+version=1.4.00.4855
 revision=1
 archs="x86_64"
 short_desc="Official Microsoft Teams client"
@@ -8,7 +8,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:Proprietary"
 homepage="https://teams.microsoft.com/downloads"
 distfiles="https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"
-checksum=5058b1fe8bf9fffc57d94148a7ec55119c5cd9b21aa267cb13518bec0244241b
+checksum=a91dbdf646f12659fdf8d08831aa06ab1bf4cc6fb981841c36a350f29bd714bc
 
 repository=nonfree
 restricted=yes

From 71817231eaf471520e67fd0ba743417d1b7a0a06 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Mar 2021 23:14:56 +0200
Subject: [PATCH 3173/3458] notcurses: update to 2.2.3.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 9e9f2fc95dc8..1932bd050acc 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.2.2
+version=2.2.3
 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=f6e31e2662aad880373e45f23f4056c5fd254627b57084d71da2430df20f0488
+checksum=007b13c3b67de5c86b0004d29b414c0e8bd1c80a7bf00f208423cb1db5fd9e62
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From a724d3fa956d00bc716a4ec20a10b632f39dfb81 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Mon, 8 Mar 2021 22:53:14 +0100
Subject: [PATCH 3174/3458] mkvtoolnix: update to 55.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 18b16d506ae2..a6606d0adca1 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=54.0.0
+version=55.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=792fa095eaeeda9030f1f189ab40c2ebf8363c9a90ebe482d68dc05b4e16a52c
+checksum=6061639bda18adbf5c49264d5498fd2abab420113ba680d0eb441a9aa02afba6
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 6fcbe60224d5dbda7605c07fd58248d65d29a0d0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 8 Mar 2021 16:24:05 -0700
Subject: [PATCH 3175/3458] steam: update to 1.0.0.69.

---
 srcpkgs/steam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index be37076e7bbf..08690968c415 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,6 +1,6 @@
 # Template file for 'steam'
 pkgname=steam
-version=1.0.0.68
+version=1.0.0.69
 revision=1
 archs="i686 x86_64"
 wrksrc=steam-launcher
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom: Proprietary license"
 homepage="https://steampowered.com/"
 distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=65e882623c671f402d8796c1db4407984f11df0538ff7462030d8d521aeb28d3
+checksum=6f9838014a6b13f953ba726ce7d203946bb93bfd5d074901bc216ad04ab2c767
 repository=nonfree
 
 do_install() {

From cdc5d9ca1ae269746624d64207c96b8e0a943f46 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Sat, 6 Mar 2021 20:50:06 +0100
Subject: [PATCH 3176/3458] spotifyd: update to 0.3.2.

Closes: #29318 [via git-merge-pr]
---
 srcpkgs/spotifyd/template | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index 2e21b38230c3..452356c3c8ae 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,7 +1,7 @@
 # Template file for 'spotifyd'
 pkgname=spotifyd
-version=0.3.0
-revision=3
+version=0.3.2
+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=47b3d9a87a9bc8ff5a46b9ba3ccb5ea0b305964c6f334e601a0316697d8bcd4a
+checksum=d1d5442e6639cde7fbd390a65335489611eec62a1cfcba99a4aba8e8977a9d9c
 
 build_options="alsa pulseaudio portaudio dbus"
 build_options_default="alsa pulseaudio portaudio dbus"
@@ -33,11 +33,3 @@ fi
 case "$XBPS_TARGET_MACHINE" in
 	aarch64-musl) broken="https://travis-ci.org/void-linux/void-packages/jobs/636076091" ;;
 esac
-
-post_patch() {
-	vsed -e 's/"with-tremor"//' -i Cargo.toml
-}
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

From 123da8d8cfb8b04651a86ed7366f86ed6f2c646d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 8 Mar 2021 22:58:05 +0100
Subject: [PATCH 3177/3458] qt5-webengine: fix on ppc64le

---
 .../patches/0090-qtwebengine-ppc64.patch      | 36 +++++++++++++++++++
 srcpkgs/qt5-webengine/template                | 11 ++++++
 2 files changed, 47 insertions(+)

diff --git a/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch b/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch
index 43a29601a7ef..8c222ca89ee1 100644
--- a/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch
+++ b/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch
@@ -1074,6 +1074,42 @@ index b435499f4..ac8a84b6d 100644
      } else {
        public_configs = [ ":no_asm_config" ]
      }
+diff --git a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+index 5617de88..dc8bc176 100644
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -598,7 +598,6 @@ if (is_linux || is_android) {
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -636,6 +635,15 @@ if (is_linux || is_android) {
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        #libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -686,7 +693,6 @@ if (is_linux || is_android) {
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
 diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
 index 07d9171a0..9aed4cb36 100644
 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 795ad3a968d1..8839e2987d34 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -75,6 +75,10 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc64*) makedepends+=" libatomic-devel" ;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*-musl) makedepends+=" libucontext-devel" ;;
+esac
+
 _bootstrap_gn() {
 	local opts
 	# Bootstrap gn (generate ninja)
@@ -128,6 +132,13 @@ post_patch() {
 		${wrksrc}/src/3rdparty/chromium/media/audio/openbsd
 	# Eternal 5.15.2, this can't ever be increased since other components are 5.15.2
 	sed -e "/^MODULE_VERSION/s/5.*/5.15.2/" -i .qmake.conf
+	# enable libucontext on ppc with musl for breakpad
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*-musl)
+			vsed -i 's,#libs +=,libs +=,' \
+				${wrksrc}/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+			;;
+	esac
 }
 
 pre_configure() {

From da34f5c38bbcd1a30afada37482dc8905a4259c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 9 Mar 2021 01:40:07 +0100
Subject: [PATCH 3178/3458] linux4.14: update to 4.14.224

---
 srcpkgs/linux4.14/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index a8cad70c7713..a75047665615 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
 # Template file for 'linux4.14'
 pkgname=linux4.14
-version=4.14.222
-revision=2
+version=4.14.224
+revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -10,7 +10,7 @@ homepage="http://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
- f6be478dbffdd153850aec45f198f236dbfeaf2f62138925793f9726dc442a28"
+ a644325b768cd6dcdacdc753131a3d059b9839712e8e559eb88a37ac47d04f23"
 skip_extraction="patch-${version}.xz"
 python_version=2 #unverified
 patch_args="-Np1"

From 90b11223839f4532bf6f46e5a5bb55080f58f9ae Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 8 Mar 2021 17:30:06 -0700
Subject: [PATCH 3179/3458] python3-blessed: update to 1.18.0.

---
 srcpkgs/python3-blessed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template
index 443141931376..68f5b592fbe5 100644
--- a/srcpkgs/python3-blessed/template
+++ b/srcpkgs/python3-blessed/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-blessed'
 pkgname=python3-blessed
-version=1.17.12
+version=1.18.0
 revision=1
 wrksrc="blessed-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/jquast/blessed"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=32829fddd73737e99e7567f553d29eed926022a18aefffd570d74fedfea3c37a
+checksum=99652b8403dbc140ba044e41843129f4ba9eb3467a2041a3bd7b60cd4a571e3e
 
 post_install() {
 	vlicense LICENSE

From 658b67d5d5adc9bc292f4fe39975dbda323608f6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 8 Mar 2021 17:42:30 -0700
Subject: [PATCH 3180/3458] python3-rich: update to 9.13.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 5b95b25382d6..77e0f19d70bb 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.12.4
+version=9.13.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,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=1e000895221df23cd7f828a9511c15d10189850d4f923b6d8c3d29a32ca95265
+checksum=d59e94a0e3e686f0d268fe5c7060baa1bd6744abca71b45351f5850a3aaa6764
 
 post_install() {
 	vlicense LICENSE

From 7fd356002adb089d6c15c8159ce1d7c7b3172d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 9 Mar 2021 02:11:42 +0100
Subject: [PATCH 3181/3458] linux4.9: update to 4.9.260

---
 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 3649672b6721..f51dc1b74d64 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.259
+version=4.9.260
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a
- 99cacec60833add6d972d7b36da209cc2b81807a46db40a46d408c61a97194dc"
+ 49497a2b9a268c9f19cb489ea9fc1a95ff17c97f8437e77c209518551a086c2b"
 python_version=2 #unverified
 skip_extraction="patch-${version}.xz"
 patch_args="-Np1"

From 17cee24f02ae43a888814e823e7f0fd19895aa29 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 8 Mar 2021 18:11:19 -0700
Subject: [PATCH 3182/3458] sqlmap: update to 1.5.3.

Moved package from /usr/share to /usr/libexec to conform
better.
---
 srcpkgs/sqlmap/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 2ab71edfb778..3bb7fbfdb6aa 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.2
+version=1.5.3
 revision=1
 pycompile_dirs="usr/share/sqlmap"
 depends="python3"
@@ -9,18 +9,18 @@ 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=d567aee3390b39f64215ec7ae53f6b654c28b136b5d2e18629e00b94eb233d06
+checksum=5cdd29b4a86913962ab1eecc1f59bd32a038d1573f70edb1760bf88f01347526
 python_version=3
 
 do_install() {
-	vmkdir usr/share/${pkgname}
+	vmkdir usr/libexec/${pkgname}
 	for dir in data extra lib plugins tamper thirdparty sqlmap.py sqlmapapi.py; do
-		vcopy $dir usr/share/${pkgname}
+		vcopy $dir usr/libexec/${pkgname}
 	done
 
 	vmkdir usr/bin
-	ln -sf /usr/share/${pkgname}/sqlmap.py ${DESTDIR}/usr/bin/
-	ln -sf /usr/share/${pkgname}/sqlmapapi.py ${DESTDIR}/usr/bin/
+	ln -sf /usr/libexec/${pkgname}/sqlmap.py ${DESTDIR}/usr/bin/
+	ln -sf /usr/libexec/${pkgname}/sqlmapapi.py ${DESTDIR}/usr/bin/
 
 	vsconf sqlmap.conf
 }

From 46131dbd7897f414454ca48c41ba5f37d19f8877 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Mon, 8 Mar 2021 18:14:18 -0700
Subject: [PATCH 3183/3458] Amass: update to 3.11.8.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 078b6948b5a2..8cb180f440ea 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.11.5
+version=3.11.8
 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=8c60b7720eddb46bb4a841384485173de66d625dd2362e10c8d15e3106189e0e
+checksum=87c3f0077dd14d5330677d0e86ee8638726b297a158a7a5b860ba9ba0e1d9779

From 12edba354e25bcc58a30c62631bffe9731f2f173 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 02:17:08 +0100
Subject: [PATCH 3184/3458] qt5-webengine: fix abseil nonsense on ppc64le-musl

---
 .../patches/0091-chromium-ppc64le-musl.patch          | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch
index 47904dec06bb..eb8d5f1d86d4 100644
--- a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch
+++ b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch
@@ -54,6 +54,17 @@ index cdce9bf8a..73d77dda4 100644
    defined(_M_IX86) || defined(_M_X64)
  #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
  #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -64,7 +64,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
 diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
 index 03afec7a5..0264ecf13 100644
 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc

From 27432978415030b5523f57453fed52f21cda2c9f Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 8 Mar 2021 23:33:51 -0300
Subject: [PATCH 3185/3458] rust-analyzer: update to 2021.03.08.

---
 srcpkgs/rust-analyzer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 50b594d7b823..e1c24bfe6959 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,7 +1,7 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2021.03.01
-revision=2
+version=2021.03.08
+revision=1
 _ver=${version//./-}
 wrksrc="${pkgname}-${_ver}"
 build_style=cargo
@@ -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=6893a1fc972297dddd48debf87a107b7dcf9f739e221e251e2ef86f469df365f
+checksum=75d810a4b3fd08d8d0948186f077b754ab9a2a02af3d3c6947e0baa58576e43d
 
 export RUST_ANALYZER_REV=${_ver}
 

From 4e00e9268cf933037a7771478377bf6d6c22251e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 04:18:20 +0100
Subject: [PATCH 3186/3458] qt5-webengine: fix more nonsense for ppc64le-musl

---
 .../patches/0091-chromium-ppc64le-musl.patch  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch
index eb8d5f1d86d4..4cd12a7fb419 100644
--- a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch
+++ b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch
@@ -133,6 +133,22 @@ index 901cd68fb..561958c44 100644
  namespace google_breakpad {
  
  namespace {
+diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+index 8e335a09..b2a0f155 100644
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -469,7 +469,11 @@ struct MContext64 {
+   SignalThreadContext64 gp_regs;
+   SignalFloatContext64  fp_regs;
+   SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
+  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
+ };
+ 
+ struct ContextTraits64 : public Traits64 {
 diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
 index dea0d1f39..b203e5b2f 100644
 --- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
@@ -145,3 +161,25 @@ index dea0d1f39..b203e5b2f 100644
  #endif
  
  namespace crashpad {
+diff --git a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+index 9955ce44..4c1cc488 100644
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4216,9 +4216,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    // musl does #define fstatat64 fstatat
++    #ifndef __GLIBC__
++    #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    // set it back like it was
++    #ifndef __GLIBC__
++    #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.

From 697ab2db5d0073372e94cb1c5c34220aade47dff Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Mar 2021 18:26:04 +0200
Subject: [PATCH 3187/3458] 66: update to 0.6.1.2.

---
 ...021570c3037d716a1cb5d95eb06727d1745a5.diff | 47 -------------------
 srcpkgs/66/patches/man_page_fix.diff          | 40 ----------------
 srcpkgs/66/template                           |  9 ++--
 3 files changed, 5 insertions(+), 91 deletions(-)
 delete mode 100644 srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff
 delete mode 100644 srcpkgs/66/patches/man_page_fix.diff

diff --git a/srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff b/srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff
deleted file mode 100644
index 001ee8097c28..000000000000
--- a/srcpkgs/66/patches/e14021570c3037d716a1cb5d95eb06727d1745a5.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/66/66-inservice.c b/src/66/66-inservice.c
-index cfe5995e4fb861b749edca9a324f0207f26facc7..03fda5587df20e796300333c2db9d4847b1aa5b9 100644
---- a/src/66/66-inservice.c
-+++ b/src/66/66-inservice.c
-@@ -621,6 +621,7 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
- 
-         FOREACH_SASTR(&list,pos) {
- 
-+            ssize_t upstream = 0 ;
-             sa.len = 0 ;
-             salink.len = newlen ;
-             if (!stralloc_cats(&salink,"/") ||
-@@ -630,8 +631,25 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
-             if (!file_readputsa_g(&sa,salink.s))
-                 log_dieusys(LOG_EXIT_SYS,"read environment file") ;
- 
--            if (NOFIELD) {
-+            /** Remove warning message */
-+            if (list.s[pos] == '.') {
-+
-+                char t[sa.len + 1] ;
-+
-+                upstream = str_contain(sa.s,"[ENDWARN]") ;
- 
-+                if (upstream == -1)
-+                    log_die(LOG_EXIT_SYS,"invalid upstream configuration file! Do you have modified it? Tries to enable the service again.") ;
-+
-+                auto_strings(t,sa.s + upstream) ;
-+
-+                sa.len = 0 ;
-+
-+                if (!auto_stra(&sa,t))
-+                    log_die_nomem("stralloc") ;
-+            }
-+
-+            if (NOFIELD) {
- 
-                 char *m = "environment variables from: " ;
-                 size_t mlen = strlen(m) ;
-@@ -640,6 +658,7 @@ static void info_display_envfile(char const *field,ss_resolve_t *res)
-                 if (!stralloc_inserts(&sa,0,msg) ||
-                 !stralloc_0(&sa))
-                     log_die_nomem("stralloc") ;
-+
-             }
- 
-             if (pos)
diff --git a/srcpkgs/66/patches/man_page_fix.diff b/srcpkgs/66/patches/man_page_fix.diff
deleted file mode 100644
index 2d25a6ccf4aa..000000000000
--- a/srcpkgs/66/patches/man_page_fix.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/doc/make-man.sh b/doc/make-man.sh
-index fd5d9cd..0c3fee6 100755
---- a/doc/make-man.sh
-+++ b/doc/make-man.sh
-@@ -14,29 +14,26 @@ done
- 
- for i in ${man1}; do
-     lowdown -s -Tman doc/"${i}".md -o doc/man/man1/"${i}".1 || exit 1
--    var=$(head -n1 < doc/man/man1/"${i}".1)
-+    var=$( sed -n -e '/^.TH/p' < doc/man/man1/"${i}".1)
-     var=$(printf '%s' "$var" | tr '7' '1')
--    var="${var} \"\" \"General Commands Manual\""
-     sed -i "s!^.TH.*!${var}!" doc/man/man1/"${i}".1 || exit 1
--    sed -i '2,5d' doc/man/man1/"${i}".1 || exit 1
-+    sed -i '4,8d' doc/man/man1/"${i}".1 || exit 1
- done
- 
- for i in ${man5}; do
-     lowdown -s -Tman doc/"${i}".md -o doc/man/man5/"${i}".5 || exit 1
--    var=$(head -n1 < doc/man/man5/"${i}".5)
-+    var=$( sed -n -e '/^.TH/p' < doc/man/man5/"${i}".5)
-     var=$(printf '%s' "$var" | tr '7' '5')
--    var="${var} \"\" \"File Formats Manual\""
-     sed -i "s!^.TH.*!${var}!" doc/man/man5/"${i}".5 || exit 1
--    sed -i '2,5d' doc/man/man5/"${i}".5 || exit 1
-+    sed -i '4,8d' doc/man/man5/"${i}".5 || exit 1
- done
- 
- for i in ${man8}; do
-     lowdown -s -Tman doc/"${i}".md -o doc/man/man8/"${i}".8 || exit 1
--    var=$(head -n1 < doc/man/man8/"${i}".8)
-+    var=$( sed -n -e '/^.TH/p' < doc/man/man8/"${i}".8)
-     var=$(printf '%s' "$var" | tr '7' '8')
--    var="${var} \"\" \"System Administration\""
-     sed -i "s!^.TH.*!${var}!" doc/man/man8/"${i}".8 || exit 1
--    sed -i '2,5d' doc/man/man8/"${i}".8 || exit 1
-+    sed -i '4,8d' doc/man/man8/"${i}".8 || exit 1
- done
- 
- exit 0
diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 849e5c42c37d..46e5770b2ad0 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
 # Template file for '66'
 pkgname=66
-version=0.6.1.1
-revision=3
+version=0.6.1.2
+revision=1
 wrksrc="66-v${version}"
 build_style=configure
 configure_args="--prefix=/usr
@@ -18,13 +18,14 @@ 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=4f80d94851a8c26e9666ea0f274890fc3abb6185ca1fe9fd8e2ad71e27a2ade9
-patch_args=" -Np1"
+checksum=99de5ede29670ffb55808dc0c3f28a49bf005d594ba3016b13271d4de025f589
 
 conf_files="/etc/66/init.conf"
 
 system_accounts="_s6log"
 
+make_dirs="/var/log/66 0750 _s6log _s6log"
+
 pre_configure() {
 
 	# Clean the default $PATH for service scripts

From 10e936d8285180305afcb72f55fc8106682d095f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 8 Mar 2021 10:43:14 +0100
Subject: [PATCH 3188/3458] google-chrome: update to 89.0.4389.82

---
 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 6b43da734912..4ff8f8c808f2 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=89.0.4389.72
+_chromeVersion=89.0.4389.82
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=8b3ee655bf8c8114f4a6494c2161938582ad8cbe683251760ebe0363f2eb4dc0
+checksum=183089861c5c4c048b479f64b3baac2345bbd06736115210f4180d4c69fc1feb
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 431e786214b4ad3660a9cb7a790c5b6d83642609 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 22 Feb 2021 19:50:34 +0100
Subject: [PATCH 3189/3458] gajim-omemo: update to 2.7.13.

---
 srcpkgs/gajim-omemo/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gajim-omemo/template b/srcpkgs/gajim-omemo/template
index 320d6c9da93c..b96e2f04720b 100644
--- a/srcpkgs/gajim-omemo/template
+++ b/srcpkgs/gajim-omemo/template
@@ -1,16 +1,17 @@
 # Template file for 'gajim-omemo'
 pkgname=gajim-omemo
-version=2.6.80
-revision=2
+version=2.7.13
+revision=1
 wrksrc="omemo"
 hostmakedepends="unzip"
-depends="python3 python3-setuptools python3-cryptography python3-axolotl python3-qrcode"
+depends="python3 python3-setuptools python3-cryptography python3-axolotl
+ python3-qrcode gajim"
 short_desc="Gajim plugin for OMEMO Encryption"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="GPL-3.0-or-later"
 homepage="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
 distfiles="https://ftp.gajim.org/plugins_releases/${pkgname#gajim-}_${version}.zip"
-checksum=a78dc49e1cf460fcb29e65f361c727174a404ab0f69731501122b090407f309d
+checksum=362f546f399fe59671e19ce18555cfa2a9d69a9ad746a1aee405ccb8733859d7
 
 
 do_install() {

From 754658fe3aaa29e78fe7b079d4d78ef2a8dcf01f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 9 Mar 2021 03:27:07 -0300
Subject: [PATCH 3190/3458] qt5-webengine: mark nocross for now.

---
 srcpkgs/qt5-webengine/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 8839e2987d34..4dfdd5d679e4 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,3 +1,6 @@
+nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/32273/steps/shell_3/logs/stdio"
+# using /usr/bin/ld but target libraries
+
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
 version=5.15.3

From abd65968244757e34e23aaae00c3e93a21626c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Mar 2021 03:29:13 -0300
Subject: [PATCH 3191/3458] sdcc: update to 4.1.0.

---
 srcpkgs/sdcc/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template
index 79b49dbad7f6..c1c1c055eaa4 100644
--- a/srcpkgs/sdcc/template
+++ b/srcpkgs/sdcc/template
@@ -1,7 +1,8 @@
 # Template file for 'sdcc'
 pkgname=sdcc
-version=4.0.0
-revision=2
+version=4.1.0
+revision=1
+wrksrc=sdcc
 build_style=gnu-configure
 configure_args="--enable-libgc $(vopt_enable nonfree non-free)"
 hostmakedepends="automake flex bison gputils texinfo"
@@ -11,7 +12,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="http://sdcc.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2"
-checksum=489180806fc20a3911ba4cf5ccaf1875b68910d7aed3f401bbd0695b0bef4e10
+checksum=81edf776d5a2dc61a4b5c3408929db7b25874d69c46e4a71b116be1322fd533f
 python_version=3
 nostrip=yes
 

From 46dcb1441d362f9d60ac63e686dc37a29aa01a92 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 8 Mar 2021 20:04:33 -0600
Subject: [PATCH 3192/3458] gns3-gui: update to 2.2.19.

---
 srcpkgs/gns3-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index be6745aa8856..db049f1065a4 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.18
+version=2.2.19
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=@02c339cd8f53b7315697f5f6402ce7a15b4d669df93fc45b5691c1e9b2ba7b45
+checksum=@8da8b09690bf5d086732c032d3871b8e77fd55efa8553ac9e5f65c4c19bfb3d6
 
 post_patch() {
 	# relax requirements

From 3ba8bab9c2e91a450880aea3c1e981da8237fd7e Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 8 Mar 2021 20:04:44 -0600
Subject: [PATCH 3193/3458] gns3-server: update to 2.2.19.

---
 srcpkgs/gns3-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index f8f637609bba..97b3922b3335 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.18
+version=2.2.19
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=@e8e24139964c6a87a9c133994ca13e8fa2c1c7d1cbc23bfdda0a488f5d203947
+checksum=@d40618d1a623acd27733e9f172a57827eb46d7a25d18d49d7f6a3b77f98296e0
 make_check=no
 
 post_patch() {

From 658e551562d81a4d4b64f8a3648ab4a8c6b009a4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 8 Mar 2021 10:27:01 +0100
Subject: [PATCH 3194/3458] ardour: update to 6.6.

---
 .../patches/fix-musl-platform-detection.patch  | 13 -------------
 srcpkgs/ardour/template                        | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/ardour/patches/fix-musl-platform-detection.patch

diff --git a/srcpkgs/ardour/patches/fix-musl-platform-detection.patch b/srcpkgs/ardour/patches/fix-musl-platform-detection.patch
deleted file mode 100644
index 8f2d29cc423f..000000000000
--- a/srcpkgs/ardour/patches/fix-musl-platform-detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-On musl libc only __linux__ is defined
-
---- libs/vst3/pluginterfaces/base/fplatform.h
-+++ libs/vst3/pluginterfaces/base/fplatform.h
-@@ -86,7 +86,7 @@
- //-----------------------------------------------------------------------------
- // LINUX
- //-----------------------------------------------------------------------------
--#elif __gnu_linux__
-+#elif __linux__
- 	#define SMTG_OS_LINUX	1
- 	#define SMTG_OS_MACOS	0
- 	#define SMTG_OS_WINDOWS	0
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 7fb37a367697..6be4257f2331 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,12 +1,12 @@
 # Template file for 'ardour'
 pkgname=ardour
-version=6.5.0
+version=6.6
 revision=1
-wrksrc="Ardour-${version}"
+_commit="e4e21f4d073ab00b1a0bb6ff6ca49f28b02fd68a"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
  --libjack=weak --optimize --docs --use-external-libs --freedesktop"
-hostmakedepends="python3 graphviz doxygen pkg-config clang perl
+hostmakedepends="git python3 graphviz doxygen pkg-config clang perl
  itstool gettext tar readline-devel"
 makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
  taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel
@@ -15,11 +15,9 @@ makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel
  libltc-devel glibmm-devel"
 depends="desktop-file-utils"
 short_desc="Professional-grade digital audio workstation"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="http://ardour.org"
-distfiles="https://community.ardour.org/src/Ardour-${version}.tar.bz2"
-checksum=ac981ec7565fa8a171116bc2fbeb3198a01aad4b7d7c846f965e074a8a162bdb
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*)  configure_args+=" --dist-target=x86_64" ;;
@@ -31,6 +29,14 @@ case "$XBPS_TARGET_MACHINE" in
 	*)        broken="Don't know build target" ;;
 esac
 
+# Upstream deletes older release tarballs from their site and
+# GitHub tarballs are empty: https://tracker.ardour.org/view.php?id=7328
+do_fetch() {
+	git clone git://github.com/Ardour/ardour ${wrksrc}
+	cd ${wrksrc}
+	git checkout ${_commit}
+}
+
 post_install() {
 	vinstall build/gtk2_ardour/ardour.xml 644 usr/share/mime/packages
 	vinstall "build/gtk2_ardour/ardour${version%%.*}.desktop" \

From 1d5a9001ca1e0fb47f059350b257afd064041070 Mon Sep 17 00:00:00 2001
From: Ulf <void@uw.anonaddy.com>
Date: Mon, 8 Mar 2021 09:45:50 +0000
Subject: [PATCH 3195/3458] Thunar: update to 4.16.4.

---
 srcpkgs/Thunar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index c15c515d944f..496ff9572872 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.3
+version=4.16.4
 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=5524dc89da6f1492a5644214be210c4c2d359723a1f8be3e795ea974f2d1ff72
+checksum=d51a2018c1ba7dcc420e7a84d85cc17a58f26fb1c80ee4c15e689a49f10425f9
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 863b1c22428ba5c1ac5cf60c6f95d4efac79778b Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Mon, 8 Mar 2021 21:03:05 +0100
Subject: [PATCH 3196/3458] libburn: update to 1.5.4.

---
 srcpkgs/libburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libburn/template b/srcpkgs/libburn/template
index 555b578ca6f7..3a7ee343830d 100644
--- a/srcpkgs/libburn/template
+++ b/srcpkgs/libburn/template
@@ -1,6 +1,6 @@
 # Template file for 'libburn'
 pkgname=libburn
-version=1.5.2
+version=1.5.4
 revision=1
 wrksrc="${pkgname}-${version/.pl*/}"
 build_style=gnu-configure
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://scdbackup.sourceforge.net/cdrskin_eng.html"
 distfiles="http://files.libburnia-project.org/releases/${pkgname}-${version}.tar.gz"
-checksum=7b32db1719d7f6516cce82a9d00dfddfb3581725db732ea87d41ea8ef0ce5227
+checksum=525059d10759c5cb8148eebc863bb510e311c663603da7bd2d21c46b7cf63b54
 
 cdrskin_package() {
 	short_desc="Command line CD/DVD/BD writing tool"

From 5cb5f06fc4dc0ccbe54d868c6035a4dbbf28cc02 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 8 Mar 2021 12:13:24 +0100
Subject: [PATCH 3197/3458] soundtouch: update to 2.2.

---
 srcpkgs/soundtouch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/soundtouch/template b/srcpkgs/soundtouch/template
index 9ec87e4f1345..8b516289492a 100644
--- a/srcpkgs/soundtouch/template
+++ b/srcpkgs/soundtouch/template
@@ -1,6 +1,6 @@
 # Template file for 'soundtouch'
 pkgname=soundtouch
-version=2.1.2
+version=2.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-openmp"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.surina.net/soundtouch"
 distfiles="https://gitlab.com/soundtouch/soundtouch/-/archive/${version}/soundtouch-${version}.tar.gz"
-checksum=2826049e2f34efbc4c8a47d00c93649822b0c14e1f29f5569835704814590732
+checksum=525478c745a51dadaf7adb8e5386ec1f903d47196fab5947dc37414344684560
 
 pre_configure() {
 	./bootstrap

From f532068591ee7472b109bda305b573f378dbf59a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 14:14:42 +0100
Subject: [PATCH 3198/3458] erlang: update to 23.2.7.

---
 srcpkgs/erlang/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index e8cb892fc971..d45558762723 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,7 +1,7 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.2.6
-revision=2
+version=23.2.7
+revision=1
 create_wrksrc=yes
 build_wrksrc="otp-OTP-${version}"
 build_style=gnu-configure
@@ -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=5bc6b31b36b949bf06e84d51986311fc1d2ace5e717aae3186dc057d4838445d
+checksum=db84414c42ef5c9d472ddf780cad6f210c2344b22ecd59ca57527bf043ea0943
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 107cb6fc052ffaff05339f7213fd920c05609e66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 Mar 2021 20:17:43 +0100
Subject: [PATCH 3199/3458] netpbm: update to 10.93.01.

---
 srcpkgs/netpbm/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 980c0a34890f..50caefdece5d 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,10 +1,10 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.93.00
+version=10.93.01
 revision=1
-_githash=aff215cc29a295b7bdcc604ae1e71c5514113c29
-_githash_guide=f80c0f70f4ad013f09458728404296f8c814ff6c
+_githash=7f8184372a7db4ad9ac7b30ce892b61e3d375dac
+_githash_guide=c3ea5d343ccdc2945b6ee3bc157af66f89433fd9
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
 hostmakedepends="pkg-config perl python flex"
@@ -16,8 +16,8 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="145cc33e2eefe30c998d13fc18c58008ff71a5406319a5fe32cde0e078033069
- 01b0128492bf1c7df29c666d3d633041dd1c3dc8299df1aa6798ec5de9df004f"
+checksum="23cba2a798563d618380432c603bd8efa0440148cfcf8edca2f5fb09526c0e42
+ 73e83e94b4089d11d2b349b66b6edae801ff24f6a8b9d2f8ea3beb7a9cdceddf"
 
 post_extract() {
 	cd $build_wrksrc
@@ -26,7 +26,8 @@ post_extract() {
 	done
 
 	cd ../netpbm-mirror-${_githash_guide}
-	sed -i 's/ id="pammixmulti"//g' pammixmulti.html
+	vsed -i 's/ id="pammixmulti"//g' pammixmulti.html
+	vsed -i 's/ id="pamhomography"//g' pamhomography.html
 }
 
 do_configure() {

From 534e0b4ef4337ad07c674e8de95d608f7c5ceee9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 Mar 2021 10:37:08 +0100
Subject: [PATCH 3200/3458] kubefwd: update to 1.18.0.

---
 srcpkgs/kubefwd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index c9de916a783d..da5cc8f8a700 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,6 +1,6 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
-version=1.17.4
+version=1.18.0
 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/v${version}.tar.gz"
-checksum=96840482139a8d55d9b41d239f4287271a9339a4f3b18aee994d0da2b26705f3
+distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
+checksum=797068193a9e3edfecc8586290d9fb957239063c79cf2ec8495f3e1ccb31186e
 
 post_install() {
 	vlicense NOTICE

From f84f860358cf79b7714c0f6922fba37782238ed4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 Mar 2021 10:38:07 +0100
Subject: [PATCH 3201/3458] perl-LWP: update to 6.53.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index 354150158ec6..3a35ee990c0e 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.52
+version=6.53
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=b63f67647b7cfb0bace19ada32e4feb2c2e8e0f4204546c62ce6247fa59d778d
+checksum=9cbb7c688416a20c1aba9a32568504af1143ced58b572c502a1b2fb8a500f535

From d06b4bf4e051f242e6671fd40e4a4c174910a860 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 Mar 2021 10:38:38 +0100
Subject: [PATCH 3202/3458] nncp: update to 6.2.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 34845c14176b..19e9f76260fa 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=6.1.0
+version=6.2.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=083a533f7d0212069ae07f9fd6cd22e3c5be09e830f2c9c497d97cf614e5413f
+checksum=272ceded69fff3b3787672973199481ac610b753bb82c22eecec45fc05da40fe
 
 do_build() {
 	make

From 5420b68ae3ded9d801db5fd5938c8b3e537a7bee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 Mar 2021 10:40:50 +0100
Subject: [PATCH 3203/3458] weechat: update to 3.1.

---
 srcpkgs/weechat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 0b4f25139b1a..eaa22c6a06d4 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,6 +1,6 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.0.1
+version=3.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
@@ -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=781d9bfc7e1321447de9949263b82e3ee45639b7d71693558f40ff87211ca6dd
+checksum=a55a2975aa119f76983412507e3ddb3fe68d0744e08739681ddc17744e77a4f7
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"

From bb6f8d71d6896754c19601e2cd05d5a26d385c19 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 Mar 2021 12:17:28 +0100
Subject: [PATCH 3204/3458] linux5.10: update to 5.10.22.

---
 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 0c9e27d86ad2..6ab3eee78065 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.21
+version=5.10.22
 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=9e7fe6ff1665bb578e8a88e761f6727b7f170a81563b93c1d49bd0bb7d7de2af
+checksum=245b16b532d67ca34805bd66790e3697d19269499d9b27056d73bfd0823163df
 python_version=3
 patch_args="-Np1"
 

From fc00e3292c0cae5960214daed6de5c391a48aa2f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 13:13:53 +0100
Subject: [PATCH 3205/3458] EmptyEpsilon: fix serial code on musl and on ppc

---
 .../EmptyEpsilon/patches/musl_and_ppc.patch   | 165 ++++++++++++++++++
 srcpkgs/EmptyEpsilon/template                 |   2 +-
 2 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch

diff --git a/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch b/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch
new file mode 100644
index 000000000000..68812266bef9
--- /dev/null
+++ b/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch
@@ -0,0 +1,165 @@
+this fixes the serial driver on musl as well as on ppc
+
+diff --git src/hardware/serialDriver.cpp src/hardware/serialDriver.cpp
+index 0bb0228..ece29ab 100644
+--- src/hardware/serialDriver.cpp
++++ src/hardware/serialDriver.cpp
+@@ -2,11 +2,14 @@
+ #ifdef __WIN32__
+     #include <windows.h>
+ #endif
+-#ifdef __gnu_linux__
++#ifdef __linux__
+     //Including ioctl or termios conflicts with asm/termios.h which we need for TCGETS2. So locally define the ioctl and tcsendbreak functions. Yes, it's dirty, but it works.
+     //#include <sys/ioctl.h>
+     //#include <termios.h>
+ #ifndef ANDROID
++#ifndef __GLIBC__
++#define __THROW
++#endif
+     extern "C" {
+     extern int ioctl (int __fd, unsigned long int __request, ...) __THROW;
+     extern int tcsendbreak (int __fd, int __duration) __THROW;
+@@ -16,6 +19,12 @@
+     #include <fcntl.h>
+     #include <unistd.h>
+     #include <dirent.h>
++#ifdef __powerpc__
++    /* ppc has no tcgets2 or termios2, but termios covers the same stuff */
++    #define termios2 termios
++    #define TCGETS2 TCGETS
++    #define TCSETS2 TCSETS
++#endif
+ #endif
+ #if defined(__APPLE__) && defined(__MACH__)
+     #include <IOKit/serial/ioss.h>
+@@ -57,7 +66,7 @@ SerialPort::SerialPort(string name)
+         }
+     }
+ #endif
+-#if defined(__gnu_linux__) || (defined(__APPLE__) && defined(__MACH__))
++#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
+     if (!name.startswith("/dev/"))
+         name = "/dev/" + name;
+     handle = open(name.c_str(), O_RDWR | O_NOCTTY | O_NDELAY);
+@@ -76,7 +85,7 @@ SerialPort::~SerialPort()
+     CloseHandle(handle);
+     handle = INVALID_HANDLE_VALUE;
+ #endif
+-#if defined(__gnu_linux__) || (defined(__APPLE__) && defined(__MACH__))
++#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
+     close(handle);
+     handle = 0;
+ #endif
+@@ -87,7 +96,7 @@ bool SerialPort::isOpen()
+ #ifdef __WIN32__
+     return handle != INVALID_HANDLE_VALUE;
+ #endif
+-#if defined(__gnu_linux__) || (defined(__APPLE__) && defined(__MACH__))
++#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
+     return handle;
+ #endif
+     return false;
+@@ -163,7 +172,7 @@ void SerialPort::configure(int baudrate, int databits, EParity parity, EStopBits
+         LOG(ERROR) << "SetCommState failed!" << error;
+     }
+ #endif
+-#ifdef __gnu_linux__
++#ifdef __linux__
+     fsync(handle);
+ 
+     struct termios2 tio;
+@@ -317,7 +326,7 @@ void SerialPort::send(void* data, int data_size)
+         data_size -= written;
+     }
+ #endif
+-#if defined(__gnu_linux__) || (defined(__APPLE__) && defined(__MACH__))
++#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
+     while(data_size > 0)
+     {
+         int written = write(handle, data, data_size);
+@@ -345,7 +354,7 @@ int SerialPort::recv(void* data, int data_size)
+     }
+     return read_size;
+ #endif
+-#if defined(__gnu_linux__) || (defined(__APPLE__) && defined(__MACH__))
++#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
+     int bytes_read = read(handle, data, data_size);
+     if (bytes_read > 0)
+         return bytes_read;
+@@ -361,7 +370,7 @@ void SerialPort::setDTR()
+ #ifdef __WIN32__
+     EscapeCommFunction(handle, SETDTR);
+ #endif
+-#ifdef __gnu_linux__
++#ifdef __linux__
+     int bit = TIOCM_DTR;
+     ioctl(handle, TIOCMBIS, &bit);
+ #endif
+@@ -377,7 +386,7 @@ void SerialPort::clearDTR()
+ #ifdef __WIN32__
+     EscapeCommFunction(handle, CLRDTR);
+ #endif
+-#ifdef __gnu_linux__
++#ifdef __linux__
+     int bit = TIOCM_DTR;
+     ioctl(handle, TIOCMBIC, &bit);
+ #endif
+@@ -393,7 +402,7 @@ void SerialPort::setRTS()
+ #ifdef __WIN32__
+     EscapeCommFunction(handle, SETRTS);
+ #endif
+-#ifdef __gnu_linux__
++#ifdef __linux__
+     int bit = TIOCM_RTS;
+     ioctl(handle, TIOCMBIS, &bit);
+ #endif
+@@ -409,7 +418,7 @@ void SerialPort::clearRTS()
+ #ifdef __WIN32__
+     EscapeCommFunction(handle, CLRRTS);
+ #endif
+-#ifdef __gnu_linux__
++#ifdef __linux__
+     int bit = TIOCM_RTS;
+     ioctl(handle, TIOCMBIC, &bit);
+ #endif
+@@ -425,7 +434,7 @@ void SerialPort::sendBreak()
+     Sleep(1);
+     ClearCommBreak(handle);
+ #endif
+-#if (defined(__gnu_linux__) && !defined(ANDROID)) || (defined(__APPLE__) && defined(__MACH__))
++#if (defined(__linux__) && !defined(ANDROID)) || (defined(__APPLE__) && defined(__MACH__))
+     tcsendbreak(handle, 0);
+ #endif
+ }
+@@ -456,7 +465,7 @@ std::vector<string> SerialPort::getAvailablePorts()
+         LOG(ERROR) << "Failed to open registry key for serial port list.";
+     }
+ #endif
+-#ifdef __gnu_linux__
++#ifdef __linux__
+     DIR* dir = opendir("/dev/");
+     if (dir)
+     {
+@@ -511,7 +520,7 @@ string SerialPort::getPseudoDriverName(string port)
+     }
+     return ret;
+ #endif
+-#ifdef __gnu_linux__
++#ifdef __linux__
+     FILE* f = fopen(("/sys/class/tty/" + port + "/device/modalias").c_str(), "rt");
+     if (!f)
+         return "";
+diff --git src/hardware/serialDriver.h src/hardware/serialDriver.h
+index 29cc0b5..9513457 100644
+--- src/hardware/serialDriver.h
++++ src/hardware/serialDriver.h
+@@ -14,7 +14,7 @@ private:
+ #ifdef __WIN32__
+     HANDLE handle;
+ #endif
+-#if defined(__gnu_linux__) || (defined(__APPLE__) && defined(__MACH__))
++#if defined(__linux__) || (defined(__APPLE__) && defined(__MACH__))
+     int handle;
+ #endif
+ 
diff --git a/srcpkgs/EmptyEpsilon/template b/srcpkgs/EmptyEpsilon/template
index d8e8e46f2dd8..b48b88ba681b 100644
--- a/srcpkgs/EmptyEpsilon/template
+++ b/srcpkgs/EmptyEpsilon/template
@@ -4,7 +4,7 @@ _ver_major=2020
 _ver_minor=11
 _ver_patch=23
 version="${_ver_major}.${_ver_minor}.${_ver_patch}"
-revision=1
+revision=2
 wrksrc="EmptyEpsilon-EE-${version}"
 build_style=cmake
 configure_args="-DSERIOUS_PROTON_DIR=$XBPS_BUILDDIR/SeriousProton-EE-${version}

From 6542f1166d5c2b5f50da833cb7f9d53dfd3c1230 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 13:08:19 +0100
Subject: [PATCH 3206/3458] linux4.4: update to 4.4.260

---
 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 5b4d2e213bd5..dc7d3d86e6b6 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.258
+version=4.4.260
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version%.*}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/patch-${version}.xz"
 checksum="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
- 91504bd4be27cc24aebcbe1d7ddf5c89a7314c1d730da047ef02c46ef15c3cbd"
+ 597944cea613d39ac4452f9ba073819e7d38e50e2cb113509ec5a5baae0f5459"
 skip_extraction="patch-${version}.xz"
 python_version=2 #unverified
 

From 08d833ed74ba09e62b18d62f26551104234ab331 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 13:31:58 +0100
Subject: [PATCH 3207/3458] EmptyEpsilon: fix ioctl on musl

---
 .../EmptyEpsilon/patches/musl_and_ppc.patch   | 42 ++++++++++---------
 srcpkgs/EmptyEpsilon/template                 |  2 +-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch b/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch
index 68812266bef9..821b212ab8b7 100644
--- a/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch
+++ b/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch
@@ -1,10 +1,10 @@
 this fixes the serial driver on musl as well as on ppc
 
 diff --git src/hardware/serialDriver.cpp src/hardware/serialDriver.cpp
-index 0bb0228..ece29ab 100644
+index 0bb0228..d935c63 100644
 --- src/hardware/serialDriver.cpp
 +++ src/hardware/serialDriver.cpp
-@@ -2,11 +2,14 @@
+@@ -2,20 +2,31 @@
  #ifdef __WIN32__
      #include <windows.h>
  #endif
@@ -14,13 +14,17 @@ index 0bb0228..ece29ab 100644
      //#include <sys/ioctl.h>
      //#include <termios.h>
  #ifndef ANDROID
-+#ifndef __GLIBC__
-+#define __THROW
-+#endif
      extern "C" {
++#ifdef __GLIBC__
      extern int ioctl (int __fd, unsigned long int __request, ...) __THROW;
      extern int tcsendbreak (int __fd, int __duration) __THROW;
-@@ -16,6 +19,12 @@
++#else
++    extern int ioctl (int, int, ...);
++    extern int tcsendbreak (int, int);
++#endif
+     }
+ #endif
+     #include <asm/termios.h>
      #include <fcntl.h>
      #include <unistd.h>
      #include <dirent.h>
@@ -33,7 +37,7 @@ index 0bb0228..ece29ab 100644
  #endif
  #if defined(__APPLE__) && defined(__MACH__)
      #include <IOKit/serial/ioss.h>
-@@ -57,7 +66,7 @@ SerialPort::SerialPort(string name)
+@@ -57,7 +68,7 @@ SerialPort::SerialPort(string name)
          }
      }
  #endif
@@ -42,7 +46,7 @@ index 0bb0228..ece29ab 100644
      if (!name.startswith("/dev/"))
          name = "/dev/" + name;
      handle = open(name.c_str(), O_RDWR | O_NOCTTY | O_NDELAY);
-@@ -76,7 +85,7 @@ SerialPort::~SerialPort()
+@@ -76,7 +87,7 @@ SerialPort::~SerialPort()
      CloseHandle(handle);
      handle = INVALID_HANDLE_VALUE;
  #endif
@@ -51,7 +55,7 @@ index 0bb0228..ece29ab 100644
      close(handle);
      handle = 0;
  #endif
-@@ -87,7 +96,7 @@ bool SerialPort::isOpen()
+@@ -87,7 +98,7 @@ bool SerialPort::isOpen()
  #ifdef __WIN32__
      return handle != INVALID_HANDLE_VALUE;
  #endif
@@ -60,7 +64,7 @@ index 0bb0228..ece29ab 100644
      return handle;
  #endif
      return false;
-@@ -163,7 +172,7 @@ void SerialPort::configure(int baudrate, int databits, EParity parity, EStopBits
+@@ -163,7 +174,7 @@ void SerialPort::configure(int baudrate, int databits, EParity parity, EStopBits
          LOG(ERROR) << "SetCommState failed!" << error;
      }
  #endif
@@ -69,7 +73,7 @@ index 0bb0228..ece29ab 100644
      fsync(handle);
  
      struct termios2 tio;
-@@ -317,7 +326,7 @@ void SerialPort::send(void* data, int data_size)
+@@ -317,7 +328,7 @@ void SerialPort::send(void* data, int data_size)
          data_size -= written;
      }
  #endif
@@ -78,7 +82,7 @@ index 0bb0228..ece29ab 100644
      while(data_size > 0)
      {
          int written = write(handle, data, data_size);
-@@ -345,7 +354,7 @@ int SerialPort::recv(void* data, int data_size)
+@@ -345,7 +356,7 @@ int SerialPort::recv(void* data, int data_size)
      }
      return read_size;
  #endif
@@ -87,7 +91,7 @@ index 0bb0228..ece29ab 100644
      int bytes_read = read(handle, data, data_size);
      if (bytes_read > 0)
          return bytes_read;
-@@ -361,7 +370,7 @@ void SerialPort::setDTR()
+@@ -361,7 +372,7 @@ void SerialPort::setDTR()
  #ifdef __WIN32__
      EscapeCommFunction(handle, SETDTR);
  #endif
@@ -96,7 +100,7 @@ index 0bb0228..ece29ab 100644
      int bit = TIOCM_DTR;
      ioctl(handle, TIOCMBIS, &bit);
  #endif
-@@ -377,7 +386,7 @@ void SerialPort::clearDTR()
+@@ -377,7 +388,7 @@ void SerialPort::clearDTR()
  #ifdef __WIN32__
      EscapeCommFunction(handle, CLRDTR);
  #endif
@@ -105,7 +109,7 @@ index 0bb0228..ece29ab 100644
      int bit = TIOCM_DTR;
      ioctl(handle, TIOCMBIC, &bit);
  #endif
-@@ -393,7 +402,7 @@ void SerialPort::setRTS()
+@@ -393,7 +404,7 @@ void SerialPort::setRTS()
  #ifdef __WIN32__
      EscapeCommFunction(handle, SETRTS);
  #endif
@@ -114,7 +118,7 @@ index 0bb0228..ece29ab 100644
      int bit = TIOCM_RTS;
      ioctl(handle, TIOCMBIS, &bit);
  #endif
-@@ -409,7 +418,7 @@ void SerialPort::clearRTS()
+@@ -409,7 +420,7 @@ void SerialPort::clearRTS()
  #ifdef __WIN32__
      EscapeCommFunction(handle, CLRRTS);
  #endif
@@ -123,7 +127,7 @@ index 0bb0228..ece29ab 100644
      int bit = TIOCM_RTS;
      ioctl(handle, TIOCMBIC, &bit);
  #endif
-@@ -425,7 +434,7 @@ void SerialPort::sendBreak()
+@@ -425,7 +436,7 @@ void SerialPort::sendBreak()
      Sleep(1);
      ClearCommBreak(handle);
  #endif
@@ -132,7 +136,7 @@ index 0bb0228..ece29ab 100644
      tcsendbreak(handle, 0);
  #endif
  }
-@@ -456,7 +465,7 @@ std::vector<string> SerialPort::getAvailablePorts()
+@@ -456,7 +467,7 @@ std::vector<string> SerialPort::getAvailablePorts()
          LOG(ERROR) << "Failed to open registry key for serial port list.";
      }
  #endif
@@ -141,7 +145,7 @@ index 0bb0228..ece29ab 100644
      DIR* dir = opendir("/dev/");
      if (dir)
      {
-@@ -511,7 +520,7 @@ string SerialPort::getPseudoDriverName(string port)
+@@ -511,7 +522,7 @@ string SerialPort::getPseudoDriverName(string port)
      }
      return ret;
  #endif
diff --git a/srcpkgs/EmptyEpsilon/template b/srcpkgs/EmptyEpsilon/template
index b48b88ba681b..c20280877634 100644
--- a/srcpkgs/EmptyEpsilon/template
+++ b/srcpkgs/EmptyEpsilon/template
@@ -4,7 +4,7 @@ _ver_major=2020
 _ver_minor=11
 _ver_patch=23
 version="${_ver_major}.${_ver_minor}.${_ver_patch}"
-revision=2
+revision=3
 wrksrc="EmptyEpsilon-EE-${version}"
 build_style=cmake
 configure_args="-DSERIOUS_PROTON_DIR=$XBPS_BUILDDIR/SeriousProton-EE-${version}

From 251a3294ef9399b992099f3b813d5383ea38a65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 9 Mar 2021 15:24:57 +0100
Subject: [PATCH 3208/3458] croc: update to 8.6.10.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 86c972ffbcf1..52b3b5d6f4ca 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=8.6.9
+version=8.6.10
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=0ef4359916e02fd7c754bda7093c924310729e002a06cfe015ea57b34b522cbf
+checksum=3d3ecb85e985013b4494225eefffbec0eecdda236ecaccb287e2cc7bc32d2cf7
 
 post_install() {
 	vlicense LICENSE

From e1e3c94f009e941404016a5eac7b1565aec6b973 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com>
Date: Fri, 17 Jul 2020 19:21:27 +0100
Subject: [PATCH 3209/3458] nawk: update to 20210110

---
 srcpkgs/nawk/template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/nawk/template b/srcpkgs/nawk/template
index 48678359d060..6fd5510733bc 100644
--- a/srcpkgs/nawk/template
+++ b/srcpkgs/nawk/template
@@ -1,16 +1,17 @@
 # Template file for 'nawk'
 pkgname=nawk
-version=20180827
+version=20210110
 revision=1
-wrksrc="awk-${version}"
+_commit=178f660b5a4fde6f39e8065185373166f55b6e0c
+wrksrc="awk-${_commit}"
 hostmakedepends="bison"
 short_desc="The one, true implementation of AWK"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mmnmnnmnmm <mnnnm@disroot.org>"
 license="SMLNJ"
 homepage="https://github.com/onetrueawk/awk"
 changelog="https://raw.githubusercontent.com/onetrueawk/awk/master/ChangeLog"
-distfiles="https://github.com/onetrueawk/awk/archive/${version}.tar.gz"
-checksum=c9232d23410c715234d0c26131a43ae6087462e999a61f038f1790598ce4807f
+distfiles="https://github.com/onetrueawk/awk/archive/${_commit}.tar.gz"
+checksum=57bca56b5e84e2148e4ba600f5dcdd376a1a5d374bafe426a386dc17e25ead45
 
 provides="awk-0_1"
 alternatives="
@@ -18,13 +19,14 @@ alternatives="
  awk:awk.1:/usr/share/man/man1/nawk.1"
 
 do_configure() {
-	sed -i '/maketab/{s/CC/BUILD_CC/;s/CFLAGS/BUILD_CFLAGS/}' makefile
-	sed -i '/YACC = yacc -d -S/ s|^|#|' makefile
-	sed -i 's/-lm/$(LDFLAGS) &/' makefile
+	vsed -i '/maketab/{s/HOSTCC/BUILD_CC/;s/CFLAGS/BUILD_CFLAGS/}' makefile
+	vsed -i 's/-lm/$(LDFLAGS) &/' makefile
 }
+
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -DHAS_ISBLANK" LDFLAGS="$LDFLAGS"
 }
+
 do_install() {
 	vbin a.out nawk
 	vman awk.1 nawk.1

From a13fc9d53f00ff3f1919f04cf37288f8ecf5aede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 18 Dec 2020 23:37:04 +0100
Subject: [PATCH 3210/3458] xbps-triggers: ensure operating in rootdir

---
 srcpkgs/xbps-triggers/files/gtk-icon-cache | 8 ++++----
 srcpkgs/xbps-triggers/files/pycompile      | 8 ++++----
 srcpkgs/xbps-triggers/template             | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/xbps-triggers/files/gtk-icon-cache b/srcpkgs/xbps-triggers/files/gtk-icon-cache
index e905d9b1c1e1..abff3281641d 100755
--- a/srcpkgs/xbps-triggers/files/gtk-icon-cache
+++ b/srcpkgs/xbps-triggers/files/gtk-icon-cache
@@ -23,8 +23,8 @@ targets)
 run)
 	if [ "$TARGET" = "post-remove" -a "${PKGNAME}" = "gtk+" ]; then
 		for dir in ${gtk_iconcache_dirs}; do
-			if [ -f ${dir}/icon-theme.cache ]; then
-				rm -f ${dir}/icon-theme.cache
+			if [ -f .${dir}/icon-theme.cache ]; then
+				rm -f .${dir}/icon-theme.cache
 				echo -n "Removed GTK+ icon theme "
 				echo "cache for ${dir}."
 			fi
@@ -39,10 +39,10 @@ run)
 	case "$TARGET" in
 	post-*)
 		for dir in ${gtk_iconcache_dirs}; do
-			if [ -d "${dir}" ]; then
+			if [ -d ".${dir}" ]; then
 				echo -n "Updating GTK+ icon cache for "
 				echo "${dir}..."
-				${iconcache_bin} -q -f -t ${dir}
+				${iconcache_bin} -q -f -t .${dir}
 			fi
 		done
 		;;
diff --git a/srcpkgs/xbps-triggers/files/pycompile b/srcpkgs/xbps-triggers/files/pycompile
index 9d1da900b464..fb55a20024b4 100755
--- a/srcpkgs/xbps-triggers/files/pycompile
+++ b/srcpkgs/xbps-triggers/files/pycompile
@@ -47,8 +47,8 @@ compile()
 {
 	for f in ${pycompile_dirs}; do
 		echo "Byte-compiling python code in ${f}..."
-		python${pycompile_version} -m compileall -f -q ${f} && \
-		python${pycompile_version} -O -m compileall -f -q ${f}
+		python${pycompile_version} -m compileall -f -q ./${f} && \
+		python${pycompile_version} -O -m compileall -f -q ./${f}
 	done
 	for f in ${pycompile_module}; do
 		echo "Byte-compiling python${pycompile_version} code for module ${f}..."
@@ -71,8 +71,8 @@ remove()
 {
 	for f in ${pycompile_dirs}; do
 		echo "Removing byte-compiled python${pycompile_version} files in ${f}..."
-		find ${f} -type f -name \*.py[co] -delete 2>&1 >/dev/null
-		find ${f} -type d -name __pycache__ -delete 2>&1 >/dev/null
+		find ./${f} -type f -name \*.py[co] -delete 2>&1 >/dev/null
+		find ./${f} -type d -name __pycache__ -delete 2>&1 >/dev/null
 	done
 	for f in ${pycompile_module}; do
 		echo "Removing byte-compiled python${pycompile_version} code for module ${f}..."
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index b649b5f0bfa9..748942206ac5 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.119
+version=0.120
 revision=1
 bootstrap=yes
 short_desc="XBPS triggers for Void Linux"

From 1ff07a7f751865269fccd3d7f3bd231a8e13e505 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 19:20:16 +0100
Subject: [PATCH 3211/3458] mozjs60: re-add as meta to allow people to upgrade
 their systems

people with old installations who are upgrading may run into
mozjs60 blocking updates, as mozjs60 depends on old ICU, while
old polkit depends on mozjs60 - ICU needs updating in order to
allow installation of mozjs78, which is needed in order to
upgrade polkit, but mozjs60 is blocking upgrade of ICU - and
can't remove mozjs60 manually, because installed polkit depends
on it
---
 srcpkgs/mozjs60/INSTALL.msg | 1 +
 srcpkgs/mozjs60/template    | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 srcpkgs/mozjs60/INSTALL.msg
 create mode 100644 srcpkgs/mozjs60/template

diff --git a/srcpkgs/mozjs60/INSTALL.msg b/srcpkgs/mozjs60/INSTALL.msg
new file mode 100644
index 000000000000..b88d0b829b0d
--- /dev/null
+++ b/srcpkgs/mozjs60/INSTALL.msg
@@ -0,0 +1 @@
+mozjs60 is no longer provided by Void Linux
diff --git a/srcpkgs/mozjs60/template b/srcpkgs/mozjs60/template
new file mode 100644
index 000000000000..10795e929e56
--- /dev/null
+++ b/srcpkgs/mozjs60/template
@@ -0,0 +1,9 @@
+# Template file for 'mozjs60'
+pkgname=mozjs60
+version=60.8.0
+revision=6
+build_style=meta
+short_desc="Mozilla JavaScript interpreter and library (60.x series) (removed package)"
+maintainer="q66 <daniel@octaforge.org>"
+license="metapackage"
+homepage="https://www.mozilla.org/firefox/"

From 8b9140ccae0966a78c920397fa96ba263b0b071d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 9 Mar 2021 03:29:47 -0300
Subject: [PATCH 3212/3458] linux-firmware: include qualcomm atheros bt in
 -network subpackage.

Also adopt.
---
 srcpkgs/linux-firmware/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 46fbf7bea584..eaec08986e3f 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,10 +1,10 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20210208
-revision=1
+revision=2
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
@@ -88,5 +88,6 @@ linux-firmware-network_package() {
 		vmove usr/lib/firmware/ueagle-atm
 		vmove usr/lib/firmware/ti-connectivity
 		vmove usr/lib/firmware/dpaa2
+		vmove usr/lib/firmware/qca
 	}
 }

From 79bd31f1b84e2c69202b91fb8aab21dbc45b4fa9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 19:47:32 +0100
Subject: [PATCH 3213/3458] openblas: build for ppc32, switch ppc64 BE to
 ppc970mp

---
 srcpkgs/openblas/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index c417ecda1aef..ea5263838ccb 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,7 +1,7 @@
 # Template file for 'openblas'
 pkgname=openblas
 version=0.3.13
-revision=1
+revision=2
 wrksrc="OpenBLAS-${version}"
 build_style=gnu-makefile
 make_build_args=" HOSTCC=gcc USE_OPENMP=1"
@@ -23,9 +23,10 @@ case "${XBPS_TARGET_MACHINE}" in
 	i686*) make_build_args+=" BINARY=32 DYNAMIC_ARCH=1" ;;
 	x86_64*) make_build_args+=" BINARY=64 DYNAMIC_ARCH=1" ;;
 	ppc64le*) make_build_args+=" TARGET=POWER8 DYNAMIC_ARCH=1" ;;
-	ppc64*) make_build_args+=" TARGET=GENERIC DYNAMIC_ARCH=1" ;;
-	ppc*) broken="64 bit ppc only" ;;
+	ppc64*) make_build_args+=" TARGET=PPC970MP" ;; # dynamic arch broken for <power6
+	ppc*) make_build_args+=" TARGET=PPCG4" ;;
 	mips*) broken="Not supported" ;;
+	*) broken="Add your CPU" ;;
 esac
 
 post_extract() {

From 738ee32d08f0b9e5315b61e8476ec84886cfc794 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 9 Mar 2021 11:09:16 +0100
Subject: [PATCH 3214/3458] suil: update to 0.10.10.

---
 srcpkgs/suil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template
index 4444c1f28ddc..967a68b7779c 100644
--- a/srcpkgs/suil/template
+++ b/srcpkgs/suil/template
@@ -1,6 +1,6 @@
 # Template file for 'suil'
 pkgname=suil
-version=0.10.8
+version=0.10.10
 revision=1
 build_style=waf3
 hostmakedepends="pkg-config lv2"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://drobilla.net/software/suil/"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
-checksum=91cd87e17e80d2e43d64700369b93a5c2d0f1648e36411e0233253a0c3840f40
+checksum=750f08e6b7dc941a5e694c484aab02f69af5aa90edcc9fb2ffb4fb45f1574bfb
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"

From b97b3a87e3a6d2412bd1a0f03efc12b0d56913c3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 1 Mar 2021 16:27:28 +0100
Subject: [PATCH 3215/3458] mumble: add portaudio build option

jack option is already described
---
 srcpkgs/mumble/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 7d2c8641571f..3a0dca32d9ed 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,17 +1,18 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.3.4
-revision=4
+revision=5
 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
  $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+ CONFIG+=no-oss $(vopt_if portaudio CONFIG+=portaudio)
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
 hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
 makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
  libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
  pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
- speech-dispatcher-devel speex-devel portaudio-devel"
+ speech-dispatcher-devel speex-devel $(vopt_if portaudio portaudio-devel)"
 depends="desktop-file-utils qt5-plugin-sqlite"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,8 +21,8 @@ homepage="http://mumble.sourceforge.net/"
 distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
 checksum=615f4ebfc3385d945163f369efd3e910c8b6d0f025797a7eed541515fccb6093
 
-build_options="jack"
-desc_option_jack="Enable support for the JACK sound server"
+build_options="jack portaudio"
+build_options_default="jack portaudio"
 
 do_install() {
 	vlicense LICENSE

From e301a2cbc19287e7430bdc658e928f7a73c86593 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 19:53:32 +0100
Subject: [PATCH 3216/3458] R: enable openblas option for all ppc by default

---
 srcpkgs/R/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index e40cefabcd48..762a6e90e33b 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -31,7 +31,7 @@ make_check=extended
 build_options="openblas"
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*|aarch64*|armv[67]*|ppc64*)
+	x86_64*|i686*|aarch64*|armv[67]*|ppc*)
 		# Prefer accelerated routines where available
 		build_options_default="openblas"
 		;;

From 437b789fd1587e0df3e0e424b44bb40935f07bf4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 19:54:16 +0100
Subject: [PATCH 3217/3458] arpack-ng: enable openblas for all ppc

---
 srcpkgs/arpack-ng/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arpack-ng/template b/srcpkgs/arpack-ng/template
index 31b0e7901390..27d1497cf4cf 100644
--- a/srcpkgs/arpack-ng/template
+++ b/srcpkgs/arpack-ng/template
@@ -18,7 +18,7 @@ checksum=ada5aeb3878874383307239c9235b716a8a170c6d096a6625bfd529844df003d
 # use it and if not fall back to regular blas.
 case "$XBPS_TARGET_MACHINE" in
 	# List of supported architectures copied from openblas.
-	armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+	armv[67]*|aarch64*|i686*|x86_64*|ppc*)
 		makedepends+=" openblas-devel"
 		configure_args=" --with-blas=openblas --with-lapack=openblas"
 		;;

From 746202b2c37f04836f2dca561a42222696979544 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 20:33:36 +0100
Subject: [PATCH 3218/3458] python3-scipy: discourage people from building
 ppc32 with openblas

---
 srcpkgs/python3-scipy/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index c96b999a5fd8..7976bc003ce2 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -28,6 +28,13 @@ case "$XBPS_TARGET_MACHINE" in
 	*) ;;
 esac
 
+if [ "$build_option_openblas" ]; then
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) ;;
+		ppc*) broken="numpy can't be built with openblas";;
+	esac
+fi
+
 LDFLAGS+=" -shared"
 
 # Tell numpy to build in parallel

From ce435be684a0bcb472a2b074879485216a07b977 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 20:33:54 +0100
Subject: [PATCH 3219/3458] python3-numpy: discourage people from building
 ppc32 with openblas

---
 srcpkgs/python3-numpy/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 6736ae3040d2..a2d0c201a66a 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -26,6 +26,13 @@ case "$XBPS_TARGET_MACHINE" in
 	*) ;;
 esac
 
+if [ "$build_option_openblas" ]; then
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) ;;
+		ppc*) broken="segfaults";;
+	esac
+fi
+
 post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 		armv5tel-musl)

From 000130d9a405532af32f187d1bceb60e887fb34c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 20:40:28 +0100
Subject: [PATCH 3220/3458] openntpd: remove ssl and crytpo as dep for tls in
 configure

closes #29347
---
 srcpkgs/openntpd/patches/libtls.patch | 11 +++++++++++
 srcpkgs/openntpd/template             |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/openntpd/patches/libtls.patch

diff --git a/srcpkgs/openntpd/patches/libtls.patch b/srcpkgs/openntpd/patches/libtls.patch
new file mode 100644
index 000000000000..978f4d5d004b
--- /dev/null
+++ b/srcpkgs/openntpd/patches/libtls.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2017-06-13 02:47:58.000000000 +0200
++++ -	2021-03-09 20:37:29.357052132 +0100
+@@ -61,7 +61,7 @@
+ 
+ # check for libtls
+ AC_SEARCH_LIBS([tls_config_set_ca_mem],[tls],
+-	       [LIBS="$LIBS -ltls -lssl -lcrypto"],,[-lssl -lcrypto])
++	       [LIBS="$LIBS -ltls"],,)
+ AC_CHECK_FUNCS([tls_config_set_ca_mem])
+ 
+ # check if libtls uses 3-argument tls_write
diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index b7e7db5c41f3..34bb4ed3a5eb 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,7 +1,7 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.2p3
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"

From 1bdb11e35c6645f6b5488fb6969eb019d821a4a2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 20:41:09 +0100
Subject: [PATCH 3221/3458] opencv: broken on ppc32

---
 srcpkgs/opencv/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 13f484f92c44..4ebf6fe915ed 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -37,6 +37,11 @@ if [ "$CROSS_BUILD" ]; then
 	 -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/${_npincdir}"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="grfmt_jpeg2000.cpp:380:48: error: lvalue required as unary '&' operand";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From 54ce86f2a27ebc2aad224149e6866f65cc7abe31 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 20:49:13 +0100
Subject: [PATCH 3222/3458] opencv4: also broken on ppc32

---
 srcpkgs/opencv4/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index 5f029bff8097..f15c5f1ec2f1 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -43,6 +43,11 @@ if [ "$CROSS_BUILD" ]; then
 	 -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/${_npincdir}"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="grfmt_jpeg2000.cpp:380:48: error: lvalue required as unary '&' operand";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From 8a7cca89db2be1f5a2aae269fa9c71b05000d326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 9 Mar 2021 16:42:21 -0300
Subject: [PATCH 3223/3458] git: update to 2.30.2.

Fixes CVE-2021-21300.
---
 srcpkgs/git/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index b24e3e483950..f428eaa963e6 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,7 @@
 # Template file for 'git'
 pkgname=git
-version=2.30.1
-revision=2
+version=2.30.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2"
 hostmakedepends="asciidoc gettext perl pkg-config tar tk xmlto"
@@ -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=f988a8a095089978dab2932af4edb22b4d7d67d67b81aaa1986fa29ef45d9467
+checksum=41f7d90c71f9476cd387673fcb10ce09ccbed67332436a4cc58d7af32c355faa
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From c063bdeb6c256b99b3a8c2266ba9bd5b7efc56ea Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 9 Mar 2021 21:15:29 +0100
Subject: [PATCH 3224/3458] octave: broken on ppc32

---
 srcpkgs/octave/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index faac10a98186..8a92ed68d532 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -73,6 +73,11 @@ makedepends+="
 	$(vopt_if qhull libqhull-devel)
 	$(vopt_if zlib zlib-devel)"
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="fails to configure";;
+esac
+
 pre_build() {
 	chmod +x build-aux/mk-opts.pl
 }

From 3b1767c380cb3155e945ec5cb55095e1dad4ae58 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 8 Mar 2021 22:37:48 +0200
Subject: [PATCH 3225/3458] bc-gh: update to 3.3.3.

---
 srcpkgs/bc-gh/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index d36f09ed0f69..5f942b71610a 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,14 +1,15 @@
 # Template file for 'bc-gh'
 pkgname=bc-gh
-version=3.1.5
+version=3.3.3
 revision=1
 wrksrc="bc-${version}"
 short_desc="Implementation of POSIX bc with GNU extensions"
 maintainer="Gavin D. Howard <yzena.tech@gmail.com>"
 license="BSD-2-Clause"
-homepage="https://github.com/gavinhoward/bc"
-distfiles="${homepage}/releases/download/${version}/bc-${version}.tar.xz"
-checksum=0493c1eb76e94ace7a00532824121ab901ac1bd3580a340ea5de92a7d9c1a19e
+homepage="https://git.yzena.com/gavin/bc"
+changelog="https://git.yzena.com/gavin/bc/raw/branch/master/NEWS.md"
+distfiles="https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz"
+checksum=b9fde063b32d4f0c3bab9d069aa8ac4d7d804ce5bebb54d7a2e574e70309bc93
 alternatives="
  bc:bc:/usr/bin/bc-gh
  bc:bc.1:/usr/share/man/man1/bc-gh.1

From aeaa1c9224ffa0193d769057a710181b6b213df8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 21:24:32 +0100
Subject: [PATCH 3226/3458] qt5-webengine: fix cross

-L<cross_path> leaks somewhere into host build steps,
so just strip it at the link wrapper
---
 .../patches/cross-insanity.patch              | 20 +++++++++++++++++++
 srcpkgs/qt5-webengine/template                |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/qt5-webengine/patches/cross-insanity.patch

diff --git a/srcpkgs/qt5-webengine/patches/cross-insanity.patch b/srcpkgs/qt5-webengine/patches/cross-insanity.patch
new file mode 100644
index 000000000000..3d6fc84c66aa
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/cross-insanity.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/build/toolchain/gcc_link_wrapper.py	2021-02-23 16:36:59.000000000 +0100
++++ b/src/3rdparty/chromium/build/toolchain/gcc_link_wrapper.py	2021-03-09 22:21:08.066565706 +0100
+@@ -54,10 +54,16 @@
+                       help='Linking command')
+   args = parser.parse_args()
+ 
++  command = []
++  if(args.command[0] == "/usr/lib/ccache/bin/g++"):
++    command = [e for e in  args.command if not e.startswith("-L")]
++  else:
++    command = args.command
++
+   # Work-around for gold being slow-by-default. http://crbug.com/632230
+   fast_env = dict(os.environ)
+   fast_env['LC_ALL'] = 'C'
+-  result = wrapper_utils.RunLinkWithOptionalMapFile(args.command, env=fast_env,
++  result = wrapper_utils.RunLinkWithOptionalMapFile(command, env=fast_env,
+                                                     map_file=args.map_file)
+   if result != 0:
+     return result
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 4dfdd5d679e4..2a34623c81ea 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,6 +1,3 @@
-nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/32273/steps/shell_3/logs/stdio"
-# using /usr/bin/ld but target libraries
-
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
 version=5.15.3
@@ -18,7 +15,9 @@ configure_args="--
  $(vopt_if pipewire '' '-no')-webengine-webrtc-pipewire"
 # Rely on auto detection (fails if forced for cross builds) -webengine-alsa
 hostmakedepends="qt5-qmake gperf ninja qt5-host-tools flex pkg-config nodejs
- which perl python protobuf nss-devel libevent-devel zlib-devel icu-devel"
+ which perl python protobuf nss-devel libevent-devel zlib-devel icu-devel
+ libjpeg-turbo-devel libpng-devel libwebp-devel freetype-devel
+ harfbuzz-devel"
 makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  qt5-declarative-devel libevent-devel snappy-devel icu-devel ffmpeg-devel
  libwebp-devel opus-devel cups-devel nss-devel minizip-devel libxslt-devel
@@ -36,6 +35,7 @@ checksum="8e86257d25a641939d50c14de2049b384c371fcb70a60a289dc5426be0423b40
  ee97e569529a60729e3c6b7317011fd2cc40600079e90c4afa2e5ea9edcd58ef"
 patch_args="-Np1"
 
+no_generic_pkgconfig_link=yes
 build_options="sndio pipewire"
 build_options_default="pipewire"
 desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"

From 381bc84143edf8cb3fddaa3cfaa5d021ac54194e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:27:42 +0100
Subject: [PATCH 3227/3458] bluedevil: update to 5.21.2.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 1ed2ec65cdc0..666634ed8a86 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=56aae53637129110e4b77cf4e569bf140d8c9919524c91aa1874b172997ac92c
+checksum=8f0fc7cb133f1d9b5ea4cbb21d7f2e029e5b5184574e46ba5b43c85aae5006a1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From a3be3dc434bca1464edf4a97c6d220f12f3ffc5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:27:46 +0100
Subject: [PATCH 3228/3458] breeze-gtk: update to 5.21.2.

---
 srcpkgs/breeze-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 96ade305e689..60ec7d0c48aa 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6736f681411912b1347c4996aa05e24cf7beaf73331424cc3822216bd211b893
+checksum=23c6de40348762e2d3c38d72537675891e3d937210341acfad7ae3a034b29d57
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From bc2004e6e1f58cb13ef1896f7fdfb6d29a43a127 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:17 +0100
Subject: [PATCH 3229/3458] breeze: update to 5.21.2.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index a53d72262207..7bc8d4e30e68 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.21.1
+version=5.21.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"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=65d95562489f2dc66240b690882f467a4a7990885fd7185337a5006709d3b7f5
+checksum=641cf3613d939b37437bac0e3caa1f25171ed2b4adf8e4037a0fd0dbb1b1146d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From af169825ef6bb4d401426bab3613c9475d51a5a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:20 +0100
Subject: [PATCH 3230/3458] kactivitymanagerd: update to 5.21.2.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index f9b0a3569760..1e40340632d4 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=43b605ad194884a058f31eef315bbf2397edaa309c7e79968a1a9349bd9ffcf3
+checksum=92aa23f36751bb24b00ef0e818783f997437b15c7589074adc6bb962e3559a15
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUN_RESULT_VAR=0"

From 483da434cdaa92684df6dc339d1b00d774067fa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:24 +0100
Subject: [PATCH 3231/3458] kde-cli-tools: update to 5.21.2.

---
 srcpkgs/kde-cli-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 63a2eb55e360..1faa2a11dd55 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=63d1d47b0419ff44098c32c8c206e4e0bbe57c15ab4bdb3e9c6aac9587186520
+checksum=07bc872cf78f8f3e45e22b8bd1413a5d37a8c9ab9b4d255c1a3ebb46618dfc10
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 9f8c4d4b4b31cd578d79b87b25180462fa0f9f19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:27 +0100
Subject: [PATCH 3232/3458] kde-gtk-config5: update to 5.21.2.

---
 srcpkgs/kde-gtk-config5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 5e573fb3c367..7168490e3408 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.21.1
+version=5.21.2
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=ac21ddf13c90a52829a48c51b05408228445ce0999c0221ffcde52977a20075b
+checksum=c1721bde6a160a196a53475d5c193d02c0a928a5ec47a04d7333907a74e6470f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From b989b780cd94c60cd4d4ca0176519416c60adfa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:30 +0100
Subject: [PATCH 3233/3458] kdecoration: update to 5.21.2.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 470ec83f97d2..6ecf190a4d50 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=05945d947e9852ee80e6e846478bd349e2e5bfce1a7c76e41e5945bc2122c8e3
+checksum=31b07c0c53ce84370e3c74eaa92caffc7148bc17864f1a9d8ac5b8c32cfa795e
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 4c3630a68f712283353ae4c263dbb11fd45608e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:33 +0100
Subject: [PATCH 3234/3458] kdeplasma-addons5: update to 5.21.2.

---
 srcpkgs/kdeplasma-addons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 8829ab5943c5..ba7eeb2b0e7f 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.21.1
+version=5.21.2
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=c82d0d955316bcf466a6cf7da2e7b72dbda82358ba83ee2277a4b6a56688f376
+checksum=237ebfce30f84ff5612d5b42bc6d8229032f81c0e392cbd8a4f1f31260c79938
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 14a29d8a76bf4224d758db54bd9964c0fd6e9fec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:35 +0100
Subject: [PATCH 3235/3458] kgamma5: update to 5.21.2.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index d725cbbd8851..b3bab26e243e 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.21.1
+version=5.21.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://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=828e4b46e6df4696ff9e187fd5a1c140b64ade506b87a9730d641129c7a1268c
+checksum=d1c5fdf27408f43faa2ab6e18cda373860c4fce8e13dd213d9b4fb7aaf32d832
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From ff38a9efd62140631ac8f5e34b718e570535b4f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:38 +0100
Subject: [PATCH 3236/3458] khotkeys: update to 5.21.2.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 9ada879e7dd2..7124df3b24a4 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0783a904a4bfe94aca9487b8a606df2041cf2d86c5b7c8c92fd2fcff70d0e6ce
+checksum=8ea1394e3c2cee173420b7d7e14dbf92bce2a780504b4f60b91be33728279f41
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From cb93c3f202b6251af1ba506542266cb72c3895e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:41 +0100
Subject: [PATCH 3237/3458] kinfocenter: update to 5.21.2.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 8505d7d624f3..6839ed75a23e 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.21.1
+version=5.21.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, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ad586c8b213443777bab0a0b3044d76acd5b120363b9668ad9c97de20a4ac5bb
+checksum=353a1c960cd01a17378de19796879e910c223b1f2b07611962ac34118a35d09c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 9c42a1d25efc50a70218362a4a0612f205599a91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:45 +0100
Subject: [PATCH 3238/3458] kmenuedit: update to 5.21.2.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 7f44c9ec8c8d..b5b397d98da8 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=053030cb11fc7766bb6f9dd340afaffb04942c78f5d347ad34a9d7649df17ab2
+checksum=5aa28e095ae2cca278f27c5d9931d758f6857fa6462dafb0f27ef507d417b53f

From 84f17e33a4c24039772c9f79d86d579e5332d655 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:48 +0100
Subject: [PATCH 3239/3458] kscreen: update to 5.21.2.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 8425027bee00..9d46a598efcc 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.21.1
+version=5.21.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, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=834b148d45c876bb6efd260923b78a73cac06f54b7ec13e23c7b9f17414f2970
+checksum=beeba77f91183e460c7d9d58d2b3769951681dae4d096571577aa5cc8b362104
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 873cd13af20d41b2bbfe37cb6c3d69451857915f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:51 +0100
Subject: [PATCH 3240/3458] kscreenlocker: update to 5.21.2.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 059ea392163d..1bc5b4e52fa2 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=db2f1507409dd56418761dc2efdd207e06f6878b217b4c725cc02f76b6f6f5e2
+checksum=f9a63a2dcc3d540fd45484618424366ded4568ccadad93b80b6c42740af171f0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 1573159cbbb8a8dedd90c636e3c6e548cf988fa1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:54 +0100
Subject: [PATCH 3241/3458] ksshaskpass: update to 5.21.2.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index c21aaf522c42..f4cc8c1edbd7 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f3b75a913643504e8f71eb5135367c3f26d8ee8c3260dde645786a8c079b5b85
+checksum=85527240fe0a2dd7da5e89740678b473b36f14959b201cddd50ef3c0890dd2fd

From f1101664353ffce9d3aabe82970912ba53ad63a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:28:58 +0100
Subject: [PATCH 3242/3458] ksysguard: update to 5.21.2.

---
 srcpkgs/ksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index 907d95691cfd..c0be0150ad1e 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95f7c9072fe0f0e3dd03b05f820bff07928ede00bc728e56db772c02b464ccba
+checksum=547e32d87c32f6c883ebb08a54486d49ad9d87185bae8f82c82fef95b4e028d2

From e6e8471748f7b2fc33f3a05b1ae0ad6a1d2a4567 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:01 +0100
Subject: [PATCH 3243/3458] kwallet-pam: update to 5.21.2.

---
 srcpkgs/kwallet-pam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 0bb0c95b80b3..06333753441c 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=eb9f228ad1c019f04f41d06b6a039f81d42fbe939d1a6904ded7bb7ba9f26d79
+checksum=864717b9082e83bf93f0d9fbf8c31adf31c64af2fc4729cbaf67982fba93ff8b

From 1c0046752cf141a903f308f47f9c133470cb4d83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:04 +0100
Subject: [PATCH 3244/3458] kwayland-integration: update to 5.21.2.

---
 srcpkgs/kwayland-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 635f76541a6f..4fe216d403bd 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6421c57e6f07058e4cf4ba21d997fc38f7fdf0af922dd48681528fed98a40f68
+checksum=6046514b84c4a1905a43fb7c3482c8fdbd1eb0f55efdd79a2a827073639086bb

From 1c0df0c9cbb4310a0f514e4bb17cc4b0551510a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:07 +0100
Subject: [PATCH 3245/3458] kwayland-server: update to 5.21.2.

---
 srcpkgs/kwayland-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index f575fa1e8e9a..fa3c00892036 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=350937f9c426523f1fce5445db290bbb50de6cbf3c11ebbd8081cb815123a101
+checksum=0ea9ba09575ef5fb8368284b327eef2ee77d17c20511a3b7219f9b4e465f6aa3
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From eb7ac8dcc21a1e69d6ba371b73c3d2029b5ae677 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:13 +0100
Subject: [PATCH 3246/3458] kwin: update to 5.21.2.

---
 srcpkgs/kwin/patches/atomic-type.patch    | 36 -----------------------
 srcpkgs/kwin/patches/posix-sockaddr.patch | 19 ------------
 srcpkgs/kwin/template                     |  6 ++--
 3 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/kwin/patches/atomic-type.patch
 delete mode 100644 srcpkgs/kwin/patches/posix-sockaddr.patch

diff --git a/srcpkgs/kwin/patches/atomic-type.patch b/srcpkgs/kwin/patches/atomic-type.patch
deleted file mode 100644
index 39d3878a6d8f..000000000000
--- a/srcpkgs/kwin/patches/atomic-type.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/ftrace.h
-+++ src/ftrace.h
-@@ -11,6 +11,7 @@
- 
- #include <kwinglobals.h>
- 
-+#include <type_traits>
- #include <QFile>
- #include <QMutex>
- #include <QMutexLocker>
-@@ -70,10 +71,15 @@ private:
- 
- class KWIN_EXPORT FTraceDuration
- {
-+    using ftrace_context_t = std::conditional<
-+        QAtomicOpsSupport<sizeof(qulonglong)>::IsSupported,
-+        qulonglong,
-+        ulong>::type;
-+
- public:
-     template<typename... Args> FTraceDuration(Args... args)
-     {
--        static QAtomicInteger<qulonglong> s_context = 0;
-+        static QAtomicInteger<ftrace_context_t> s_context = 0;
-         QTextStream stream(&m_message);
-         (stream << ... << args);
-         stream.flush();
-@@ -85,7 +91,7 @@ public:
- 
- private:
-     QByteArray m_message;
--    qulonglong m_context;
-+    ftrace_context_t m_context;
- };
- 
- } // namespace KWin
diff --git a/srcpkgs/kwin/patches/posix-sockaddr.patch b/srcpkgs/kwin/patches/posix-sockaddr.patch
deleted file mode 100644
index 06cce6aa0a2b..000000000000
--- a/srcpkgs/kwin/patches/posix-sockaddr.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/helpers/wayland_wrapper/wl-socket.c
-+++ src/helpers/wayland_wrapper/wl-socket.c
-@@ -8,6 +8,7 @@
-     SPDX-License-Identifier: GPL-2.0-or-later
- */
- 
-+#define _BSD_SOURCE
- #include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
-@@ -155,7 +156,7 @@ struct wl_socket *wl_socket_create()
-         s->fd = socket(PF_LOCAL, SOCK_STREAM, 0);
- 
-         int size = SUN_LEN(&s->addr);
--        int ret = bind(s->fd, &s->addr, size);
-+        int ret = bind(s->fd, (struct sockaddr*)&s->addr, size);
-         if (ret < 0) {
-             goto fail;
-         }
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index dcbfb2684764..a6b51fb9edc1 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.21.1
-revision=2
+version=5.21.2
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5a044450ffdc1610a73d5db3f3f50d2513de930f4be5c167da703cc7d23abc0c
+checksum=14896e98e5600eba7c3aa7f18168bec697ba1670c012a560b33302075bb0465a
 patch_args=-Np1
 
 build_options="pipewire"

From e78b8d53a79d49627b6c05bbf5a3a04782762599 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:16 +0100
Subject: [PATCH 3247/3458] kwrited: update to 5.21.2.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 75874417fd18..4f9701117bb5 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=03665581469869162ce4ec355ab3d3882804dfba986caee4bf1c918efb94ba97
+checksum=afed5c80700cfae4db18b22ddfdefeaaf72fe21f85188b2003b691dc94a211d0

From 4d94f0d4d9e099c118855ba6019568fa8fc106a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:20 +0100
Subject: [PATCH 3248/3458] libkscreen: update to 5.21.2.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index e139078fa73c..a3c0e472dd36 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5f149e038259d840a8c0e043c9d245520e34bfb7fe05c94b686597edb7ad2f43
+checksum=21393c76b1646303d4b550538e9b3b7b044e9c1a605cfabde780e931bbe4a70d
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From d8fabdc8276f126b40e0bcaaa2a8e3b00a014722 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:24 +0100
Subject: [PATCH 3249/3458] libksysguard: update to 5.21.2.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 33025a907991..caa4d2fdf789 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e846b0ebf1a347e6f8637a70866c17b1aa8e806c910085729b0fcf08ae74ea93
+checksum=0306e2556d94e3366b015d8bb5d7430c1fb66269ad7c0fbce1fecb8970649982
 
 build_options="webengine"
 

From ea08537ec4f692180967af8f5095675a0269bc94 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:27 +0100
Subject: [PATCH 3250/3458] milou: update to 5.21.2.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 9950cf103a15..57e82555120f 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ae2883686592d3e583461d1f3222478f8b0bd8abe80e57f8e48e6491ca99b524
+checksum=460acbef68f29335c6938fae9c37fff68ecd634beab4bcdaea6b2cacf05808da
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From acf60fc21178b4c039e8d0d088ef374837d43e11 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:33 +0100
Subject: [PATCH 3251/3458] oxygen: update to 5.21.2.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index ac91c25e6faa..73589dbe8132 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8fc30be19b5bbb10f294329733178620de7dd8ac3f6715177925145a64fbabe8
+checksum=386be06089400f8aa42902a05542faff5e6d9e7e9a7e5f712f180c96272ea57a

From e84aecd24bdc65cfc7a53ef62eba9b690cb46e51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:36 +0100
Subject: [PATCH 3252/3458] plasma-browser-integration: update to 5.21.2.

---
 srcpkgs/plasma-browser-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index 08a5c5ce55e6..320d32c1850e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e3fa9a9e322f33ea6cb47ad4bc60e321259ad6bbeafc729b5e5e8c74088d2955
+checksum=e52eef2933eeaadbec405c9bf2ca16cd03008e517c13ee3705bc31f711085d30
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From c915d1cd10b0a5be993859db836c008f6efb8511 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:52 +0100
Subject: [PATCH 3253/3458] plasma-desktop: update to 5.21.2.

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index e0b176443aa9..899d6de22746 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a514664e50f3213b8afde0dab9b8d6a2b097238d2aad4dcdd359aaa16ff02fd2
+checksum=7dfadd6b711d277ebbc40ea8a49c84b39f27b77afe3273f153f8afbecd74782d
 replaces="user-manager>=0"
 python_version=3
 

From 281a997e000781f928c64ac8c588326f19ed782f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:55 +0100
Subject: [PATCH 3254/3458] plasma-disks: update to 5.21.2.

---
 srcpkgs/plasma-disks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index dd8378f6b93b..b8358fce8dc9 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d48a58311f876ea2e5760479c745c74a5bc68ad2b62f991120a52f4cb930c65f
+checksum=eee1bd40d72f62710aefa7c2909a4b900b1b1a9f47fbf7e48a1b0ee90654f413

From 2409912ff8b0e6d31b579f2f83b708d826d0101d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:29:59 +0100
Subject: [PATCH 3255/3458] plasma-firewall: update to 5.21.2.

---
 srcpkgs/plasma-firewall/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 5c5475324087..996e96359f1b 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0b06c722d040031c6587f2d2ee24f7c0470078642ae73b5ad1efc81d6ae207a7
+checksum=4476eecafbbe0de870fd0da7f079608a7432843ab9609e5e8f172b61a657b695

From 260b9e24827b61c8eed8ec51418f45996890a353 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:30:01 +0100
Subject: [PATCH 3256/3458] plasma-integration: update to 5.21.2.

---
 srcpkgs/plasma-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 02a58051f937..3c18aba7259f 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.21.1
+version=5.21.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"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0743ace10d5fe1eb685a276e9f5926d636de304f4612acc23733b9296b7ea144
+checksum=34a2745f20cbde4723f87fca2c6640dc1fd2aec6625fbeba12c14986e24a78ed

From 52f654391061812dc44d51cf57ded90ad5fae071 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:30:04 +0100
Subject: [PATCH 3257/3458] plasma-nm: update to 5.21.2.

---
 srcpkgs/plasma-nm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index 9881eac28771..881d58222999 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c4ab9a208ae3fb8324f59ff8727a2fc4dc5fd132664b444cbce5294ae674e951
+checksum=cae80db9fc8d1d050c78210929ff120b3371028f6af79a77d083ddac0fd274e0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5232f34c2280092fe9c5ffdb89435dbf4783e174 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:30:06 +0100
Subject: [PATCH 3258/3458] plasma-pa: update to 5.21.2.

---
 srcpkgs/plasma-pa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 6aebd4cb6a05..53ed8a5c74ad 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=396ed88423c9ef8cd6c2ea65425d6387f7cd2224698f29c434048f18f3de7d9f
+checksum=dda139d825ef2b45546e23e78a734f95d48fbba7cd5ec00a9ddd5d647475a181
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 9d80b7398fb6565a2c0f1be610b16f381f9b8278 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:30:09 +0100
Subject: [PATCH 3259/3458] plasma-sdk: update to 5.21.2.

---
 srcpkgs/plasma-sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 4adc76b57aeb..cd127f6e147e 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=48ec922d4e1b07da05bd3d7dc84b11c818a806569ca38c934e56a985eea32868
+checksum=7c321c3ffc4e27ba16ae752527e21ac005b894dd2deb5329dd30b7bc9409c721
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From b33bf17e6d034fdd0b3eec6a5ea33778d2495ed2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:30:11 +0100
Subject: [PATCH 3260/3458] plasma-systemmonitor: update to 5.21.2.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 5817f07da8c7..cfa4111b6a85 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=caf40d632c31097e09d98e913dfb9802c8d3aecaf041115be6c447a1b4a5d5d5
+checksum=4471ea3115e22ee9a16f3281cce05a402cece5aa60f85ee1aa7df4ae2204ab8c

From 37841e3b151b120ae4141798b4f0e13c818ed9cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:30:14 +0100
Subject: [PATCH 3261/3458] plasma-thunderbolt: update to 5.21.2.

---
 srcpkgs/plasma-thunderbolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index 710c8630b471..c167d1e3d6b3 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fd3b506c321fec4875d263a18fab644fed5daa4ef69f1a9c41f972306697deec
+checksum=0b3b22aa7b1ef1dc7911a64b4191fec46fe3b3f39da3fbe73928144b6dcff7f7
 
 do_check() {
 	: # Requires running dbus and bolt services

From ce3ef6421b3cad5ffbcbba5e213edf0ebdb9c669 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:30:17 +0100
Subject: [PATCH 3262/3458] plasma-vault: update to 5.21.2.

---
 srcpkgs/plasma-vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index 30876659d568..ac745e8d5edb 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0de439fe7941d675fa64a653a026a56ee44c6780cdd616d1c3f10a3d6cadd255
+checksum=ba1bf86ee7c708a3887ae04ab20e5ef766d71104ebf1e50cac99c5b521dded25
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 46a02ff2bceb80ab8964270271750073f44502cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:31:00 +0100
Subject: [PATCH 3263/3458] plasma-workspace-wallpapers: update to 5.21.2.

---
 srcpkgs/plasma-workspace-wallpapers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index 5d5edec7713d..589aa3e8c0a6 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=76685909cb48456731b548e56f36e70a86ad763e91fff832fcec350eddffcfdd
+checksum=8f83fa295e92ad438d33380d784d19f79ef7c223ab26b0105623562fccf5142e

From f78b994f5550c3d0adf54914ba4664e2f0426dae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:31:16 +0100
Subject: [PATCH 3264/3458] plasma-workspace: update to 5.21.2.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 5f090163ca80..0470d04d6007 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4a30f9b5cb8f24be75f818a01c3fa8a3b70aff3c4552add6f88fcaa85109022b
+checksum=f3c30b3c51dd9d127ba4086252eebef22a7fe5dd34c7fa19498559ccab73d4cc
 
 build_options="pipewire"
 

From 0ebd424f51d3d52ef15e2e3404ab796abc935583 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:31:18 +0100
Subject: [PATCH 3265/3458] polkit-kde-agent: update to 5.21.2.

---
 srcpkgs/polkit-kde-agent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 6dc15b5af7c2..16289005492a 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.21.1
+version=5.21.2
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=629dd8700c8ae74bb4667f8792fec261c4969b0c6862e50f77b4464707cda6d2
+checksum=4f3b40a866b1b3994cf3b464b7bdad4da10e8c391312dafb1fd5e1c72a7a29fc

From 9f66547ab9fe41901f0470beaa32bd524a619531 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:31:22 +0100
Subject: [PATCH 3266/3458] powerdevil: update to 5.21.2.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 97fe8bfc3147..2df8c5ca0e69 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8b9c24b0bec1b62923b8c3ef5d64d4cb1bd6b6420aa2413e06955d7a12e54921
+checksum=55aacf9183171bf9accdf71158940e76ff6cbc71c00eca5a3917cb69efaa371b

From 9c225e2bfcdb111f18511df0e548f881735d5d57 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:31:24 +0100
Subject: [PATCH 3267/3458] sddm-kcm: update to 5.21.2.

---
 srcpkgs/sddm-kcm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 77b63dab141d..8bed10e37c51 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5007b3a73decb7c01c0643232d3a1aad36951421d1beb0bf84c264612bffe648
+checksum=08a1337fee005d26f29d405d543c6693d28e108e269ec10bb8705da5354abbef

From bb1ea83fa39beea8847a682623fa446f312db38d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:31:27 +0100
Subject: [PATCH 3268/3458] systemsettings: update to 5.21.2.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index ccaed7b41685..982c22dadf9f 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=794eff1ffec90e2aad2c588b4fa643fd9a5dff440f048dcbe27438a1541eef4f
+checksum=cd355f1c9438cb5d177e7d8bf228342c6e0b6a3080b0ee479897d55431b788fe

From 980e0b7abc339bfbdd2d5ed61825b68bc974c638 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:31:30 +0100
Subject: [PATCH 3269/3458] xdg-desktop-portal-kde: update to 5.21.2.

---
 srcpkgs/xdg-desktop-portal-kde/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 40953f3252bc..301e25a94924 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.21.1
+version=5.21.2
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=46aae42065cefae0488ef2959c7768de60a6d0cf3ad65372f83a149c99e7d6f5
+checksum=b4cf61e4f8d38081d35c8618985db5644128c8a08264304d7c2f2b8ef0c96abe

From 005a30946df59a7c197310732a91d788ec7b3a62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:44:10 +0100
Subject: [PATCH 3270/3458] kde5-baseapps: update to 20.12.3.

---
 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 60b9d96c4806..11d3fbeecbdc 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.2
+version=20.12.3
 revision=1
 build_style=meta
 depends="

From c6a3dae654405d282bd07fc1f1d8d3e517d04392 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:44:18 +0100
Subject: [PATCH 3271/3458] dolphin: update to 20.12.3.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 2a84e7d064b3..6d49c330ee06 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=20.12.2
+version=20.12.3
 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=59f82f599fec19fc3065f034089b6d35a58ddc419e10c370d99d1ca0b7d0baa6
+checksum=9794b825de2440f53bd237c0bc1c974e89431b5c440ab81ccc1135e696f8a1f3
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From f121ac30734b2c98633966054bd003b21749ad4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:44:21 +0100
Subject: [PATCH 3272/3458] dolphin-plugins: update to 20.12.3.

---
 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 4f8f2ea873c8..26452a19baa4 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.2
+version=20.12.3
 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=b6ab8ce235574002346e8b273d8417c6d80be5d73b2b18ebd5d62ccc92205e7e
+checksum=fcb2ca9acf2ef3b7aaa8d5bf66920fc79983952cda7223416d172802ad9a5e80

From 91966debc59cb5f25f2f5dd1cc992b63c5bdc4d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:44:27 +0100
Subject: [PATCH 3273/3458] khelpcenter: update to 20.12.3.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index f013debd21c3..764687445dc0 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=20.12.2
+version=20.12.3
 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=bddd9e63127adc9b04d757998da79c91b55a89ef3d24b87c435b11c36b04bad7
+checksum=0e29e793687395d0349d23856a790ea2bab88c1b3f13ab5e0fdd1445627f3d56
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From db61347e23e101568bf09b321a85b31fd1d758f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:44:36 +0100
Subject: [PATCH 3274/3458] kate5: update to 20.12.3.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index b57f205c393f..a01026c622f8 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=20.12.2
+version=20.12.3
 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=a7ee1973da3534390ba45f937fec239d56b4aa3c26ea2b63561709887fb4bfcd
+checksum=81bc2d8afe1958186feec8b1b275da5d6eb52bd8b4fa154896d19830d628d4fd
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 791134f673d4178db641308b42396ebceb3b987e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:44:41 +0100
Subject: [PATCH 3275/3458] konsole: update to 20.12.3.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index a90a9386c536..8c95b7bf738c 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=20.12.2
+version=20.12.3
 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=fc1bbdd4b77cc94698dd4d7b90e95577dd5cc99f3b27633a52d49177efea0873
+checksum=24cd42fdc4ae2e17526bfab9c5ad516bb25b22d654782e98aa52f6e39bdd138d
 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 e16a71ea16300c768015afba5d5c3a3642298126 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:44:45 +0100
Subject: [PATCH 3276/3458] baloo-widgets5: update to 20.12.3.

---
 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 532d2a85d590..8707807ea2c3 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.2
+version=20.12.3
 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=af20555e139865c94e929f7cc54149ed1b7aab9fa44bf395b07e865f45cf3271
+checksum=113bec52f93b0c18f62e0c5814a8221ea1c8e2f26e6079937d337564fffbf633
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From 6e8e4a483455a306a34c5a5f75288eee460f5f8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:04:52 +0100
Subject: [PATCH 3277/3458] okular: update to 20.12.3.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 9bc27fda827c..3bbf7b3eb30a 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=20.12.2
+version=20.12.3
 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=78a9bb766b7ae79fba630aac6e8804876e1f99de2ede37d6d33ce7442975a9a4
+checksum=ae570fcd2b35cc9c061c1c55b6f8de256358f0f5dd8d0a8283f13eae006b73dc
 
 do_check() {
 	cd build

From 5be2de34f13a7bc236d86a4a10d4198a98effdb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:04:54 +0100
Subject: [PATCH 3278/3458] libkexiv25: update to 20.12.3.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index a2cc820cfe77..248edae2d3b2 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=20.12.2
+version=20.12.3
 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=eb364ea254d8d72317124e725b4a5b2db0d45c627020ad934f6e1f7f66174882
+checksum=b762730416f8c9db6075695222027c0c37cec8c8defe0c5723af570fa49021e4
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 65d6b7af9b1c958dfd317050caa5291c930d9ef5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:05:04 +0100
Subject: [PATCH 3279/3458] spectacle: update to 20.12.3.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index d0ef91b75214..094fa25d5130 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=20.12.2
+version=20.12.3
 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=7e81047b78f2561aa8bb3a1af0c2b70dbbf9fb56d0427fea89986f90affe1b6c
+checksum=4ce20ea1a81be1ec81c3917fc12e3c904cd95e58d559d56bd3d3bd2a15e149c0

From 09e4ccf8ae8b40f89caa38f8494fdf48abba6089 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:05:06 +0100
Subject: [PATCH 3280/3458] libkipi5: update to 20.12.3.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 1c59b915152a..78bc22530f84 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=20.12.2
+version=20.12.3
 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=f39f211bb4bbea21b1984208ae21b1f5df475e1133d5e600f4fd6b59f3dcb2ab
+checksum=bb6fff214e3a74e17cb7b49f5e9a92252127ec6cb65e6832da3ac789c7bd14a8
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 1c3499f861c8122ca98bf83468e1296c38909881 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:05:41 +0100
Subject: [PATCH 3281/3458] ark: update to 20.12.3.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 27f8bfe9514e..1d94001fdbd3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=20.12.2
+version=20.12.3
 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=0baf950fc330b7e7cd3a825415592579b31d6308e9e7db5cada28747e6a61edd
+checksum=e4f2dfe595f7b51879c8db3734ad56a2363a934013ee4bd4bc8c94a210405b3b
 
 do_check() {
 	:

From d1f2ec5b016343aa6895d22ea7ac4d6aeebc2d45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:07:22 +0100
Subject: [PATCH 3282/3458] elisa: update to 20.12.3.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 1beef7030d5a..dd3bc47166b7 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=20.12.2
+version=20.12.3
 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=59fef44232d8a9864fedcb9bda493909f7ee0b9a4d7e53dbf5aaf369fd2c85ea
+checksum=7a97d305b4319f077db6ce387895c2c3442112d5a3d9d4d68d0c2d884ce79865
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 1c14224dd9550fe9834f7966d295eb994f6036cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:07 +0100
Subject: [PATCH 3283/3458] knights: update to 20.12.3.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c2d9ce33fa94..e2f3ae82981a 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=20.12.2
+version=20.12.3
 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=a962dd2b666541bf4c180481e0f6edc2c4cfd4d980057aced565354a7a30bcdc
+checksum=497b1785ef27a00e2ac852855f160950116b3c86fa053ad187f9611712ef057d

From 50b4f35a086f375385ea2a4cfb0e59a1490843a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:18 +0100
Subject: [PATCH 3284/3458] akonadi-calendar: update to 20.12.3.

---
 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 b8714b057e38..b9d0442f1675 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.2
+version=20.12.3
 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=fc43b16e7f150d98b1698e9a1abf84f67180c004bb79ed62f9d68ac5bc27fb6f
+checksum=93275e67e403056a5d7ba9c4231a10ec08e2df542525378d507d37e493f8f114
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 22f5af8c68090604bcf655c83108387bf4426341 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:20 +0100
Subject: [PATCH 3285/3458] akonadi-contacts: update to 20.12.3.

---
 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 a7a1e0082b00..45c4f7fe35f0 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.2
+version=20.12.3
 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=7fab1fc1833d80a1a1b0040b723c57546bfa4401d3148a1fc511ea80f7cdc117
+checksum=2437f17f249df22e125aa3c5e12ba39a54fc063fe146b9756b5104e946cf87e2
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From b984d1a180125e530cff1325770f3103eda709cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:23 +0100
Subject: [PATCH 3286/3458] akonadi-import-wizard: update to 20.12.3.

---
 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 14a6a32d4010..d55c65f015c6 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.2
+version=20.12.3
 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=d57fd7fc268381ba2eefda4816a3961b87916b61d53880f739b1cf6966c912bf
+checksum=f6718d41395a191077a18b3d20940083a81efcdd9eb489371a95308e9ff70d20
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8ee6cc190efa0449c03362aefca2978df1c7a8f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:25 +0100
Subject: [PATCH 3287/3458] akonadi-mime: update to 20.12.3.

---
 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 9988e59ce9b5..ea4766ba3ed6 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.2
+version=20.12.3
 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=24a55af289751077222c5b8f6ba28d404e698a2b4844e845168a7f31bc9daf7d
+checksum=f45d97ddfed592db897cb7dd0e50183dd72b0f2bdb761168917bd4b739d7ddb6
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From 217abba12401181ff65d589abb0036af26d29d80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:27 +0100
Subject: [PATCH 3288/3458] akonadi-notes: update to 20.12.3.

---
 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 fcad443286da..7cb79ec96ba7 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.2
+version=20.12.3
 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=5b48c2f5b16abce7027e11b013bd91e7aaef4797e05756b85b3f2830f9166f65
+checksum=87455a4cab94a8dae020e3a6ecf1e924440d8df1840bde6cb69a046e5cace5ba
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 1211ea908a6fb00cf3a5e081427438a710e945e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:29 +0100
Subject: [PATCH 3289/3458] akonadi-search: update to 20.12.3.

---
 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 2d5a5da600f0..7d1d6e6f45e3 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.2
+version=20.12.3
 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=4a96b8e96b4e195d73f3ab5f7fb742c94f1c7bad6fdd784b4301c867843bf454
+checksum=f85cac2a99e94772d780ea8cbaaf069f86fd7c0b3e7a5c6ea1dbad5a2c104c2d
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e67fe07b33d06f35f77a43b5ea3bed758cba8d8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:33 +0100
Subject: [PATCH 3290/3458] akonadi5: update to 20.12.3.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 3f8ac46f58be..5225f361508c 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=20.12.2
+version=20.12.3
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -18,7 +18,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=7cd28bb436c8a06d6137d49aa28d4444b93e0d575271deba02f11c8fe4dba918
+checksum=b919ac1d1c8534c304925ba51f7f79b1b5fd8fa21fb906ee3a5829c403f4922d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel qt5-devel kconfig kcoreaddons"

From dae31da13be65f0eee2d28d6fe72f7a39366056a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:36 +0100
Subject: [PATCH 3291/3458] calendarsupport: update to 20.12.3.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 3c8d9224f48f..fd393f83edc8 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=20.12.2
+version=20.12.3
 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=6de55515093422eabb5218f440d971ca3e2abf6312d3faf8078324f215b9e33f
+checksum=ab418fb8ed8a9aee1d0798fe934e59593b6b985c85220405814f159c954a8d10
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 7f466d7ef7886d4dd4286f13b9b0b9268a27332c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:38 +0100
Subject: [PATCH 3292/3458] grantleetheme: update to 20.12.3.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 91a8441a873a..ee3c7553d0b3 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=20.12.2
+version=20.12.3
 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=c29c73388f9a75f3b705dfc7dbcf97a3dbe3860b623a82ea27b79aa1551c62b3
+checksum=e33dacd0d4e51e69be2590b4916cfcd4db5ad6ce57d4f8d97f6326e4eb2a3a7d
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 02e42f8a0de8fc85f9bf0ca8b4b25d74c450a0ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:41 +0100
Subject: [PATCH 3293/3458] kalarmcal: update to 20.12.3.

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 3076139c482e..e8a5505e7095 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=20.12.2
+version=20.12.3
 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=eb0840c3b7054b2afecb751afec249abfc1e068c4adadb616f288c704ca2949e
+checksum=0f7e1b46f81c9a77178ea93b536b3985aad00dcf5bd01881b7945bccf96d98a0
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From ecc9ed812e3d2166d6bf9e10aad8d30523d62613 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:43 +0100
Subject: [PATCH 3294/3458] kcalutils: update to 20.12.3.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 18ba18cf964a..1610e7c7cb44 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=20.12.2
+version=20.12.3
 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=0c9ab114ad1f7c4d87bf65d6e5d581735437110f7ab83298d1bf908463c88ccc
+checksum=1d1f333e55c0d6e476315bf8e08fc2a332e51a122985f6757eb669560148432b
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From eb4ff671ff292b56e31a584851c91dc28431dec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:49 +0100
Subject: [PATCH 3295/3458] kdeconnect: update to 20.12.3.

---
 srcpkgs/kdeconnect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index de8e0133c044..ab3eda20f4da 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=20.12.2
+version=20.12.3
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
@@ -15,5 +15,5 @@ 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=21ca118b9ca7c6107c2cbedc95778f6f0ea03411f3b8d9f815660511ec0a9d71
+checksum=0198a5de49b168485f67e47b0f01f36fef78a3f8be796e8876f3cb6c819608a8
 python_version=3

From 725d4855ab93488a9c96462483a10cb49f8222ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:52 +0100
Subject: [PATCH 3296/3458] kdepim-runtime: update to 20.12.3.

---
 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 d01b12764f3c..1c4318f57e49 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.2
+version=20.12.3
 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=56ffb1dba356b8abf5485e974b894064723b549722e67afabf9bf5d80925ac5c
+checksum=bb6b315389c4b5cfc1d1737d70feed1c7f3bf50c5a01f88efda061b7e666e352
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From 72d380bea0fcfd40b3bef8247a4d9f2fb87de261 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:54 +0100
Subject: [PATCH 3297/3458] kidentitymanagement: update to 20.12.3.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 810901e36855..ba430b39dea8 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=20.12.2
+version=20.12.3
 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=f2693527a0f95c39e0afa075efb7a31533014140467c393ef7a0db18337397ed
+checksum=036a3b55d11a106ca2a4ab0712942baeea58b7559422730eaf6f904c4a902d98
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From f50bcfa3ad594551f0a4eb198ca8eb6ae1ed449c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:08:58 +0100
Subject: [PATCH 3298/3458] kimap: update to 20.12.3.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index f64df83532d9..8a567e28fb0e 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=20.12.2
+version=20.12.3
 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=ad809073b32a98b07d08bff09d3ac687d8121c1f278facffc8cee2b08c7d7292
+checksum=321dbb9881480e7fa75a9a6c8b117030f0cbc97e5e43f39dff8fe643fd271320
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From 2d0c724cc84c0119acbe6da2528fba2f2b783d22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:03 +0100
Subject: [PATCH 3299/3458] kldap: update to 20.12.3.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index e1e3a8bcb855..9affc4221013 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=20.12.2
+version=20.12.3
 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=cbd06f4f2adfb2f0e539e36572eda31af582c4c62519f714ce0ffc8757d74fda
+checksum=4c0cbcdffe92b0f7884721f564702aab65a208e5938c9a118a1ef30082d9d653
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 9f45680070bcda69e51b3450dd7bbc4ece73a09e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:06 +0100
Subject: [PATCH 3300/3458] kmail-account-wizard: update to 20.12.3.

---
 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 8011adda5bac..f69a776d6eb4 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.2
+version=20.12.3
 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=c88c5496b88e1cbd71e95d87c4b3aa4fc320337640329a6d107129396af83729
+checksum=16143e040aa0eb4a608557b9ba01cdec2be371d90adf358df8767b5ba8234cb6

From 2c51db64eb0947d25238f4deaafeedf2e852a0f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:12 +0100
Subject: [PATCH 3301/3458] kmail: update to 20.12.3.

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 2a58ccc08f84..38cf2c597f9f 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=20.12.2
+version=20.12.3
 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=12ef9001bc570bb798a8c394214d8758554f88105c1611e09707190260732d26
+checksum=411e4d40ae86105b879a11b0b1a80686ad63737089f22508565d1880f7c45ca4

From 95d77c00cf26304ba707e44749029956b6330c1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:17 +0100
Subject: [PATCH 3302/3458] kmailtransport: update to 20.12.3.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index dc4df71fb10f..86aff7a0d45d 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=20.12.2
+version=20.12.3
 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=fbd35cd8f119fe13a21c23a59d6cd0dd7479d55cdf0d1ef4192617e644b17686
+checksum=d718d7b74a5a478ca070d8ddae6927351e470dcf79550c4d0d64b94a331859d4
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 152c0fd2cc5b488c4fca9d63bba3cca5b45091bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:22 +0100
Subject: [PATCH 3303/3458] kmbox: update to 20.12.3.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index fffcf2399e9e..718912a97d21 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=20.12.2
+version=20.12.3
 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=14068aab474b36075c4eb422fd0ed5fc2121de7e62186f74d34235f206d0e664
+checksum=0ec56cfdb4a697a64c57962733df5d77c253f80e6a718b6ed974ccc9eefd9033
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d6f619d6dac4dcd3116ec9860c965d2f62feff93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:28 +0100
Subject: [PATCH 3304/3458] kmime: update to 20.12.3.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 4d231e0a6974..a83c63f33628 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=20.12.2
+version=20.12.3
 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=f18520bd2c4106edf996ea01ab6060071f4c5359ca83a61840515ec19486eeca
+checksum=381e6839d8f830e5b7b31a6272122676e935cf4b25857ca9b247cc9572ef476d
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 947d0edae04843f53ff66b2828729a9f068219a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:32 +0100
Subject: [PATCH 3305/3458] kontactinterface: update to 20.12.3.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index a1c522ba813a..a3cf11319010 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=20.12.2
+version=20.12.3
 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=5a3982efe09e28d2b4af7e024df648eb19102052e0198029de95b04c6aec7344
+checksum=3c9f395c2eaf843689e3ace68d8c06cbdbe914f4888657c676cdfe05ba981ddb
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 679c5370748eab5376156704415d1b00e9d5cdce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:37 +0100
Subject: [PATCH 3306/3458] kpimtextedit: update to 20.12.3.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 8bca15a786ef..262f36077cf7 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=20.12.2
+version=20.12.3
 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=7e9833d9210be7f5d4261d81f5a55f6111b21d186e4b07cb226be9d517ff9bb1
+checksum=3377669943dfe8990d011a2ceb9d01759518f5097732424afa723ffd7e61931e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 35bad44b80c61f524447133cc0271a57c5289bb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:41 +0100
Subject: [PATCH 3307/3458] kqtquickcharts: update to 20.12.3.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index a00386b4dd0b..0b60638e2940 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=20.12.2
+version=20.12.3
 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=b62024e32005d5e113ca56efa021423422eb604b89453f43a0ddb75627db991a
+checksum=b274baf4532a89cae9490d65069f57c105b17ddd39e1186171c89ecb14128cc5
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6888f5df5c508113f052e6faa996898d711fd9ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:46 +0100
Subject: [PATCH 3308/3458] ksmtp: update to 20.12.3.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 342071353e66..1996eb712bd5 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=20.12.2
+version=20.12.3
 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=9c527e4358228120ef5f65d257b4ed3efe2157b3a46f0041665a2399d92f9a65
+checksum=8667c3591c28a7fd08d1d0b726bd641b2cf5b9a51f228317b934e041608cb962
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c3f6755f0d4b84392130d3d3c76bde781438ccc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:51 +0100
Subject: [PATCH 3309/3458] ktnef: update to 20.12.3.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index b75383e97574..535f5aebe64d 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=20.12.2
+version=20.12.3
 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=b8bf4d1bb1af6b55dc5ff31d60263bb7e8095e5f9710073253d5e1f7a9eaed90
+checksum=78d7f3d512a1ab1d7ef4af81b47a865e933b2338004ddb174d35913f13887873
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9f8fc998b543f8c9960850b51f2a883f2dc4eaf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:09:58 +0100
Subject: [PATCH 3310/3458] libgravatar: update to 20.12.3.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index b657dc4a3fff..181620254843 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=20.12.2
+version=20.12.3
 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=6df8d34f6444b44f14bed6edd3e0e83c511d64ea7a0b797cad6e678ec091f61e
+checksum=c4a2dacfd5b69b19ae8cb2e1c7295cd968e27ea1dea31f98cee06740b6991c8c
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 545721971e4e2e75c23f226cc020c6f9e7c29a4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:10:03 +0100
Subject: [PATCH 3311/3458] libkdepim: update to 20.12.3.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index e1b164d53b42..71813b6be220 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=20.12.2
+version=20.12.3
 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=a6646fec62ff0a7225b216f52fc607d615e014e78983dcd2739bca78b8492c39
+checksum=ca4d3680cdf2a49c61338184ff7e299766c446c16471f7608a331014d5ec35ab
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From d907208b0e26f30cbeb0a757735d3f9c8b1ba4d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:10:07 +0100
Subject: [PATCH 3312/3458] libkgapi: update to 20.12.3.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 100bcd339b62..2af240c1fc42 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=20.12.2
+version=20.12.3
 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=d1161dc2a0b4cd93251894a6dc320273038da71e09b733545956f61e0fd04af9
+checksum=fd668411c3d1e9f65237d15d884efd5cfb7cae0a90fa517bcf833f3980653941
 
 do_check() {
 	:

From 8f6ff180afe9ac5accf98ccd009ff25b87a5caa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:10:12 +0100
Subject: [PATCH 3313/3458] libkleo: update to 20.12.3.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index f242c0c70742..9ad732af326a 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=20.12.2
+version=20.12.3
 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=612244d28d4f2f221e9c23ebb366d1ad31f5a8b132c7c3c2b8ed3d8ca3935477
+checksum=9949cc5492cf2ea9a349b56aa7d88a79d0f96a48baa73c9339e521e09448950c
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 15a62ad2949eb1d8b8968c993465b1e3b2bbf4f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:10:17 +0100
Subject: [PATCH 3314/3458] libksieve: update to 20.12.3.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 5416c2f5db31..f27e7c17eec0 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=20.12.2
+version=20.12.3
 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=72605f5fc2786b28df98b676b27236096211b4c130adb1a31ea56bc22e834c66
+checksum=009f80fba22ad1eed770b780df6b0757a83e97eec6ba0454f496eaf6b54c2448
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 578cf38691bd2a7be76eaa7dc3037aa3cbe50ae9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:10:23 +0100
Subject: [PATCH 3315/3458] mailcommon: update to 20.12.3.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 768116cf0d1d..e5c4615dc9ea 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=20.12.2
+version=20.12.3
 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=651b66ca7e0bee98a300068bb3ca62edfa23b4cb535235603e97d1576ac96b61
+checksum=9568a0de8ca61d0af950ba7c407d5fede2c89eb245976e2224c596e8cdbe177c
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From b257c512cdf6f971f6826c21394aa9a697bc4a32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:10:29 +0100
Subject: [PATCH 3316/3458] mailimporter: update to 20.12.3.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 74b589cb727d..fb5faea25c65 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=20.12.2
+version=20.12.3
 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=db2314d02327bdc9b3e083d08a0549145c4deb82aeeeef4e4c30f2b7bdcb5499
+checksum=d67af2f3f62ccf934b4c23982750c05e70bbc144bea231eba560278363de73d2
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a3fd532c085f5c82febe0cca05e8750f59cdba39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:10:51 +0100
Subject: [PATCH 3317/3458] messagelib: update to 20.12.3.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index f3838308d593..0e74a09c710c 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=20.12.2
+version=20.12.3
 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=a474d64dceaa4e66cfe85b1e00d6188df498f93cbf526eaccedad505ace6bf1e
+checksum=3aae37239d281aa6137b57baa5ac8834f5f95786847cc72fd879f664fce12c23
 
 #TODO: fix build without qca-qt5
 

From b875177fd4d446898c40b754040ae12cea62b7da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:10:55 +0100
Subject: [PATCH 3318/3458] pim-data-exporter: update to 20.12.3.

---
 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 a638639c258e..5cf988e52fd5 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.2
+version=20.12.3
 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=30ae10e158d0d506dc8e6bfb87281228f4b18b2fcecabbf3fda39080b3c8e88f
+checksum=987420ed8accd4a1c9db7baf35807b2c92e1f80eb606aed074b859208829ec9f

From 25dd016ed62a7d7765450ec99ef1c35740ece9df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 20:10:59 +0100
Subject: [PATCH 3319/3458] pimcommon: update to 20.12.3.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 4b56b655f6f1..bbd43f034bd9 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=20.12.2
+version=20.12.3
 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=3a170f4db0cd9f691ddf5f43831cfa688c2113b8f5bd6c84895f869a2e547539
+checksum=0b9a0ad2128f41aa5de06dc2a9b28d631ca6a47a5fcf26e5320045f08228fea1
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c301f9d9095c12817395ca695c70a2031711b299 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 23:20:55 +0100
Subject: [PATCH 3320/3458] xapian-core: rebuild to fix path referenced in
 xapian-config.cmake

---
 srcpkgs/xapian-core/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template
index 84b4c966d573..369cccb082f0 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.18
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="zlib-devel libuuid-devel"

From e502c663a7a51c2b30d201fa6df15fe59e198892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 9 Mar 2021 21:18:50 -0300
Subject: [PATCH 3321/3458] qt5-webengine: broken for aarch64-musl so aarch64
 has enough RAM to finish the build.

---
 srcpkgs/qt5-webengine/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 2a34623c81ea..38f689d12c5c 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -66,7 +66,8 @@ fi
 
 # ppc64 still needs libatomic here, as does s390x but we don't have that
 case "$XBPS_MACHINE" in
-	ppc64*) hostmakedepends+=" libatomic-devel"
+	ppc64*) hostmakedepends+=" libatomic-devel" ;;
+	aarch64-musl) broken="leave some RAM for the glibc build"
 esac
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 5a9f1815300e8198e37855172590d213aee8cb72 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 10 Mar 2021 00:56:20 +0100
Subject: [PATCH 3322/3458] redkite: update to 1.3.1.

---
 srcpkgs/redkite/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/redkite/template b/srcpkgs/redkite/template
index 73b4783a00af..994865d7668a 100644
--- a/srcpkgs/redkite/template
+++ b/srcpkgs/redkite/template
@@ -1,15 +1,15 @@
 # Template file for 'redkite'
 pkgname=redkite
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=cmake
-makedepends="cairo-devel"
+makedepends="cairo-devel libX11-devel"
 short_desc="GUI toolkit"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/iurie-sw/redkite"
 distfiles="https://github.com/iurie-sw/redkite/archive/v${version}.tar.gz"
-checksum=f43fc88c18e4231a87b55f82c1f657188b435de425877706b788adf2f63f94e1
+checksum=18f2e3808201e350624279db6553baf53113a7351d80edc3604dccfc32a68e67
 make_check=extended # No target to "ninja test".
 
 redkite-devel_package() {

From 025d0bb473b4ec58ba57fb77aed1272c2ff01917 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Mar 2021 23:48:04 +0200
Subject: [PATCH 3323/3458] font-sarasa-gothic: update to 0.18.4.

---
 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 46f3e7a012fa..7e297ea6756d 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.18.2
+version=0.18.4
 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=5e79d01c3e015101eb941dc899ce0b581f7f7cb05a8660409f59a5a1c8f53c89
+checksum=5b1cd422f0d4f2da5c238380ff9eb4e85f9d7c3b6b091e37cafb642dd3baef78
 
 font_dirs="/usr/share/fonts/TTF"
 

From 043961a77d60a81a00a873891ca09af5b869b286 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Mar 2021 23:35:39 +0200
Subject: [PATCH 3324/3458] FeatherPad: update to 0.18.0.

---
 srcpkgs/FeatherPad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index cfff3296010f..51e2a0a96117 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=0.17.2
+version=0.18.0
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=2e706beeec7d2664b888bc908febae1e4bfe014b3c1d22aece6088a8d023d45c
+checksum=aca3b2b0ff695cc5cfbd2546cf9e82f0faac00db165634fd2ceed609c39a9921

From bad12758dde1e4261823a77cf164e984ee86e804 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 9 Mar 2021 23:13:51 +0200
Subject: [PATCH 3325/3458] butt: update to 0.1.28.

---
 srcpkgs/butt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index 8777ef98880f..a084c606c02b 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -1,7 +1,7 @@
 # Template file for 'butt'
 pkgname=butt
-version=0.1.27
-revision=2
+version=0.1.28
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
@@ -9,7 +9,7 @@ makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
 short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://danielnoethen.de"
+homepage="https://danielnoethen.de/butt/"
 changelog="https://danielnoethen.de/butt/Changelog.html"
 distfiles="${SOURCEFORGE_SITE}/butt/butt-${version}.tar.gz"
-checksum=e19a9b457414d2ca68947b49f4c3180ca8b3210b1c4f3925d71eacf1d47bab87
+checksum=d5a966d768746432610e0d7fe10c504e45c5aabb0b2be24da35779dacc2677e5

From ac27c0fdf8c454989e25c10a0e1e2fb1d52af792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 9 Mar 2021 23:49:31 -0300
Subject: [PATCH 3326/3458] akonadi-search: mark nocross for now.

---
 srcpkgs/akonadi-search/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 7d1d6e6f45e3..928aa37e71b0 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,3 +1,7 @@
+nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/32527/steps/shell_3/logs/stdio"
+# probably missing some -L flag:
+# ninja: error: '/usr/lib32/libxapian.so', needed by 'bin/libKF5AkonadiSearchXapian.so.5.16.3', missing and no known rule to make it
+
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
 version=20.12.3

From ea4709cde3178ca9f8c53699d74499366d523a00 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 10 Mar 2021 04:55:52 +0300
Subject: [PATCH 3327/3458] font-iosevka: update to 5.0.5

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 7a5ad6c9ebf8..9d415425f060 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=5.0.3
+version=5.0.5
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -12,8 +12,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  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="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- e49181e4bdc39d449ef857d129c58ca37d1e21dc936b7c44e7705f1f07293ef0
- 21fc98a7d7cc2ddc2d5c40f03e9d67eab95eb413828d12a95a992f4fa73a8f13"
+ 18c598daca7e041754bbb88777868ba438375c6c76883a3ca2bab2d635406abb
+ cec5a0ba8d5edd4852b794df2da54ff2f74f8b718d7cd37f3189a53b021d954a"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 521c06b91ddd1ab0e3e69c7e5e6a3fba7d224834 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 10 Mar 2021 01:22:35 +0100
Subject: [PATCH 3328/3458] portage: update to 3.0.17.

---
 srcpkgs/portage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 091a37412b11..618be8d2781b 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,6 +1,6 @@
 # Template file for 'portage'
 pkgname=portage
-version=3.0.15
+version=3.0.17
 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=58779c9678112804b4fdd9107d3dad4141d6882d0035cde44e174be28f2d5898
+checksum=96cf79d8d28cf66214871ae9cacb8246d60b443a1eb42c7ae40876f43ae6803e
 
 conf_files="
 	/etc/dispatch-conf.conf

From 6b806a765a7796bdd6ade9b522ee0e21dd7a135e Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 10 Mar 2021 01:23:39 +0100
Subject: [PATCH 3329/3458] py3status: update to 3.34.

---
 srcpkgs/py3status/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 7644ad574444..0f8896d4384d 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.33
+version=3.34
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0c42463652334a556b3547162b46bfbd838abd023cdcc595653e94cfcb8de27f
+checksum=f1234e72cda0a792c3d71da3de3a3752ed3462b62793f6a1204372234a5d2521
 
 do_check() {
 	python3 -m pytest

From 5c51f67455f21cd9609322dcf100a8f07b5f98ff Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 10 Mar 2021 03:35:33 +0300
Subject: [PATCH 3330/3458] nushell: update to 0.28.0

---
 srcpkgs/nushell/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index bd1e069c4b7a..c59833b15569 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.27.1
-revision=3
+version=0.28.0
+revision=1
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://www.nushell.sh/"
 changelog="https://www.nushell.sh/blog/"
 distfiles="https://github.com/nushell/nushell/archive/${version}.tar.gz"
-checksum=bd153a95ea15446bb61a9e0292adc165ee0dd3a586298e77a0041597d68bc04e
+checksum=aa6769f614a031ad33738064030d1c0d9ab500b2b0924adca71edacb1bd1d85d
 register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no

From caaf75afd8f928c4f9be053aff0c75f8bc79cd4b Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 9 Mar 2021 23:50:31 +0100
Subject: [PATCH 3331/3458] geonkick: update to 2.7.2.

---
 srcpkgs/geonkick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template
index e611fe0dd923..3af40e196c69 100644
--- a/srcpkgs/geonkick/template
+++ b/srcpkgs/geonkick/template
@@ -1,6 +1,6 @@
 # Template file for 'geonkick'
 pkgname=geonkick
-version=2.7.0
+version=2.7.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config tar xz redkite"
@@ -11,7 +11,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/iurie-sw/geonkick"
 distfiles="https://github.com/iurie-sw/geonkick/archive/v${version}.tar.gz"
-checksum=c333da9f8db3eb71519a8920e8cc05525754c3a71f9c68ae16b55690d03fb9d4
+checksum=ee4afd97657620ffdcae34192c1d51953059b79d382bc4f165252085b6e24010
 make_check=extended # No target to "ninja test".
 
 if [[ ! ${XBPS_TARGET_MACHINE} == "x86_64" ]]; then

From 62e2e9c7298c1e2691d2cc436491b47043f41fad Mon Sep 17 00:00:00 2001
From: hechos <martin.damian.fernandez@gmail.com>
Date: Tue, 9 Mar 2021 14:34:58 -0300
Subject: [PATCH 3332/3458] privoxy update to 3.0.32

---
 srcpkgs/privoxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/privoxy/template b/srcpkgs/privoxy/template
index 4e78051c2e74..ddaefd75abea 100644
--- a/srcpkgs/privoxy/template
+++ b/srcpkgs/privoxy/template
@@ -1,6 +1,6 @@
 # Template file for 'privoxy'
 pkgname=privoxy
-version=3.0.31
+version=3.0.32
 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=077729a3aac79222a4e8d88a650d9028d16fd4b0d6038da8f5f5e47120d004eb
+checksum=c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7
 system_accounts="privoxy"
 privoxy_homedir="/etc/privoxy"
 

From 2689fd92db88276e292633d9b3ef42457407ad0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 9 Mar 2021 16:11:19 +0100
Subject: [PATCH 3333/3458] monolith: update to 2.4.1.

---
 srcpkgs/monolith/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index b83fc229ffaf..8aedb83c561d 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,7 +1,7 @@
 # Template file for 'monolith'
 pkgname=monolith
-version=2.4.0
-revision=2
+version=2.4.1
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -10,11 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/Y2Z/monolith"
 distfiles="https://github.com/Y2Z/monolith/archive/v${version}.tar.gz"
-checksum=aba401677d9586b973a4719a945ffad70a6bef8adc737437a73aa7ed8709eae4
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}
+checksum=d68980bd5ade841f41e0d35447f9c299c82118eef2d291c2c07063086a18de0d
 
 post_install() {
 	vlicense LICENSE

From e4bb4bf47b16dcce5dc8f3475831114803468fa0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 8 Mar 2021 11:51:15 +0100
Subject: [PATCH 3334/3458] tor: update to 0.4.5.6.

---
 srcpkgs/tor/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 3c3dffc63388..564a36ec87ef 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
-version=0.4.4.6
-revision=2
+version=0.4.5.6
+revision=1
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://www.torproject.org/"
 changelog="https://gitweb.torproject.org/tor.git/plain/ReleaseNotes"
 distfiles="https://dist.torproject.org/tor-${version}.tar.gz"
-checksum=5f154c155803adf5c89e87cab53017b6908c5ebe50c65839e8cf4fbd2abe1fdc
+checksum=22cba3794fedd5fa87afc1e512c6ce2c21bc20b4e1c6f8079d832dc1e545e733
 
 conf_files="/etc/tor/torrc"
 system_accounts="tor"

From 7511501cdaa00c2230f13c5c63360f1e3446b041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 1 Mar 2021 10:36:44 -0300
Subject: [PATCH 3335/3458] New package: gp2c-0.0.12

---
 srcpkgs/gp2c/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/gp2c/template

diff --git a/srcpkgs/gp2c/template b/srcpkgs/gp2c/template
new file mode 100644
index 000000000000..da996ed0972d
--- /dev/null
+++ b/srcpkgs/gp2c/template
@@ -0,0 +1,14 @@
+# Template file for 'gp2c'
+pkgname=gp2c
+version=0.0.12
+revision=1
+build_style=gnu-configure
+hostmakedepends="perl"
+makedepends="pari-devel"
+depends="pari-devel"
+short_desc="PARI/GP Computer Algebra System - gp2c compiler"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="http://pari.math.u-bordeaux.fr/"
+distfiles="${homepage}pub/pari/GP2C/${pkgname}-${version}.tar.gz"
+checksum=ee9ff63979670408d8c293902ce7ff6a825145f0e7e7c6323764733ef1b9310d

From 6edf5e59f1593d7c60b0cb7c3245deb1c727f252 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Wed, 3 Feb 2021 11:19:44 -0300
Subject: [PATCH 3336/3458] New package: texlab-2.2.2

---
 srcpkgs/texlab/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/texlab/template

diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
new file mode 100644
index 000000000000..4d0981431763
--- /dev/null
+++ b/srcpkgs/texlab/template
@@ -0,0 +1,11 @@
+# Template file for 'texlab'
+pkgname=texlab
+version=2.2.2
+revision=1
+build_style=cargo
+short_desc="Implementation of the Language Server Protocol for LaTeX"
+maintainer="Gabriel Sanches <gabriel@gsr.dev>"
+license="GPL-3.0-or-later"
+homepage="https://texlab.netlify.app/"
+distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz"
+checksum=04978b118b455607b5debd0a886f0728ca6c498289d2a0c60d8f83b316dc5ebc

From c3779c1ff7569998997aa6a291942f37c35674ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Mar 2021 15:28:49 +0100
Subject: [PATCH 3337/3458] openssh: update to 8.5p1.

---
 srcpkgs/openssh/patches/config.patch      |  8 ---
 srcpkgs/openssh/patches/ssh-copy-id.patch | 78 -----------------------
 srcpkgs/openssh/template                  |  6 +-
 3 files changed, 3 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/openssh/patches/ssh-copy-id.patch

diff --git a/srcpkgs/openssh/patches/config.patch b/srcpkgs/openssh/patches/config.patch
index 5ce3d57eb301..9424dd29ccd2 100644
--- a/srcpkgs/openssh/patches/config.patch
+++ b/srcpkgs/openssh/patches/config.patch
@@ -8,14 +8,6 @@
  	OSSH_CHECK_CFLAG_COMPILE([-Wsign-compare])
  	OSSH_CHECK_CFLAG_COMPILE([-Wformat-security])
  	OSSH_CHECK_CFLAG_COMPILE([-Wsizeof-pointer-memaccess])
-@@ -1692,7 +1693,6 @@
- 	endgrent \
- 	err \
- 	errx \
--	explicit_bzero \
- 	fchmod \
- 	fchown \
- 	freeaddrinfo \
 @@ -1761,8 +1760,6 @@
  	strcasestr \
  	strdup \
diff --git a/srcpkgs/openssh/patches/ssh-copy-id.patch b/srcpkgs/openssh/patches/ssh-copy-id.patch
deleted file mode 100644
index d79c35a29a65..000000000000
--- a/srcpkgs/openssh/patches/ssh-copy-id.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Accumulated changes to fix ssh-copy-id, pulled from
-https://github.com/openssh/openssh-portable/tree/ce941c75ea9cd6c358508a5b206809846c8d9240
-
---- contrib/ssh-copy-id
-+++ contrib/ssh-copy-id
-@@ -76,7 +76,7 @@
- }
- 
- use_id_file() {
--  local L_ID_FILE="$1"
-+  L_ID_FILE="$1"
- 
-   if [ -z "$L_ID_FILE" ] ; then
-     printf '%s: ERROR: no ID file found\n' "$0"
-@@ -94,7 +94,7 @@
-   # check that the files are readable
-   for f in "$PUB_ID_FILE" ${PRIV_ID_FILE:+"$PRIV_ID_FILE"} ; do
-     ErrMSG=$( { : < "$f" ; } 2>&1 ) || {
--      local L_PRIVMSG=""
-+      L_PRIVMSG=""
-       [ "$f" = "$PRIV_ID_FILE" ] && L_PRIVMSG="	(to install the contents of '$PUB_ID_FILE' anyway, look at the -f option)"
-       printf "\\n%s: ERROR: failed to open ID file '%s': %s\\n" "$0" "$f" "$(printf '%s\n%s\n' "$ErrMSG" "$L_PRIVMSG" | sed -e 's/.*: *//')"
-       exit 1
-@@ -169,7 +169,7 @@
- # populate_new_ids() uses several global variables ($USER_HOST, $SSH_OPTS ...)
- # and has the side effect of setting $NEW_IDS
- populate_new_ids() {
--  local L_SUCCESS="$1"
-+  L_SUCCESS="$1"
- 
-   # shellcheck disable=SC2086
-   if [ "$FORCED" ] ; then
-@@ -181,13 +181,12 @@
-   eval set -- "$SSH_OPTS"
- 
-   umask 0177
--  local L_TMP_ID_FILE
-   L_TMP_ID_FILE=$(mktemp ~/.ssh/ssh-copy-id_id.XXXXXXXXXX)
-   if test $? -ne 0 || test "x$L_TMP_ID_FILE" = "x" ; then
-     printf '%s: ERROR: mktemp failed\n' "$0" >&2
-     exit 1
-   fi
--  local L_CLEANUP="rm -f \"$L_TMP_ID_FILE\" \"${L_TMP_ID_FILE}.stderr\""
-+  L_CLEANUP="rm -f \"$L_TMP_ID_FILE\" \"${L_TMP_ID_FILE}.stderr\""
-   # shellcheck disable=SC2064
-   trap "$L_CLEANUP" EXIT TERM INT QUIT
-   printf '%s: INFO: attempting to log in with the new key(s), to filter out any that are already installed\n' "$0" >&2
-@@ -237,7 +236,8 @@
- #    produce a one-liner to add the keys to remote authorized_keys file
- #    optionally takes an alternative path for authorized_keys
- installkeys_sh() {
--  local AUTH_KEY_FILE=${1:-.ssh/authorized_keys}
-+  AUTH_KEY_FILE=${1:-.ssh/authorized_keys}
-+  AUTH_KEY_DIR=$(dirname "${AUTH_KEY_FILE}")
- 
-   # In setting INSTALLKEYS_SH:
-   #    the tr puts it all on one line (to placate tcsh)
-@@ -247,10 +247,10 @@
-   #    the -z `tail ...` checks for a trailing newline. The echo adds one if was missing
-   #    the cat adds the keys we're getting via STDIN
-   #    and if available restorecon is used to restore the SELinux context
--  INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF)
-+  INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF
- 	cd;
- 	umask 077;
--	mkdir -p $(dirname "${AUTH_KEY_FILE}") &&
-+	mkdir -p "${AUTH_KEY_DIR}" &&
- 	  { [ -z \`tail -1c ${AUTH_KEY_FILE} 2>/dev/null\` ] || echo >> ${AUTH_KEY_FILE}; } &&
- 	  cat >> ${AUTH_KEY_FILE} ||
- 	  exit 1;
-@@ -258,6 +258,7 @@
- 	  restorecon -F .ssh ${AUTH_KEY_FILE};
- 	fi
- EOF
-+  )
- 
-   # to defend against quirky remote shells: use 'exec sh -c' to get POSIX;
-   printf "exec sh -c '%s'" "${INSTALLKEYS_SH}"
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index dfd8f6594921..49b949304096 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=8.4p1
-revision=5
+version=8.5p1
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -23,7 +23,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"
 homepage="https://www.openssh.com"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
-checksum=5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24
+checksum=f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25
 conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
 make_dirs="/var/chroot/ssh 0755 root root"
 

From bee93d7d4e5a7d1b50e10b985e0ffab79d7dbac9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 3 Mar 2021 15:30:05 +0100
Subject: [PATCH 3338/3458] gnome-ssh-askpass: update to 8.5p1.

---
 srcpkgs/gnome-ssh-askpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 751f372cc113..43764cc51520 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
-version=8.4p1
+version=8.5p1
 revision=1
 wrksrc="openssh-${version}"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, BSD-2-Clause"
 homepage="http://www.openssh.org"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz"
-checksum=5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24
+checksum=f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass

From a51eb380dbdf3823d6f40e867c9fbe659173c77d 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, 27 Feb 2021 07:41:36 +0700
Subject: [PATCH 3339/3458] sip: update to 6.0.2.

---
 srcpkgs/sip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 34d8d632bba5..fb967013d774 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.0.1
+version=6.0.2
 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=c933e92b24aedc6d5827748bd8167209102b5de1526e86681a2202549027a784
+checksum=38633bfaa479b1dd35df8f414ffc5c5a342f174ca0c6a21d0e8eb359e33c35b9
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From 238dba1aad590d573a0dde47ad9e0b8048b0ea1f 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, 25 Feb 2021 21:32:49 +0700
Subject: [PATCH 3340/3458] python3-PyQt-builder: update to 1.9.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 0bd0436784a0..db81ee997165 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.8.0
+version=1.9.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=30b5fd3d1bdafeae3131070ebdc55481cf72c6a05a1b73ea2b420678bed2650c
+checksum=54520b4d40d6e6d1307f9cebab4730ae78e01873c88866aa1e5192c24801005a
 
 post_install() {
 	rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle

From d93a07aed8d6ffd6e358109db853aac78dd87b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 4 Mar 2021 22:18:56 +0100
Subject: [PATCH 3341/3458] cabbage: update to 2.5.0.

---
 srcpkgs/cabbage/patches/gcc9.patch | 134 -----------------------------
 srcpkgs/cabbage/template           |  28 +++---
 srcpkgs/cabbage/update             |   2 +-
 3 files changed, 19 insertions(+), 145 deletions(-)
 delete mode 100644 srcpkgs/cabbage/patches/gcc9.patch

diff --git a/srcpkgs/cabbage/patches/gcc9.patch b/srcpkgs/cabbage/patches/gcc9.patch
deleted file mode 100644
index 0ee949257c4f..000000000000
--- a/srcpkgs/cabbage/patches/gcc9.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-commit 1d53d416b47aee20b0d093e319b7bc9131b85adc
-Author: q66 <daniel@octaforge.org>
-Date:   Sat Jan 4 23:52:36 2020 +0100
-
-    fix build with gcc9, adapted from upstream
-
-diff --git JUCE-5.3.2/modules/juce_graphics/colour/juce_PixelFormats.h JUCE-5.3.2/modules/juce_graphics/colour/juce_PixelFormats.h
-index 4b1ba87..f77b885 100644
---- JUCE-5.3.2/modules/juce_graphics/colour/juce_PixelFormats.h
-+++ JUCE-5.3.2/modules/juce_graphics/colour/juce_PixelFormats.h
-@@ -111,19 +111,6 @@ public:
-     forcedinline uint8 getGreen() const noexcept      { return components.g; }
-     forcedinline uint8 getBlue() const noexcept       { return components.b; }
- 
--   #if JUCE_GCC
--    // NB these are here as a workaround because GCC refuses to bind to packed values.
--    forcedinline uint8& getAlpha() noexcept           { return comps [indexA]; }
--    forcedinline uint8& getRed() noexcept             { return comps [indexR]; }
--    forcedinline uint8& getGreen() noexcept           { return comps [indexG]; }
--    forcedinline uint8& getBlue() noexcept            { return comps [indexB]; }
--   #else
--    forcedinline uint8& getAlpha() noexcept           { return components.a; }
--    forcedinline uint8& getRed() noexcept             { return components.r; }
--    forcedinline uint8& getGreen() noexcept           { return components.g; }
--    forcedinline uint8& getBlue() noexcept            { return components.b; }
--   #endif
--
-     //==============================================================================
-     /** Copies another pixel colour over this one.
- 
-@@ -342,9 +329,6 @@ private:
-     {
-         uint32 internal;
-         Components components;
--       #if JUCE_GCC
--        uint8 comps[4];  // helper struct needed because gcc does not allow references to packed union members
--       #endif
-     };
- }
- #ifndef DOXYGEN
-@@ -433,10 +417,6 @@ public:
-     forcedinline uint8 getGreen() const noexcept    { return g; }
-     forcedinline uint8 getBlue() const noexcept     { return b; }
- 
--    forcedinline uint8& getRed() noexcept           { return r; }
--    forcedinline uint8& getGreen() noexcept         { return g; }
--    forcedinline uint8& getBlue() noexcept          { return b; }
--
-     //==============================================================================
-     /** Copies another pixel colour over this one.
- 
-@@ -652,7 +632,6 @@ public:
- 
-     //==============================================================================
-     forcedinline uint8 getAlpha() const noexcept    { return a; }
--    forcedinline uint8& getAlpha() noexcept         { return a; }
- 
-     forcedinline uint8 getRed() const noexcept      { return 0; }
-     forcedinline uint8 getGreen() const noexcept    { return 0; }
-diff --git JUCE-5.3.2/modules/juce_graphics/native/juce_RenderingHelpers.h JUCE-5.3.2/modules/juce_graphics/native/juce_RenderingHelpers.h
-index 9ac3ae2..9f41084 100644
---- JUCE-5.3.2/modules/juce_graphics/native/juce_RenderingHelpers.h
-+++ JUCE-5.3.2/modules/juce_graphics/native/juce_RenderingHelpers.h
-@@ -585,10 +585,6 @@ namespace EdgeTableFillers
-             {
-                 areRGBComponentsEqual = sourceColour.getRed() == sourceColour.getGreen()
-                                             && sourceColour.getGreen() == sourceColour.getBlue();
--                filler[0].set (sourceColour);
--                filler[1].set (sourceColour);
--                filler[2].set (sourceColour);
--                filler[3].set (sourceColour);
-             }
-             else
-             {
-@@ -675,7 +671,6 @@ namespace EdgeTableFillers
-         const Image::BitmapData& destData;
-         PixelType* linePixels;
-         PixelARGB sourceColour;
--        PixelRGB filler[4];
-         bool areRGBComponentsEqual;
- 
-         forcedinline PixelType* getPixel (int x) const noexcept
-@@ -690,47 +685,10 @@ namespace EdgeTableFillers
- 
-         forcedinline void replaceLine (PixelRGB* dest, PixelARGB colour, int width) const noexcept
-         {
--            if (destData.pixelStride == sizeof (*dest))
--            {
--                if (areRGBComponentsEqual)  // if all the component values are the same, we can cheat..
--                {
--                    memset (dest, colour.getRed(), (size_t) width * 3);
--                }
--                else
--                {
--                    if (width >> 5)
--                    {
--                        auto intFiller = reinterpret_cast<const int*> (filler);
--
--                        while (width > 8 && (((pointer_sized_int) dest) & 7) != 0)
--                        {
--                            dest->set (colour);
--                            ++dest;
--                            --width;
--                        }
--
--                        while (width > 4)
--                        {
--                            auto d = reinterpret_cast<int*> (dest);
--                            *d++ = intFiller[0];
--                            *d++ = intFiller[1];
--                            *d++ = intFiller[2];
--                            dest = reinterpret_cast<PixelRGB*> (d);
--                            width -= 4;
--                        }
--                    }
--
--                    while (--width >= 0)
--                    {
--                        dest->set (colour);
--                        ++dest;
--                    }
--                }
--            }
--            else
--            {
--                JUCE_PERFORM_PIXEL_OP_LOOP (set (colour))
--            }
-+            if ((size_t) destData.pixelStride == sizeof (*dest) && areRGBComponentsEqual)
-+                memset ((void*) dest, colour.getRed(), (size_t) width * 3);   // if all the component values are the same, we can cheat..
-+             else
-+                JUCE_PERFORM_PIXEL_OP_LOOP (set (colour));
-         }
- 
-         forcedinline void replaceLine (PixelAlpha* dest, const PixelARGB colour, int width) const noexcept
diff --git a/srcpkgs/cabbage/template b/srcpkgs/cabbage/template
index 4bf1093d0709..fd910797d517 100644
--- a/srcpkgs/cabbage/template
+++ b/srcpkgs/cabbage/template
@@ -1,11 +1,13 @@
 # Template file for 'cabbage'
 pkgname=cabbage
-version=2.0.03
-revision=2
-_jucever=5.3.2
+version=2.5.0
+revision=1
+# specified in buildLinux.sh
+_jucever=5.4.7
+_vstsdkver=3611_22_10_2018_build_34
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
-hostmakedepends="unzip pkg-config xorg-server-xvfb"
+hostmakedepends="pkg-config xorg-server-xvfb"
 makedepends="libfreeglut-devel libcurl-devel jack-devel libXcomposite-devel
  libXrandr-devel libXcursor-devel libX11-devel libXinerama-devel MesaLib-devel
  gtk+3-devel webkit2gtk-devel csound alsa-lib-devel libsndfile-devel"
@@ -16,11 +18,13 @@ license="GPL-3.0-or-later"
 homepage="http://cabbageaudio.com/"
 distfiles="https://github.com/WeAreROLI/JUCE/archive/${_jucever}.tar.gz
  https://github.com/rorywalsh/cabbage/archive/v${version}.tar.gz
- http://www.steinberg.net/sdk_downloads/vstsdk367_03_03_2017_build_352.zip"
-checksum="b7c604bb6a7f9752934f89d72133713f7a65e82478bba80ccb4709d0edb58033
- 80f36d010a1f9bb14469fba70e12a5df7e24e92bec511c7157d5a1e90c0314d3
- 5e8f1058177472f6dd3b5c1e7f8e0e76f37c5f751fed65936e04ff2441ce831a"
-broken="undefined reference to ComponentLayoutEditor::..."
+ http://cabbageaudio.com/beta/heads.zip
+ https://download.steinberg.net/sdk_downloads/vstsdk${_vstsdkver}.zip"
+checksum="0f446cf09177e559d2f2e9a77a78faed611cc869e219a7dc859a6e9b72eca64d
+ 68d2868ee72092ff1f809d472f561f5317512be91f1274390386afea248e78a2
+ 6167199d752fa301e93f1383f9ad700ef646611db53c97d7433fffdb19765e29
+ de64ff1b5b40a7fdc2de873e80d911ffa9fd6b82435a555dda1e8edc267d1fa3"
+nocross="Projucer in template uses compiled binary"
 
 # without TARGET_ARCH, the build system will assume -march=native,
 # which is wrong as we're building a generic package and -march does
@@ -60,6 +64,7 @@ Projucer() {
 post_extract() {
 	mkdir SDKs
 	mv VST_SDK SDKs
+	mv vst2.x SDKs/VST_SDK/VST3_SDK/pluginterfaces
 	cd "${wrksrc}/cabbage-${version}"
 
 	# There are lots of hardcoded paths that need to be rewritten
@@ -97,20 +102,23 @@ do_build() {
 
 	Projucer --resave ../../CabbageIDE.jucer
 	mv Makefile MakeCabbageIDE
+	vsed -i MakeCabbageIDE -e "s@\$(HOME)@${wrksrc}@"
 	make -f MakeCabbageIDE ${makejobs} CONFIG=Release TARGET_ARCH="${_tarch}"
 
 	Projucer --resave ../../CabbagePlugin.jucer
 	mv Makefile MakePluginEffect
+	vsed -i MakePluginEffect -e "s@\$(HOME)@${wrksrc}@"
 	make -f MakePluginEffect ${makejobs} CONFIG=Release TARGET_ARCH="${_tarch}"
 	mv ./build/CabbagePlugin.so ./build/CabbagePluginEffect.so
 
 	Projucer --resave ../../CabbagePluginSynth.jucer
 	mv Makefile MakePluginSynth
+	vsed -i MakePluginSynth -e "s@\$(HOME)@${wrksrc}@"
 	make -f MakePluginSynth ${makejobs} CONFIG=Release TARGET_ARCH="${_tarch}"
 	mv ./build/CabbagePlugin.so ./build/CabbagePluginSynth.so
 
 	Projucer --resave ../../CabbageLite.jucer
-	cp -r ../../../JUCE-5.3.2/modules/juce_audio_plugin_client/ ../../JuceLibraryCode/modules/
+	cp -r ../../../JUCE-${_jucever}/modules/juce_audio_plugin_client/ ../../JuceLibraryCode/modules/
 	mv Makefile MakeCabbageLite
 	make -f MakeCabbageLite ${makejobs} CONFIG=Release TARGET_ARCH="${_tarch}"
 }
diff --git a/srcpkgs/cabbage/update b/srcpkgs/cabbage/update
index 215a1fcf6df5..455d4687bd97 100644
--- a/srcpkgs/cabbage/update
+++ b/srcpkgs/cabbage/update
@@ -1,2 +1,2 @@
 site=https://github.com/rorywalsh/cabbage/releases
-pattern="Cabbage v[\d.]"
+pattern="Cabbage v\K[\d.]+"

From e337cc575cd424c71b8b29c5a2843a89e9b58ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 9 Mar 2021 20:27:33 +0100
Subject: [PATCH 3342/3458] Manual.md: document requirement of tagged release
 in place linked from PR template

---
 CONTRIBUTING.md | 2 --
 Manual.md       | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d6a7299f64b7..4cadfc6265b7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,8 +14,6 @@ to build package files from templates.
 
 For this guide, we assume you have basic knowledge about [git](http://git-scm.org), as well as a [GitHub Account](http://github.com).
 
-Please note that we do not accept any packages containing non-release versions, such as specific git- or svn-revisions anymore.
-
 To get started, [fork](https://help.github.com/articles/fork-a-repo) the void-linux `void-packages` git repository on GitHub and clone it:
 
     $ git clone git@github.com:<user>/void-packages.git
diff --git a/Manual.md b/Manual.md
index ddb9bec934c9..ab86fc39696c 100644
--- a/Manual.md
+++ b/Manual.md
@@ -146,6 +146,11 @@ fonts).
 Browser forks, including those based on Chromium and Firefox, are generally not
 accepted. Such forks require heavy patching, maintenance and hours of build time.
 
+Software need to be used in version announced by authors as ready to use by
+the general public - usually called releases. Betas, arbitrary VCS revisions,
+templates using tip of development branch taken at build time and releases
+created by the package maintainer won't be accepted.
+
 <a id="buildphase"></a>
 ### Package build phases
 

From 2539e130baae5d26d5e277565747f62636901c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 9 Mar 2021 20:07:54 +0100
Subject: [PATCH 3343/3458] xbps-src: make update-sys operate on host

partially reverts 75eca1b03e453d9e643b809550d5157717e46738
---
 common/xbps-src/shutils/bulk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 3e5b848c5d91..8eb6e920f04f 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -115,6 +115,6 @@ bulk_update() {
     if [ -n "$pkgs" -a -n "$args" ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "$XBPS_INSTALL_CMD $XBPS_INSTALL_ARGS -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }

From 1ac4d444abae7cb414f0859b9fe9738888e080f6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 10 Mar 2021 19:43:11 +0100
Subject: [PATCH 3344/3458] nushell: disable fetch plugin on systems without
 ring

---
 srcpkgs/nushell/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index c59833b15569..438b7284dc8d 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -27,6 +27,14 @@ post_patch() {
 	echo '[patch.crates-io.decimal]' >> Cargo.toml
 	echo 'git = "https://github.com/alkis/decimal"' >> Cargo.toml
 	echo 'rev = "c27d9a165afc55ec98fb4db79b12841df578387e"' >> Cargo.toml
+
+	# the fetch plugin pulls in ring
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*|i686*|aarch64*|arm*) ;;
+		*)
+			vsed -i 's/"fetch",//' Cargo.toml
+			;;
+	esac
 }
 
 post_install() {

From 9bc9654f17071e3dad042ad887bd55f1800eaba9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 10 Mar 2021 19:44:33 +0100
Subject: [PATCH 3345/3458] Revert "qt5-webengine: broken for aarch64-musl so
 aarch64 has enough RAM to"

This reverts commit fa64a655e290f7ce6929162cda84c2466a6d7477.
---
 srcpkgs/qt5-webengine/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 38f689d12c5c..2a34623c81ea 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -66,8 +66,7 @@ fi
 
 # ppc64 still needs libatomic here, as does s390x but we don't have that
 case "$XBPS_MACHINE" in
-	ppc64*) hostmakedepends+=" libatomic-devel" ;;
-	aarch64-musl) broken="leave some RAM for the glibc build"
+	ppc64*) hostmakedepends+=" libatomic-devel"
 esac
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 18d19c991bc7520650e6aba9529a1545bea1337e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 10 Mar 2021 19:54:28 +0100
Subject: [PATCH 3346/3458] Revert "akonadi-search: mark nocross for now."

This reverts commit 54e3f5937cdbd171a1cb0c349f482a94e67e5cee.
---
 srcpkgs/akonadi-search/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 928aa37e71b0..7d1d6e6f45e3 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,7 +1,3 @@
-nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/32527/steps/shell_3/logs/stdio"
-# probably missing some -L flag:
-# ninja: error: '/usr/lib32/libxapian.so', needed by 'bin/libKF5AkonadiSearchXapian.so.5.16.3', missing and no known rule to make it
-
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
 version=20.12.3

From eb731cc9ecc1cb37e459ae80c0386258fa3602f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:48:50 +0100
Subject: [PATCH 3347/3458] akregator: update to 20.12.3.

---
 srcpkgs/akregator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 8cf223de1eb3..7ac7f74a76d8 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/internet/akregator"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5d4ddbbbb4d19f8d443f6c8a69372d0635960b41bf8735247f45ff8af3f995c3
+checksum=0b154aea2e1c87ba1f103931ba5e82f2bf6582e4a2779bd6407826739c8bd981

From 5ea6037d053c21e0ca235f76a4d7cae85a947624 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:48:53 +0100
Subject: [PATCH 3348/3458] eventviews: update to 20.12.3.

---
 srcpkgs/eventviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index b53e3d294aef..f98487bc3c69 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,6 +1,6 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0188442796414e1a61aa75b0dbd0dfd11d001d3f82aee05f3a7ad6cdcdff336e
+checksum=7b624e52fae929c9c69d989ec24601f10fd1af50674a2ce3ce7108e2f2866e5e
 
 eventviews-devel_package() {
 	short_desc+=" - development"

From 4f0ee1d1580c596d0db188c9ca6bce869555354a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:48:55 +0100
Subject: [PATCH 3349/3458] incidenceeditor: update to 20.12.3.

---
 srcpkgs/incidenceeditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index 1569c782fd64..38164fa470ad 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,6 +1,6 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2e07739795a0c32039c3ee087723df4e613829897aa8ed71e3ce4156dd11f16a
+checksum=44059c06fc725b085a196c619cdb509829f7a57f17eced56fc6755cdcd07ce13
 
 incidenceeditor-devel_package() {
 	short_desc+=" - development"

From ce638f99481ee817f1cd9a6ba8e15bf6fd82f8b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:48:59 +0100
Subject: [PATCH 3350/3458] kaddressbook: update to 20.12.3.

---
 srcpkgs/kaddressbook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index 35747d86baa0..efb82bd64f97 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,6 +1,6 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kaddressbook"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6ceff2002af65c6edc0cfa98ac4b29c6fc451e48c15c853f6e65c356408dc7db
+checksum=83eda4fd1e4caeccb4de6c0c3368056307b19a7f390b92be605c10676967d795

From 1049b4949c83300b586878f48cd9042a41caf95a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:49:02 +0100
Subject: [PATCH 3351/3458] kalarm: update to 20.12.3.

---
 srcpkgs/kalarm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 3be6aac0ed53..c24d86bace8a 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarm'
 pkgname=kalarm
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kalarm"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=081b6d6e039406e064be0f37d75a8dfc7b7126909c181169716a160d63b1e9f6
+checksum=df542b1a9f1a3eb226c25060fa196a0eecce0ac621de2a16f6bc6d58ea4e795e

From e8ef01afd0f9d86c486638abeda5124ca1a41fcc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:49:07 +0100
Subject: [PATCH 3352/3458] kget: update to 20.12.3.

---
 srcpkgs/kget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index 59793aebedec..813a7446ac79 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,6 +1,6 @@
 # Template file for 'kget'
 pkgname=kget
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kget"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c67b7968f2d9bbc3528042b5fc899066783789e4d98ba4b6fe51d4030564ec59
+checksum=d4eed8f395262cfd94c2b8c9caea3523d78c68000d471c1d76ad1aecc6f6024e

From f4cd964876d0818e54fa19651f125d7c958d4e03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:49:10 +0100
Subject: [PATCH 3353/3458] knotes: update to 20.12.3.

---
 srcpkgs/knotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index 67fc635a117f..1b406cab784f 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,6 +1,6 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://kde.org/applications/en/utilities/org.kde.knotes"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=084ec065435b6a74973396d6bb2322321fad5c81875615e3cdc7272b40ed4e2b
+checksum=06d6f3e444a29b03e6b8cee42b867f0373e71a5b94f65469cd163dcab114c4d8

From 03b67707abdb9eb3333aff34b384fee7b8e2b9ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:49:16 +0100
Subject: [PATCH 3354/3458] konqueror: update to 20.12.3.

---
 srcpkgs/konqueror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index ffa9ee6610af..0fdb0b8e36a9 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/internet/org.kde.konqueror"
 distfiles="${KDE_SITE}/release-service/${version}/src/konqueror-${version}.tar.xz"
-checksum=485d139eabfa5bde9be01cdd349867c9b7a68775a72d5396fd4f4d1e7d4865d8
+checksum=472491923e677815e11e6fe9cd8c8919dc52d37b7350eaad82adfbb203bed2f8
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From d3a857bbeb47b88bd329ff894f2e536e1a07f1ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:49:18 +0100
Subject: [PATCH 3355/3458] kontact: update to 20.12.3.

---
 srcpkgs/kontact/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template
index 2d47106ec9c5..ff5107e0cbd4 100644
--- a/srcpkgs/kontact/template
+++ b/srcpkgs/kontact/template
@@ -1,6 +1,6 @@
 # Template file for 'kontact'
 pkgname=kontact
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kontact"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6ffcb5f0bcea355d8f16555fbf26e7b2ccba7dabe7b8e24be6d8f02020275877
+checksum=b4c56888239f525af814172e221ee6f2cdea17d2ddc20e28fa5443168451da6f

From c7ea281fba4ed3ac25194ac691958652b6127fe1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:49:22 +0100
Subject: [PATCH 3356/3458] korganizer: update to 20.12.3.

---
 srcpkgs/korganizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template
index 7f7c8b643b5e..d2c8c969c7d2 100644
--- a/srcpkgs/korganizer/template
+++ b/srcpkgs/korganizer/template
@@ -1,6 +1,6 @@
 # Template file for 'korganizer'
 pkgname=korganizer
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.korganizer"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=3e6d4d54dda36b174cb531a6c9a542734a8f564bb6971d40549bf09baecfbb2c
+checksum=fc20c61e99778fce7e67c5514010e4436418a74de160191c95b417036b3ebf9a

From ecb7cf09bcbba1eeb726ef9421b2488384c05955 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:49:25 +0100
Subject: [PATCH 3357/3458] krdc: update to 20.12.3.

---
 srcpkgs/krdc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template
index 030abf58c9fe..5db019fc2ec9 100644
--- a/srcpkgs/krdc/template
+++ b/srcpkgs/krdc/template
@@ -1,6 +1,6 @@
 # Template file for 'krdc'
 pkgname=krdc
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.krdc"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c5c73594018f3774ff828ff0e90c22e79bf5b7a9a41447b2d8bd27c6eee62b4a
+checksum=223e9efc636d752456aeb777523d556bd2d2b919a6729f5bf8e53ef643b8fc68
 
 krdc-devel_package() {
 	short_desc+=" - development files"

From 3369afcc540d9e98a12cf26b1144a553bd8138ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:49:28 +0100
Subject: [PATCH 3358/3458] krfb: update to 20.12.3.

---
 srcpkgs/krfb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index b8faf338e4fe..421988cf4f41 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8327804ccbdffefa7cc29f64d953d423843abe33e2af62d2a367a0645ea42e54
+checksum=8479b5ac9c955d06171b8ce4ec80ec178d7de263b441db3459fc1f307ed5e518

From 235f5b84cff40236e361248fbbe3bdb009328ba4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:50:09 +0100
Subject: [PATCH 3359/3458] ktuberling: update to 20.12.3.

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index bbf86be724d7..bb0527410a1d 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=20.12.0
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=215a1158bd0dcac7cd0fec2a88d08aa381c3804059b3bc9a11179c47294e9b56
+checksum=06a949bf9eb07bdb42732e70c5cc0bdabc4aafedd257d58c5392b60de64c9f34

From 1bb2e74b91a19360f351a794d1d7e3218dd4778a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:50:11 +0100
Subject: [PATCH 3360/3458] libktorrent: update to 20.12.3.

---
 srcpkgs/libktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index b72b5b90a6f4..e35c2cccb495 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'libktorrent'
 pkgname=libktorrent
-version=20.12.1
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python3 doxygen"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/en/ktorrent"
 distfiles="${KDE_SITE}/release-service/${version}/src/libktorrent-${version}.tar.xz"
-checksum=bbaa68598993cf83e21d036b53b901efa190ea5e49b394ccc23f3e62c0caaca2
+checksum=c31e083cf551e9b51a0641177469da6419c67182f61e4d1f2a000e7ef2767efa
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From f9e17943de7e7b4062ca962b8d5e607e7e2b8991 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 9 Mar 2021 22:55:16 +0100
Subject: [PATCH 3361/3458] ppsspp: update to 1.11.3.

---
 srcpkgs/ppsspp/patches/unittest.patch | 20 +++++++++
 srcpkgs/ppsspp/template               | 62 +++++++++++++++------------
 2 files changed, 55 insertions(+), 27 deletions(-)
 create mode 100644 srcpkgs/ppsspp/patches/unittest.patch

diff --git a/srcpkgs/ppsspp/patches/unittest.patch b/srcpkgs/ppsspp/patches/unittest.patch
new file mode 100644
index 000000000000..e97e9efb10fb
--- /dev/null
+++ b/srcpkgs/ppsspp/patches/unittest.patch
@@ -0,0 +1,20 @@
+--- unittest/TestVertexJit.cpp	2021-03-09 23:26:11.430146058 +0100
++++ -	2021-03-09 23:30:50.634618762 +0100
+@@ -15,6 +15,7 @@
+ // Official git repository and contact information can be found at
+ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+ 
++#include <math.h>
+ #include "Common/Common.h"
+ #include "Common/TimeUtil.h"
+ #include "Core/Config.h"
+--- CMakeLists.txt	2021-03-02 21:50:51.000000000 +0100
++++ -	2021-03-09 23:37:13.803584455 +0100
+@@ -2100,6 +2100,7 @@
+ 
+ if(UNITTEST)
+ 	add_executable(unitTest
++		unittest/TestShaderGenerators.cpp
+ 		unittest/UnitTest.cpp
+ 		unittest/TestArmEmitter.cpp
+ 		unittest/TestArm64Emitter.cpp
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index dc9f0913aa0e..eaf14bc7cf14 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -1,20 +1,19 @@
 # Template file for 'ppsspp'
 pkgname=ppsspp
-version=1.10.3
-revision=2
-lang_commit=1c64b8fbd3cb6bd87935eb53f302f7de6f86e209
-glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
-SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
-armips_commit=7885552b208493a6a0f21663770c446c3ba65576
-discord_rpc_commit=3d3ae7129d17643bc706da0a2eea85aafd10ab3a
-create_wrksrc=yes
-build_wrksrc="ppsspp-${version}"
+version=1.11.3
+revision=1
+_lang_commit=6bd5b4bc983917ea8402f73c726b46e36f3de0b4
+_glslang_commit=d0850f875ec392a130ccf00018dab458b546f27c
+_SPIRV_Cross_commit=a1f7c8dc8ea2f94443951ee27003bffa562c1f13
+_armips_commit=7885552b208493a6a0f21663770c446c3ba65576
+_discord_rpc_commit=3d3ae7129d17643bc706da0a2eea85aafd10ab3a
+_miniupnp_commit=7e229ddd635933239583ab190d9b614bde018157
 build_style=cmake
 configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON
  -DUSING_QT_UI=$(vopt_if qt ON OFF)"
 hostmakedepends="pkg-config python3 $(vopt_if qt qt5-host-tools)"
 makedepends="zlib-devel glew-devel ffmpeg-devel libzip-devel
- snappy-devel rapidjson
+ snappy-devel rapidjson libpng-devel
  $(vopt_if sdl2 SDL2-devel) $(vopt_if wayland wayland-devel)
  $(vopt_if qt 'qt5-devel qt5-multimedia-devel')"
 depends="desktop-file-utils"
@@ -24,17 +23,19 @@ license="GPL-2.0-or-later"
 homepage="https://www.ppsspp.org/"
 distfiles="
  https://github.com/hrydgard/ppsspp/archive/v${version}.tar.gz
- https://github.com/hrydgard/ppsspp-lang/archive/${lang_commit}.tar.gz
- https://github.com/hrydgard/glslang/archive/${glslang_commit}.tar.gz
- https://github.com/KhronosGroup/SPIRV-Cross/archive/${SPIRV_Cross_commit}.tar.gz
- https://github.com/Kingcom/armips/archive/${armips_commit}.tar.gz
- https://github.com/discordapp/discord-rpc/archive/${discord_rpc_commit}.tar.gz"
-checksum="92a0931c0817529202679f926632510658f3aeea83e2a1663f9cce595b505421
- 2e8a96867471a1e169176e561b06670d5aa460d49a2b074d84ae6378e91f6ef9
+ https://github.com/hrydgard/ppsspp-lang/archive/${_lang_commit}.tar.gz
+ https://github.com/hrydgard/glslang/archive/${_glslang_commit}.tar.gz
+ https://github.com/KhronosGroup/SPIRV-Cross/archive/${_SPIRV_Cross_commit}.tar.gz
+ https://github.com/Kingcom/armips/archive/${_armips_commit}.tar.gz
+ https://github.com/discordapp/discord-rpc/archive/${_discord_rpc_commit}.tar.gz
+ https://github.com/hrydgard/miniupnp/archive/${_miniupnp_commit}.tar.gz"
+checksum="503f046fa68e4be24d08822b0aa2280e653ad513d9a12c77a59809467b95c516
+ b6e9fe4a7daa2dd8d4f3cc74cbafc5382f7df90303af3a3c18d25ec4492d8899
  699e177e0022f17c204e3542bbf7fcb6843923095968edc1ebbc5124e85a2bdf
  456b1e2a75a8e82985ce22f4707570c7aa1fc50d4119cba1a641e8b233ecde26
  f8a03906135fb6f2932b80b7ef5991f39ccac46b36ec3690776fb38c69775c3d
- 20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e"
+ 20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e
+ 6819f0984fa647f69a74831a2333859a07099f64098ce58c35d8604d19532d3d"
 
 # ppsspp always tries to compile x86 unittest
 # https://gist.github.com/Johnnynator/e18d59274451cff890b7235009d2e93d
@@ -48,17 +49,24 @@ esac
 build_options="wayland qt sdl2"
 build_options_default="sdl2"
 
-pre_configure() {
-	# copy submodules to right location
-	cp -rup ${wrksrc}/ppsspp-lang-*/* ${wrksrc}/${pkgname}-${version}/assets/lang
-	cp -rup ${wrksrc}/armips-*/* ${wrksrc}/${pkgname}-${version}/ext/armips
-	cp -rup ${wrksrc}/glslang-*/* ${wrksrc}/${pkgname}-${version}/ext/glslang
-	cp -rup ${wrksrc}/SPIRV-Cross-*/* ${wrksrc}/${pkgname}-${version}/ext/SPIRV-Cross
-	cp -rup ${wrksrc}/discord-rpc-*/* ${wrksrc}/${pkgname}-${version}/ext/discord-rpc
+post_extract() {
+	rmdir -v ${wrksrc}/assets/lang
+	mv ${wrksrc}/../ppsspp-lang-${_lang_commit} ${wrksrc}/assets/lang
+	rmdir -v ${wrksrc}/ext/armips
+	mv ${wrksrc}/../armips-${_armips_commit} ${wrksrc}/ext/armips
+	rmdir -v ${wrksrc}/ext/glslang
+	mv ${wrksrc}/../glslang-${_glslang_commit} ${wrksrc}/ext/glslang
+	rmdir -v ${wrksrc}/ext/SPIRV-Cross
+	mv ${wrksrc}/../SPIRV-Cross-${_SPIRV_Cross_commit} ${wrksrc}/ext/SPIRV-Cross
+	rmdir -v ${wrksrc}/ext/discord-rpc
+	mv ${wrksrc}/../discord-rpc-${_discord_rpc_commit} ${wrksrc}/ext/discord-rpc
+	rmdir -v ${wrksrc}/ext/miniupnp
+	mv ${wrksrc}/../miniupnp-${_miniupnp_commit} ${wrksrc}/ext/miniupnp
+}
 
+post_patch(){
 	# disable git versioning
-	sed 's|find_package(Git)|# &|' -i ${wrksrc}/${pkgname}-${version}/git-version.cmake
-	rm -rf ${pkgname}-${version}/build
+	vsed -e 's|find_package(Git)|# &|' -i git-version.cmake
 }
 
 do_install() {

From 140b6b1f4fdb7779b83901925b5cb752f1199f12 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 10 Mar 2021 16:00:38 +0100
Subject: [PATCH 3362/3458] vscode: update to 1.54.1.

---
 .../vscode/patches/dont-download-ffmpeg.patch    |  6 +++---
 srcpkgs/vscode/patches/gulp.patch                | 16 ++++++++--------
 srcpkgs/vscode/template                          |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index e428f74f52eb..cb7993a59f0f 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,11 +1,11 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index d046aa71ed2f..0740fc225b3f 100644
+index e3ca3514bb62..f9157b7cbc6c 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -263,7 +263,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
- 		let result = all
+@@ -285,7 +285,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			.pipe(util.skipDirectories())
  			.pipe(util.fixWin32DirectoryPermissions())
+ 			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
 -			.pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true })))
 +			.pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false })))
  			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 360c03a8c19f..0b11414bcc6d 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,11 +1,11 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 93a943aba0be..5ab9be8c4bb5 100644
+index e3ca3514bb62..b0942f2b9b89 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -258,7 +258,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
-				'resources/win32/code_150x150.png'
-			], { base: '.' }));
-		} else if (platform === 'linux') {
+@@ -273,7 +273,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 				'resources/win32/code_150x150.png'
+ 			], { base: '.' }));
+ 		} else if (platform === 'linux') {
 -			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
 +			const icon = gulp.src('resources/linux/code.png', { base: '.' });
 +
@@ -16,6 +16,6 @@ index 93a943aba0be..5ab9be8c4bb5 100644
 +				.pipe(replace('@@ICON@@', `code-oss`));
 +
 +			all = es.merge(all, icon, desktop);
-		} else if (platform === 'darwin') {
-			const shortcut = gulp.src('resources/darwin/bin/code.sh')
-				.pipe(rename('bin/code'));
+ 		} else if (platform === 'darwin') {
+ 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
+ 				.pipe(rename('bin/code'));
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 47a0307f30be..27c14c84e7af 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.53.2
+version=1.54.1
 revision=1
 _electronver=9.4.1
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -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=d83ec31b76815aaccb52ed10eb26a134563871f413ed21e8fe456ed89de500aa
+checksum=0afd83b04b5ab0c9f7b4cae6d10abc16ca2d36b9dabc3080734cf48a41ce5f7e
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 2c8ca65083f2494d894b3a308ea40cf782c3875c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 10 Mar 2021 22:35:23 +0100
Subject: [PATCH 3363/3458] nushell: move from h1-client-rustls to hyper-client

https://github.com/nushell/nushell/pull/3154
---
 srcpkgs/nushell/patches/avoid-ring.patch | 325 +++++++++++++++++++++++
 srcpkgs/nushell/template                 |  10 +-
 2 files changed, 326 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/nushell/patches/avoid-ring.patch

diff --git a/srcpkgs/nushell/patches/avoid-ring.patch b/srcpkgs/nushell/patches/avoid-ring.patch
new file mode 100644
index 000000000000..09c2752d5c10
--- /dev/null
+++ b/srcpkgs/nushell/patches/avoid-ring.patch
@@ -0,0 +1,325 @@
+From 2e58576e6ec9a038a63d7dfb8658a7323acf8931 Mon Sep 17 00:00:00 2001
+From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
+Date: Wed, 10 Mar 2021 15:09:10 -0600
+Subject: [PATCH] move from h1-client-rustls to hyper-client
+
+---
+ Cargo.lock                        | 174 ++----------------------------
+ crates/nu_plugin_fetch/Cargo.toml |   2 +-
+ 2 files changed, 7 insertions(+), 169 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 851dff856..a2b5a8c39 100644
+--- Cargo.lock
++++ Cargo.lock
+@@ -204,16 +204,6 @@ dependencies = [
+  "futures-core",
+ ]
+ 
+-[[package]]
+-name = "async-dup"
+-version = "1.2.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c"
+-dependencies = [
+- "futures-io",
+- "simple-mutex",
+-]
+-
+ [[package]]
+ name = "async-executor"
+ version = "1.4.0"
+@@ -242,24 +232,7 @@ dependencies = [
+  "futures-lite",
+  "num_cpus",
+  "once_cell",
+-]
+-
+-[[package]]
+-name = "async-h1"
+-version = "2.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3e9e2a9745d9cd0d92ed7641ce4d07568985762f92633260f0afe8ac7917d9d7"
+-dependencies = [
+- "async-channel",
+- "async-dup",
+- "async-std",
+- "byte-pool",
+- "futures-core",
+- "http-types",
+- "httparse",
+- "lazy_static 1.4.0",
+- "log 0.4.14",
+- "pin-project 1.0.4",
++ "tokio 0.2.24",
+ ]
+ 
+ [[package]]
+@@ -345,19 +318,6 @@ version = "4.0.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
+ 
+-[[package]]
+-name = "async-tls"
+-version = "0.10.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d85a97c4a0ecce878efd3f945f119c78a646d8975340bca0398f9bb05c30cc52"
+-dependencies = [
+- "futures-core",
+- "futures-io",
+- "rustls",
+- "webpki",
+- "webpki-roots",
+-]
+-
+ [[package]]
+ name = "async-trait"
+ version = "0.1.42"
+@@ -602,16 +562,6 @@ version = "3.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+ 
+-[[package]]
+-name = "byte-pool"
+-version = "0.2.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1e38e98299d518ec351ca016363e0cbfc77059dcd08dfa9700d15e405536097a"
+-dependencies = [
+- "crossbeam-queue 0.2.3",
+- "stable_deref_trait",
+-]
+-
+ [[package]]
+ name = "byte-tools"
+ version = "0.2.0"
+@@ -1045,16 +995,6 @@ dependencies = [
+  "maybe-uninit",
+ ]
+ 
+-[[package]]
+-name = "crossbeam-queue"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
+-dependencies = [
+- "cfg-if 1.0.0",
+- "crossbeam-utils 0.8.1",
+-]
+-
+ [[package]]
+ name = "crossbeam-utils"
+ version = "0.6.6"
+@@ -1282,20 +1222,6 @@ version = "2.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+ 
+-[[package]]
+-name = "deadpool"
+-version = "0.7.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d"
+-dependencies = [
+- "async-trait",
+- "config",
+- "crossbeam-queue 0.3.1",
+- "num_cpus",
+- "serde 1.0.123",
+- "tokio 1.2.0",
+-]
+-
+ [[package]]
+ name = "decimal"
+ version = "2.0.4"
+@@ -2331,15 +2257,14 @@ version = "6.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "663563ebc56b0bac7e08722cca7742612fd99d9bd6d05cf904ed9d9212065a34"
+ dependencies = [
+- "async-h1",
+  "async-std",
+- "async-tls",
+  "async-trait",
+  "cfg-if 1.0.0",
+  "dashmap",
+- "deadpool",
+- "futures 0.3.12",
++ "futures-util",
+  "http-types",
++ "hyper 0.13.9",
++ "hyper-tls",
+  "isahc 0.9.14",
+  "log 0.4.14",
+ ]
+@@ -2356,6 +2281,7 @@ dependencies = [
+  "base64 0.13.0",
+  "cookie",
+  "futures-lite",
++ "http 0.2.3",
+  "infer",
+  "pin-project-lite 0.2.4",
+  "rand 0.7.3",
+@@ -4930,21 +4856,6 @@ version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "194d8e591e405d1eecf28819740abed6d719d1a2db87fc0bcdedee9a26d55560"
+ 
+-[[package]]
+-name = "ring"
+-version = "0.16.20"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+-dependencies = [
+- "cc",
+- "libc",
+- "once_cell",
+- "spin",
+- "untrusted",
+- "web-sys",
+- "winapi 0.3.9",
+-]
+-
+ [[package]]
+ name = "roxmltree"
+ version = "0.14.0"
+@@ -5066,19 +4977,6 @@ dependencies = [
+  "semver 0.9.0",
+ ]
+ 
+-[[package]]
+-name = "rustls"
+-version = "0.18.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
+-dependencies = [
+- "base64 0.12.3",
+- "log 0.4.14",
+- "ring",
+- "sct",
+- "webpki",
+-]
+-
+ [[package]]
+ name = "rustversion"
+ version = "1.0.4"
+@@ -5209,16 +5107,6 @@ version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+ 
+-[[package]]
+-name = "sct"
+-version = "0.6.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
+-dependencies = [
+- "ring",
+- "untrusted",
+-]
+-
+ [[package]]
+ name = "security-framework"
+ version = "2.0.0"
+@@ -5557,15 +5445,6 @@ dependencies = [
+  "libc",
+ ]
+ 
+-[[package]]
+-name = "simple-mutex"
+-version = "1.1.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6"
+-dependencies = [
+- "event-listener",
+-]
+-
+ [[package]]
+ name = "siphasher"
+ version = "0.3.3"
+@@ -5649,12 +5528,6 @@ dependencies = [
+  "winapi 0.3.9",
+ ]
+ 
+-[[package]]
+-name = "spin"
+-version = "0.5.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+-
+ [[package]]
+ name = "spinning_top"
+ version = "0.2.2"
+@@ -6201,16 +6074,6 @@ dependencies = [
+  "tokio-macros",
+ ]
+ 
+-[[package]]
+-name = "tokio"
+-version = "1.2.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a"
+-dependencies = [
+- "autocfg",
+- "pin-project-lite 0.2.4",
+-]
+-
+ [[package]]
+ name = "tokio-codec"
+ version = "0.1.2"
+@@ -6371,7 +6234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
+ dependencies = [
+  "crossbeam-deque 0.7.3",
+- "crossbeam-queue 0.2.3",
++ "crossbeam-queue",
+  "crossbeam-utils 0.7.2",
+  "futures 0.1.30",
+  "lazy_static 1.4.0",
+@@ -6633,12 +6496,6 @@ dependencies = [
+  "subtle",
+ ]
+ 
+-[[package]]
+-name = "untrusted"
+-version = "0.7.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+-
+ [[package]]
+ name = "url"
+ version = "2.2.1"
+@@ -6903,25 +6760,6 @@ dependencies = [
+  "wasm-bindgen",
+ ]
+ 
+-[[package]]
+-name = "webpki"
+-version = "0.21.4"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
+-dependencies = [
+- "ring",
+- "untrusted",
+-]
+-
+-[[package]]
+-name = "webpki-roots"
+-version = "0.20.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
+-dependencies = [
+- "webpki",
+-]
+-
+ [[package]]
+ name = "weezl"
+ version = "0.1.3"
+diff --git a/crates/nu_plugin_fetch/Cargo.toml b/crates/nu_plugin_fetch/Cargo.toml
+index ddb62e9e4..8c112e37c 100644
+--- crates/nu_plugin_fetch/Cargo.toml
++++ crates/nu_plugin_fetch/Cargo.toml
+@@ -16,7 +16,7 @@ nu-errors = { path = "../nu-errors", version = "0.28.0" }
+ nu-plugin = { path = "../nu-plugin", version = "0.28.0" }
+ nu-protocol = { path = "../nu-protocol", version = "0.28.0" }
+ nu-source = { path = "../nu-source", version = "0.28.0" }
+-surf = { version = "2.2.0", features = ["h1-client-rustls"] }
++surf = { version = "2.2.0", features = ["hyper-client"] }
+ url = "2.2.1"
+ mime = "0.3.16"
+ 
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 438b7284dc8d..1f699bc73d75 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
 version=0.28.0
-revision=1
+revision=2
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
@@ -27,14 +27,6 @@ post_patch() {
 	echo '[patch.crates-io.decimal]' >> Cargo.toml
 	echo 'git = "https://github.com/alkis/decimal"' >> Cargo.toml
 	echo 'rev = "c27d9a165afc55ec98fb4db79b12841df578387e"' >> Cargo.toml
-
-	# the fetch plugin pulls in ring
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*|aarch64*|arm*) ;;
-		*)
-			vsed -i 's/"fetch",//' Cargo.toml
-			;;
-	esac
 }
 
 post_install() {

From 5b0f85067a7e8f6aa8f0f5386db66d1b8f0c2e03 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 10 Mar 2021 22:35:53 +0100
Subject: [PATCH 3364/3458] texlab: fix build on ppc32

---
 srcpkgs/texlab/patches/jsonrpc.patch |  50 +++++++++
 srcpkgs/texlab/patches/salsa.patch   | 151 +++++++++++++++++++++++++++
 srcpkgs/texlab/template              |  10 +-
 3 files changed, 209 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/texlab/patches/jsonrpc.patch
 create mode 100644 srcpkgs/texlab/patches/salsa.patch

diff --git a/srcpkgs/texlab/patches/jsonrpc.patch b/srcpkgs/texlab/patches/jsonrpc.patch
new file mode 100644
index 000000000000..9bd17f0dcd2f
--- /dev/null
+++ b/srcpkgs/texlab/patches/jsonrpc.patch
@@ -0,0 +1,50 @@
+commit 62d3567c42de318da828149759c6bb2f71c13de7
+Author: q66 <daniel@octaforge.org>
+Date:   Wed Mar 10 22:52:10 2021 +0100
+
+    fix AtomicU64 in jsonrpc (breaks build on ppc32)
+
+diff --git crates/jsonrpc/src/client.rs crates/jsonrpc/src/client.rs
+index 7d71428..3245e24 100644
+--- crates/jsonrpc/src/client.rs
++++ crates/jsonrpc/src/client.rs
+@@ -7,7 +7,7 @@ use futures::{
+ };
+ use serde::Serialize;
+ use serde_json::json;
+-use std::sync::atomic::{AtomicU64, Ordering};
++use std::sync::atomic::{AtomicUsize, Ordering};
+ 
+ pub type Result<T> = std::result::Result<T, Error>;
+ 
+@@ -19,7 +19,7 @@ pub trait ResponseHandler {
+ #[derive(Debug)]
+ pub struct Client {
+     output: mpsc::Sender<String>,
+-    request_id: AtomicU64,
++    request_id: AtomicUsize,
+     senders_by_id: CHashMap<Id, oneshot::Sender<Result<serde_json::Value>>>,
+ }
+ 
+@@ -27,7 +27,7 @@ impl Client {
+     pub fn new(output: mpsc::Sender<String>) -> Self {
+         Self {
+             output,
+-            request_id: AtomicU64::new(0),
++            request_id: AtomicUsize::new(0),
+             senders_by_id: CHashMap::new(),
+         }
+     }
+diff --git crates/jsonrpc/src/types.rs crates/jsonrpc/src/types.rs
+index 30036d1..c1a2dce 100644
+--- crates/jsonrpc/src/types.rs
++++ crates/jsonrpc/src/types.rs
+@@ -6,7 +6,7 @@ pub const PROTOCOL_VERSION: &str = "2.0";
+ #[derive(Debug, Eq, Hash, PartialEq, Clone, Deserialize, Serialize)]
+ #[serde(untagged)]
+ pub enum Id {
+-    Number(u64),
++    Number(usize),
+     String(String),
+ }
+ 
diff --git a/srcpkgs/texlab/patches/salsa.patch b/srcpkgs/texlab/patches/salsa.patch
new file mode 100644
index 000000000000..cfa526ac8f0f
--- /dev/null
+++ b/srcpkgs/texlab/patches/salsa.patch
@@ -0,0 +1,151 @@
+commit e038bc231ad881a82fcec028ed307f8d007d8ae5
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 10 22:31:07 2021 +0100
+
+    fix on ppc32 (missing atomic64)
+    
+    see https://github.com/salsa-rs/salsa/commit/9c7ac99
+
+diff --git salsa/src/revision.rs salsa/src/revision.rs
+index ca7bb10..a18b581 100644
+--- salsa/src/revision.rs
++++ salsa/src/revision.rs
+@@ -1,9 +1,9 @@
+-use std::num::NonZeroU64;
+-use std::sync::atomic::{AtomicU64, Ordering};
++use std::num::NonZeroUsize;
++use std::sync::atomic::{AtomicUsize, Ordering};
+ 
+ /// Value of the initial revision, as a u64. We don't use 0
+-/// because we want to use a `NonZeroU64`.
+-const START_U64: u64 = 1;
++/// because we want to use a `NonZeroUsize`.
++const START: usize = 1;
+ 
+ /// A unique identifier for the current version of the database; each
+ /// time an input is changed, the revision number is incremented.
+@@ -12,17 +12,17 @@ const START_U64: u64 = 1;
+ /// directly as a user of salsa.
+ #[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+ pub struct Revision {
+-    generation: NonZeroU64,
++    generation: NonZeroUsize,
+ }
+ 
+ impl Revision {
+     pub(crate) fn start() -> Self {
+-        Self::from(START_U64)
++        Self::from(START)
+     }
+ 
+-    pub(crate) fn from(g: u64) -> Self {
++    pub(crate) fn from(g: usize) -> Self {
+         Self {
+-            generation: NonZeroU64::new(g).unwrap(),
++            generation: NonZeroUsize::new(g).unwrap(),
+         }
+     }
+ 
+@@ -30,7 +30,7 @@ impl Revision {
+         Self::from(self.generation.get() + 1)
+     }
+ 
+-    fn as_u64(self) -> u64 {
++    fn as_usize(self) -> usize {
+         self.generation.get()
+     }
+ }
+@@ -43,13 +43,13 @@ impl std::fmt::Debug for Revision {
+ 
+ #[derive(Debug)]
+ pub(crate) struct AtomicRevision {
+-    data: AtomicU64,
++    data: AtomicUsize,
+ }
+ 
+ impl AtomicRevision {
+     pub(crate) fn start() -> Self {
+         Self {
+-            data: AtomicU64::new(START_U64),
++            data: AtomicUsize::new(START),
+         }
+     }
+ 
+@@ -58,13 +58,13 @@ impl AtomicRevision {
+     }
+ 
+     pub(crate) fn store(&self, r: Revision) {
+-        self.data.store(r.as_u64(), Ordering::SeqCst);
++        self.data.store(r.as_usize(), Ordering::SeqCst);
+     }
+ 
+     /// Increment by 1, returning previous value.
+     pub(crate) fn fetch_then_increment(&self) -> Revision {
+         let v = self.data.fetch_add(1, Ordering::SeqCst);
+-        assert!(v != u64::max_value(), "revision overflow");
++        assert!(v != usize::max_value(), "revision overflow");
+         Revision::from(v)
+     }
+ }
+diff --git salsa/src/runtime.rs salsa/src/runtime.rs
+index 181a5ea..ada5fec 100644
+--- salsa/src/runtime.rs
++++ salsa/src/runtime.rs
+@@ -10,7 +10,7 @@ use parking_lot::{Mutex, RwLock};
+ use rustc_hash::{FxHashMap, FxHasher};
+ use smallvec::SmallVec;
+ use std::hash::{BuildHasherDefault, Hash};
+-use std::sync::atomic::{AtomicU64, Ordering};
++use std::sync::atomic::{AtomicUsize, Ordering};
+ use std::sync::Arc;
+ 
+ pub(crate) type FxIndexSet<K> = indexmap::IndexSet<K, BuildHasherDefault<FxHasher>>;
+@@ -558,14 +558,14 @@ struct SharedState<DB: Database> {
+     storage: DB::DatabaseStorage,
+ 
+     /// Stores the next id to use for a snapshotted runtime (starts at 1).
+-    next_id: AtomicU64,
++    next_id: AtomicUsize,
+ 
+     /// Whenever derived queries are executing, they acquire this lock
+     /// in read mode. Mutating inputs (and thus creating a new
+     /// revision) requires a write lock (thus guaranteeing that no
+     /// derived queries are in progress). Note that this is not needed
+     /// to prevent **race conditions** -- the revision counter itself
+-    /// is stored in an `AtomicU64` so it can be cheaply read
++    /// is stored in an `AtomicUsize` so it can be cheaply read
+     /// without acquiring the lock.  Rather, the `query_lock` is used
+     /// to ensure a higher-level consistency property.
+     query_lock: RwLock<()>,
+@@ -594,7 +594,7 @@ struct SharedState<DB: Database> {
+ impl<DB: Database> SharedState<DB> {
+     fn with_durabilities(durabilities: usize) -> Self {
+         SharedState {
+-            next_id: AtomicU64::new(1),
++            next_id: AtomicUsize::new(1),
+             storage: Default::default(),
+             query_lock: Default::default(),
+             revisions: (0..durabilities).map(|_| AtomicRevision::start()).collect(),
+@@ -715,7 +715,7 @@ impl<DB: Database> ActiveQuery<DB> {
+ /// complete, its `RuntimeId` may potentially be re-used.
+ #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
+ pub struct RuntimeId {
+-    counter: u64,
++    counter: usize,
+ }
+ 
+ #[derive(Clone, Debug)]
+diff --git Cargo.toml Cargo.toml
+index 0847f06..7c4bb9a 100644
+--- Cargo.toml
++++ Cargo.toml
+@@ -106,6 +106,9 @@ lalrpop = { version = "0.18", optional = true }
+ [profile.release]
+ lto = true
+ 
++[patch.crates-io]
++salsa = { path = './salsa' }
++
+ [[bench]]
+ name = "bench_main"
+ harness = false
diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 4d0981431763..c61ac718f0ac 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -7,5 +7,11 @@ short_desc="Implementation of the Language Server Protocol for LaTeX"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="GPL-3.0-or-later"
 homepage="https://texlab.netlify.app/"
-distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz"
-checksum=04978b118b455607b5debd0a886f0728ca6c498289d2a0c60d8f83b316dc5ebc
+distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz
+ https://github.com/salsa-rs/salsa/archive/v0.13.2.tar.gz"
+checksum="04978b118b455607b5debd0a886f0728ca6c498289d2a0c60d8f83b316dc5ebc
+ 2e33e20d22692f6bcd4d638392b9c2cfb716bcd28998e809db0dd88be4f70a31"
+
+post_extract() {
+	mv ../salsa-* salsa
+}

From ca23d6d2028eb6e8095cc3707d281373f13e6b91 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Wed, 10 Mar 2021 15:31:04 -0700
Subject: [PATCH 3365/3458] QMPlay2: update to 21.03.09.

---
 srcpkgs/QMPlay2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 682cbf3058ba..54cbaef15570 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=20.12.16
-revision=2
+version=21.03.09
+revision=1
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -15,7 +15,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=d6a5425f552e33a70b254ed27631878f20ea92850ccf221c2f2322200783d278
+checksum=cb775292498dd478b585e42c0e1c4310ab914efb465e0b8273b58fe8433add63
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From cb39721910aabe99cc47a7918d1a36ea63326ae2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 10 Mar 2021 20:33:03 +0100
Subject: [PATCH 3366/3458] amdvlk: update to 2021.Q1.4.

---
 srcpkgs/amdvlk/template | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 63f0d7671048..4de14e893433 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,12 +1,12 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2020.Q4.6
+version=2021.Q1.4
 revision=1
-_llpc_commit=e2d38b0c8042efbc435e51696aba5c1abd256c88
-_xgl_commit=86f61a31988a626371131a1633547b0d0ebfcfcb
-_pal_commit=f92844ecbba39be3d2663717ad69c3dffc282211
-_llvm_project_commit=a0777f49050191c9e215a4880c855395ba805508
-_spvgen_commit=fb798cb760a436e9496dbaab8827e4d183b74744
+_llpc_commit=2692228d80d8be2221641b719eb7135f52bc34aa
+_xgl_commit=e5c5ad454049892ed803b0adcc15ef6fb27ec50e
+_pal_commit=575d41ff01c856d9566168d65b31e4b49db4734b
+_llvm_project_commit=90d06712ff54e242b7bd225321e4fc8629292d46
+_spvgen_commit=59823e6c3557cb7f3fae4a9f2760ad3f6b694997
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
 archs="i686* x86_64*"
@@ -32,17 +32,21 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="7408961e8b8d5725ba5887ef55cf79c7117da6e77f4f4d5d24bb531b775f5fb6
- 346307070fe5283a6fc261465cd8ecdff749381f7ab2e48fe45fa46ef112e907
- 2f4a186c8a8ce23d4cb57623eb8380ff1ed70c0172311a73c084f94706a09c01
- 92bb3e00dd10556f4f4f2bc702f6e51b7709ccbfef6c4d94b07a15140993ed4f
- 32bbc615d89abfbef188c3a613d3a4effcf0ea95eabe2d113dd9b80d3ce74fe9
- 371b137edf4d5ec4f4483ec10ac1419fffa73b6abb1931dd637a59c1b6247e65
+checksum="c88b946a0dd8d9442e798ce3a182b6f23ffab0b96e9967292ad6ba84c74d9273
+ 1e043aee70e5690bc5934a2352a19c182e5d27c59ac9870089d979ce59c125cc
+ 571fdf549864eea95e716149bbc54d6906ac74d5d5811c46047b4483256590e6
+ 42e048a5ea32fb44f26ad96b538754bbffdcd9f20a019bacd1efd2302a3502ac
+ e7e9a943486fb16426fb5584a992a227a3e014142bdc70e25ce18a7ccdb830f5
+ 124e37608f2ef49a980c3fff9cc73bcb154c9724ee00397e0dee6cc8cf1b4244
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) nodebug=yes;;
+esac
+
 post_extract() {
 	mv ${wrksrc}/AMDVLK-v-${version} ${wrksrc}/AMDVLK
 	mv ${wrksrc}/xgl-${_xgl_commit} ${wrksrc}/xgl

From 9e42f65fe05805ce01618f97d68ad86524c79571 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 10 Mar 2021 20:33:41 +0100
Subject: [PATCH 3367/3458] sblg: update to 0.5.11.

---
 srcpkgs/sblg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sblg/template b/srcpkgs/sblg/template
index a19211bc4371..f1cf4da2c6a7 100644
--- a/srcpkgs/sblg/template
+++ b/srcpkgs/sblg/template
@@ -1,6 +1,6 @@
 # Template file for 'sblg'
 pkgname=sblg
-version=0.5.10
+version=0.5.11
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/sblg/"
 changelog="https://kristaps.bsd.lv/sblg/archive.html"
 distfiles="https://kristaps.bsd.lv/sblg/snapshots/${pkgname}-${version}.tar.gz"
-checksum=ed86e20fb52f33290d0d9bcad69be4951892c7f383bcb4d6d44b0da9183f25b7
+checksum=f178b6c9b50f87155cf5f06a7b8511e65ffa0cfc48e5097488d12bcce69d81ed
 
 pre_configure() {
 if [ "$CROSS_BUILD" ]; then

From bf6752b1a12b0f4d3db1842905985a3aac150070 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Mar 2021 00:02:35 +0100
Subject: [PATCH 3368/3458] quodlibet: update to 4.4.0.

---
 srcpkgs/quodlibet/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/quodlibet/template b/srcpkgs/quodlibet/template
index 7261c85a6cfd..f45668529d68 100644
--- a/srcpkgs/quodlibet/template
+++ b/srcpkgs/quodlibet/template
@@ -1,7 +1,7 @@
 # Template file for 'quodlibet'
 pkgname=quodlibet
-version=4.3.0
-revision=2
+version=4.4.0
+revision=1
 build_style=python3-module
 pycompile_module="quodlibet"
 hostmakedepends="intltool python3-devel"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://quodlibet.readthedocs.io/en/latest/"
 distfiles="https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"
-checksum=a2e5c027a69f138364c57e4adf72f5c08c235bc09a4bcd8f668e2847d76427e0
+checksum=a03318d2767e4959551763d0a87fad977387af712608fe572714176a24bbf367

From eca21beb67f1ff876780a4d8e0799f7507918189 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, 25 Feb 2021 21:33:16 +0700
Subject: [PATCH 3369/3458] python3-PyQt5: update to 5.15.3.

---
 srcpkgs/python3-PyQt5-networkauth |   1 -
 srcpkgs/python3-PyQt5/template    | 197 +++++-------------------------
 2 files changed, 31 insertions(+), 167 deletions(-)
 delete mode 120000 srcpkgs/python3-PyQt5-networkauth

diff --git a/srcpkgs/python3-PyQt5-networkauth b/srcpkgs/python3-PyQt5-networkauth
deleted file mode 120000
index 75ad8e779a9b..000000000000
--- a/srcpkgs/python3-PyQt5-networkauth
+++ /dev/null
@@ -1 +0,0 @@
-python3-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 058095e7c699..4437295251de 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,158 +1,36 @@
 # Template file for 'python3-PyQt5'
 pkgname=python3-PyQt5
-version=5.15.2
-revision=3
+version=5.15.3
+revision=1
 _sipver=12.8.0
 wrksrc="PyQt5-${version}"
-build_helper=qemu
-hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake
+build_helper="qemu qmake"
+hostmakedepends="pkg-config python3-PyQt-builder qt5-qmake qt5-host-tools
  python3-dbus"
 makedepends="qscintilla-qt5-devel python3-sip-PyQt5
  python3-devel python-dbus-devel qt5 qt5-devel qt5-tools-devel
  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"
+ qt5-x11extras-devel qt5-xmlpatterns-devel pulseaudio-devel"
 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>"
 license="GPL-3.0-only"
 homepage="https://riverbankcomputing.com/software/pyqt/intro"
 distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz"
-checksum=372b08dc9321d1201e4690182697c5e7ffb2e0770e6b4a45519025134b12e4fc
+checksum=965ba50e7029b37f218a54ace24e87c77db3e5a9f0b83baeb21fb57b4154b838
 lib32disabled=yes
+CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
+CXXFLAGS="$CFLAGS"
+
+export INCPATH=$XBPS_CROSS_BASE/usr/include/python$py3_ver
 
 post_extract() {
 	rm -rf pyuic/uic/port_v2
 }
 
-_cross_configure() {
-	local qplatformdefs="/usr/lib/qt5/mkspecs/linux-g++/qplatformdefs.h"
-
-	mkdir -p "${wrksrc}/.target-spec/linux-g++"
-	cat >"${wrksrc}/.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}
-	INCPATH                 = $XBPS_CROSS_BASE/usr/include/python$py3_ver
-	load(qt_config)
-	_EOF
-	ln -sf ${XBPS_CROSS_BASE}$qplatformdefs ${wrksrc}/.target-spec/linux-g++/
-
-	mkdir -p "${wrksrc}/.host-spec/linux-g++"
-	cat > "${wrksrc}/.host-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
-	QMAKE_CC                = ${CC_FOR_BUILD}
-	QMAKE_CXX               = ${CXX_FOR_BUILD}
-	QMAKE_LINK              = ${CXX_FOR_BUILD}
-	QMAKE_LINK_C            = ${CC_FOR_BUILD}
-	QMAKE_LINK_SHLIB        = ${CXX_FOR_BUILD}
-
-	QMAKE_AR                = gcc-ar cqs
-	QMAKE_OBJCOPY           = ${OBJCOPY_FOR_BUILD}
-	QMAKE_NM                = ${NM_FOR_BUILD} -P
-	QMAKE_STRIP             = ${STRIP_FOR_BUILD}
-
-	QMAKE_CFLAGS            = ${CFLAGS_FOR_BUILD}
-	QMAKE_CXXFLAGS          = ${CXXFLAGS_FOR_BUILD}
-	QMAKE_LFLAGS            = ${LDFLAGS_FOR_BUILD}
-	load(qt_config)
-	_EOF
-	ln -sf $qplatformdefs ${wrksrc}/.host-spec/linux-g++/
-
-	cat >"${wrksrc}/qt.conf" <<-_EOF
-	[Paths]
-	Sysroot=${XBPS_CROSS_BASE}
-	Prefix=/usr
-	ArchData=/usr/lib/qt5
-	Data=/usr/share/qt5
-	Documentation=/usr/share/doc/qt5
-	Headers=${XBPS_CROSS_BASE}/usr/include/qt5
-	Libraries=${XBPS_CROSS_BASE}/usr/lib
-	LibraryExecutables=/usr/lib/qt5/libexec
-	Binaries=/usr/lib/qt5/bin
-	Tests=${XBPS_CROSS_BASE}/usr/tests
-	Plugins=/usr/lib/qt5/plugins
-	Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports
-	Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml
-	Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations
-	Settings=${XBPS_CROSS_BASE}/etc/xdg
-	Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples
-	HostPrefix=/usr
-	HostData=/usr/lib/qt5
-	HostBinaries=/usr/lib/qt5/bin
-	HostLibraries=/usr/lib
-	Spec=$wrksrc/.host-spec/linux-g++
-	TargetSpec=$wrksrc/.target-spec/linux-g++
-	_EOF
-
-	case $XBPS_TARGET_MACHINE in
-		i686*) _qt_arch=i386;;
-		x86_64*) _qt_arch=x86_64;;
-		aarch64*) _qt_arch=arm64;;
-		arm*) _qt_arch=arm;;
-		mips*) _qt_arch=mips;;
-	esac
-	cat >$XBPS_WRAPPERDIR/qmake <<_EOF
-#!/bin/sh
-export PREFIX=/usr
-export QT_INSTALL_PREFIX=/usr
-export LIB=/usr/lib
-export QT_TARGET_ARCH=$_qt_arch
-export PKG_CONFIG_EXECUTABLE=$XBPS_WRAPPERDIR/$PKG_CONFIG
-case " \$* " in
-" -query ")
-	/usr/lib/qt5/bin/qmake "\$@" -qtconf $wrksrc/qt.conf |
-	sed '/^QT_INSTALL_/s,$XBPS_CROSS_BASE,,'
-	;;
-*)
-	exec /usr/lib/qt5/bin/qmake -qtconf $wrksrc/qt.conf "\$@" ;;
-esac
-_EOF
-}
-
 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 \
 		--api-dir /usr/share/qt5/qsci/api/python \
@@ -161,29 +39,24 @@ do_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		# -I/usr/include/python$py3_ver is set by sip-build :(
 		find build -name Makefile |
-		xargs sed -i "
-			s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g
-			"
+		xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
 	fi
 }
 
 do_build() {
-	cd build
-	make ${makejobs}
+	make -C build ${makejobs}
 }
 
 do_install() {
-	cd build
-	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+	make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
 	for f in pylupdate5 pyrcc5 pyuic5; do
-		sed -i '1s,python3[.0-9]*,python3,' ${DESTDIR}/usr/bin/${f}
 		mv ${DESTDIR}/usr/bin/{,python3-}${f}
 	done
 }
 
 python3-PyQt5-devel-tools_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc+=" - development tools"
 	alternatives="
 	 pyqt5:pylupdate5:/usr/bin/python3-pylupdate5
@@ -196,7 +69,7 @@ python3-PyQt5-devel-tools_package() {
 	}
 }
 python3-PyQt5-devel_package() {
-	depends="sip>=6.0.0 python3-PyQt5-${version}_${revision}"
+	depends="sip>=6.0.0 python3-PyQt5>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove ${py3_sitelib}/PyQt5/bindings
@@ -204,7 +77,7 @@ python3-PyQt5-devel_package() {
 }
 python3-PyQt5-dbus_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision} python3-dbus"
+	depends="python3-PyQt5>=${version}_${revision} python3-dbus"
 	short_desc="${short_desc} - dbus support"
 	pkg_install() {
 		vmove ${py3_sitelib}/dbus
@@ -212,7 +85,7 @@ python3-PyQt5-dbus_package() {
 }
 python3-PyQt5-connectivity_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - connectivity module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtBluetooth.*"
@@ -221,24 +94,16 @@ python3-PyQt5-connectivity_package() {
 }
 python3-PyQt5-multimedia_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - multimedia module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtMultimedia.*"
 		vmove "${py3_sitelib}/PyQt5/QtMultimediaWidgets.*"
 	}
 }
-python3-PyQt5-networkauth_package() {
-	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
-	short_desc="${short_desc} - networkauth module"
-	pkg_install() {
-		vmove "${py3_sitelib}/PyQt5/QtNetworkAuth.*"
-	}
-}
 python3-PyQt5-opengl_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - opengl module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtOpenGL.*"
@@ -249,7 +114,7 @@ python3-PyQt5-opengl_package() {
 }
 python3-PyQt5-location_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - location module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtLocation.*"
@@ -258,7 +123,7 @@ python3-PyQt5-location_package() {
 }
 python3-PyQt5-quick_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - quick module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtQml.*"
@@ -269,7 +134,7 @@ python3-PyQt5-quick_package() {
 }
 python3-PyQt5-sensors_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - sensors module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtSensors.*"
@@ -277,7 +142,7 @@ python3-PyQt5-sensors_package() {
 }
 python3-PyQt5-serialport_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - serialport module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtSerialPort.*"
@@ -285,7 +150,7 @@ python3-PyQt5-serialport_package() {
 }
 python3-PyQt5-sql_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - sql module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtSql.*"
@@ -293,7 +158,7 @@ python3-PyQt5-sql_package() {
 }
 python3-PyQt5-svg_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - svg module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtSvg.*"
@@ -301,7 +166,7 @@ python3-PyQt5-svg_package() {
 }
 python3-PyQt5-tools_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - designer, help modules"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtHelp.*"
@@ -311,7 +176,7 @@ python3-PyQt5-tools_package() {
 }
 python3-PyQt5-webchannel_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - webchannel module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtWebChannel.*"
@@ -319,7 +184,7 @@ python3-PyQt5-webchannel_package() {
 }
 python3-PyQt5-webkit_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - webkit module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtWebKit.*"
@@ -328,7 +193,7 @@ python3-PyQt5-webkit_package() {
 }
 python3-PyQt5-websockets_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - websockets module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtWebSockets.*"
@@ -336,7 +201,7 @@ python3-PyQt5-websockets_package() {
 }
 python3-PyQt5-x11extras_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - x11extras module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtX11Extras.*"
@@ -344,7 +209,7 @@ python3-PyQt5-x11extras_package() {
 }
 python3-PyQt5-xmlpatterns_package() {
 	lib32disabled=yes
-	depends="python3-PyQt5-${version}_${revision}"
+	depends="python3-PyQt5>=${version}_${revision}"
 	short_desc="${short_desc} - xmlpatterns module"
 	pkg_install() {
 		vmove "${py3_sitelib}/PyQt5/QtXmlPatterns.*"

From 6b72fe7655b70c44fb0202ad96e3599e9d3817a2 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, 25 Feb 2021 21:33:32 +0700
Subject: [PATCH 3370/3458] python3-PyQt5-webengine: update to 5.15.3.

---
 srcpkgs/python3-PyQt5-webengine/template | 158 +++--------------------
 1 file changed, 17 insertions(+), 141 deletions(-)

diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 7f4cb452f8e5..6027049cf683 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,177 +1,53 @@
 # Template file for 'python3-PyQt5-webengine'
 pkgname=python3-PyQt5-webengine
-version=5.15.2
-revision=2
+version=5.15.3
+revision=1
 wrksrc="PyQtWebEngine-${version}"
+build_helper="qmake"
 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"
+depends="python3-PyQt5>=${version} python3-PyQt5-webchannel>=${version}"
 short_desc="Python 3 bindings for the Qt5 toolkit - webengine module"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
 distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
-checksum=4d72fea774071ce6f76e341a3d2c5d595886c9906a9b9493239c841cce54a634
+checksum=0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6
 lib32disabled=yes
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
+CXXFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"
 
-case "$XBPS_TARGET_MACHINE" in
-	ppc64le*) ;;
-	ppc*) broken="no webengine for big endian ppc";;
-	arm*) broken="depends on qt5-webengine";;
-esac
+if [ "$XBPS_TARGET_ENDIAN" != le ]; then
+	broken="no webengine for big endian"
+fi
+
+if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
 
 post_extract() {
 	rm -rf pyuic/uic/port_v2
 }
 
-_cross_configure() {
-	local qplatformdefs="/usr/lib/qt5/mkspecs/linux-g++/qplatformdefs.h"
-
-	mkdir -p "${wrksrc}/.target-spec/linux-g++"
-	cat >"${wrksrc}/.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}
-	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++/
-
-	mkdir -p "${wrksrc}/.host-spec/linux-g++"
-	cat > "${wrksrc}/.host-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
-	QMAKE_CC                = ${CC_FOR_BUILD}
-	QMAKE_CXX               = ${CXX_FOR_BUILD}
-	QMAKE_LINK              = ${CXX_FOR_BUILD}
-	QMAKE_LINK_C            = ${CC_FOR_BUILD}
-	QMAKE_LINK_SHLIB        = ${CXX_FOR_BUILD}
-
-	QMAKE_AR                = gcc-ar cqs
-	QMAKE_OBJCOPY           = ${OBJCOPY_FOR_BUILD}
-	QMAKE_NM                = ${NM_FOR_BUILD} -P
-	QMAKE_STRIP             = ${STRIP_FOR_BUILD}
-
-	QMAKE_CFLAGS            = ${CFLAGS_FOR_BUILD}
-	QMAKE_CXXFLAGS          = ${CXXFLAGS_FOR_BUILD}
-	QMAKE_LFLAGS            = ${LDFLAGS_FOR_BUILD}
-	load(qt_config)
-	_EOF
-	ln -sf $qplatformdefs ${wrksrc}/.host-spec/linux-g++/
-
-	cat > "$wrksrc/qt.conf" <<-_EOF
-	[Paths]
-	Sysroot=${XBPS_CROSS_BASE}
-	Prefix=/usr
-	ArchData=/usr/lib/qt5
-	Data=/usr/share/qt5
-	Documentation=/usr/share/doc/qt5
-	Headers=${XBPS_CROSS_BASE}/usr/include/qt5
-	Libraries=${XBPS_CROSS_BASE}/usr/lib
-	LibraryExecutables=/usr/lib/qt5/libexec
-	Binaries=/usr/lib/qt5/bin
-	Tests=${XBPS_CROSS_BASE}/usr/tests
-	Plugins=/usr/lib/qt5/plugins
-	Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/imports
-	Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt5/qml
-	Translations=${XBPS_CROSS_BASE}/usr/share/qt5/translations
-	Settings=${XBPS_CROSS_BASE}/etc/xdg
-	Examples=${XBPS_CROSS_BASE}/usr/share/qt5/examples
-	HostPrefix=/usr
-	HostData=/usr/lib/qt5
-	HostBinaries=/usr/lib/qt5/bin
-	HostLibraries=/usr/lib
-	Spec=$wrksrc/.host-spec/linux-g++
-	TargetSpec=$wrksrc/.target-spec/linux-g++
-	_EOF
-
-	case $XBPS_TARGET_MACHINE in
-		i686*) _qt_arch=i386;;
-		x86_64*) _qt_arch=x86_64;;
-		aarch64*) _qt_arch=arm64;;
-		arm*) _qt_arch=arm;;
-		mips*) _qt_arch=mips;;
-	esac
-	cat <<EOF >$XBPS_WRAPPERDIR/qmake
-#!/bin/sh
-export PREFIX=/usr
-export QT_INSTALL_PREFIX=/usr
-export LIB=/usr/lib
-export QT_TARGET_ARCH=$_qt_arch
-export PKG_CONFIG_EXECUTABLE=$XBPS_WRAPPERDIR/$PKG_CONFIG
-case " \$* " in
-" -query ")
-	/usr/lib/qt5/bin/qmake "\$@" -qtconf $wrksrc/qt.conf |
-	sed '/^QT_INSTALL_/s,$XBPS_CROSS_BASE,,'
-	;;
-*)
-	exec /usr/lib/qt5/bin/qmake -qtconf $wrksrc/qt.conf "\$@" ;;
-esac
-EOF
-}
-
 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 python include
+		# -I/usr/include/python$py3_ver is set by sip-build :(
 		find build -name Makefile |
 		xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
 	fi
 }
 
 do_build() {
-	cd build
-	make ${makejobs}
+	make -C build ${makejobs}
 }
 
 do_install() {
-	cd build
-	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
-	rm -rf ${DESTDIR}/usr/share
+	make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
 }

From 49d53c30010661fbff8390f2fc02d70735544b38 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 Mar 2021 21:58:54 +0700
Subject: [PATCH 3371/3458] python3-PyQt5-webengine: split -devel

---
 srcpkgs/python3-PyQt5-webengine-devel    | 1 +
 srcpkgs/python3-PyQt5-webengine/template | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 120000 srcpkgs/python3-PyQt5-webengine-devel

diff --git a/srcpkgs/python3-PyQt5-webengine-devel b/srcpkgs/python3-PyQt5-webengine-devel
new file mode 120000
index 000000000000..9187de479665
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-webengine-devel
@@ -0,0 +1 @@
+python3-PyQt5-webengine
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 6027049cf683..aed879a2dbad 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -51,3 +51,11 @@ do_build() {
 do_install() {
 	make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
 }
+
+python3-PyQt5-webengine-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/bindings
+	}
+}

From 80dac5262592c34b6448a244c7f3231627fd79f7 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 Mar 2021 08:20:45 +0700
Subject: [PATCH 3372/3458] python3-PyQt5-networkauth: update to 5.15.3

Splited from python3-PyQt5
---
 srcpkgs/python3-PyQt5-networkauth-devel    |  1 +
 srcpkgs/python3-PyQt5-networkauth/template | 47 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/python3-PyQt5-networkauth-devel
 create mode 100644 srcpkgs/python3-PyQt5-networkauth/template

diff --git a/srcpkgs/python3-PyQt5-networkauth-devel b/srcpkgs/python3-PyQt5-networkauth-devel
new file mode 120000
index 000000000000..1dd296bda791
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth-devel
@@ -0,0 +1 @@
+python3-PyQt5-networkauth
\ No newline at end of file
diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template
new file mode 100644
index 000000000000..b0768fc041bc
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -0,0 +1,47 @@
+# Template file for 'python3-PyQt5-networkauth'
+pkgname=python3-PyQt5-networkauth
+version=5.15.3
+revision=1
+wrksrc=PyQtNetworkAuth-$version
+build_helper="qmake"
+hostmakedepends="qt5-qmake python3-PyQt5-devel pkg-config sip
+ python3-PyQt-builder"
+makedepends="python3-devel python3-PyQt5-devel qt5-networkauth-devel"
+depends="python3-PyQt5>=$version"
+short_desc="Python bindings for the Qt5 Network Authorization library"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
+distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
+checksum=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
+CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
+CXXFLAGS="$CFLAGS"
+
+do_configure() {
+	mkdir -p build
+	sip-build --no-make \
+		--api-dir /usr/share/qt5/qsci/api/python \
+		--build-dir build
+
+	if [ "$CROSS_BUILD" ]; then
+		# -I/usr/include/python$py3_ver is set by sip-build :(
+		find build -name Makefile |
+		xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
+	fi
+}
+
+do_build() {
+	make -C build ${makejobs}
+}
+
+do_install() {
+	make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+}
+
+python3-PyQt5-networkauth-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/bindings
+	}
+}

From afccdf70170beff4cd67083db115b5897d6462c6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Mar 2021 01:15:34 +0100
Subject: [PATCH 3373/3458] cabbage: fix build on ppc

---
 srcpkgs/cabbage/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/cabbage/template b/srcpkgs/cabbage/template
index fd910797d517..9b650bccf50c 100644
--- a/srcpkgs/cabbage/template
+++ b/srcpkgs/cabbage/template
@@ -26,6 +26,11 @@ checksum="0f446cf09177e559d2f2e9a77a78faed611cc869e219a7dc859a6e9b72eca64d
  de64ff1b5b40a7fdc2de873e80d911ffa9fd6b82435a555dda1e8edc267d1fa3"
 nocross="Projucer in template uses compiled binary"
 
+# vsx accel stuff from libpng is not shipped
+case "$XBPS_TARGET_MACHINE" in
+	ppc*) CXXFLAGS="-DPNG_POWERPC_VSX_OPT=0" ;;
+esac
+
 # without TARGET_ARCH, the build system will assume -march=native,
 # which is wrong as we're building a generic package and -march does
 # not even always work

From d9acd49b72bfa20b9e7f1826c1e75b56198c2499 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Mar 2021 01:48:04 +0100
Subject: [PATCH 3374/3458] cabbage: need libatomic on some platforms

---
 srcpkgs/cabbage/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/cabbage/template b/srcpkgs/cabbage/template
index 9b650bccf50c..c0f5f33b3b8c 100644
--- a/srcpkgs/cabbage/template
+++ b/srcpkgs/cabbage/template
@@ -31,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc*) CXXFLAGS="-DPNG_POWERPC_VSX_OPT=0" ;;
 esac
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS=" -latomic"
+fi
+
 # without TARGET_ARCH, the build system will assume -march=native,
 # which is wrong as we're building a generic package and -march does
 # not even always work

From b6dd18c60f9a48a8399dc5eda49bdfbc49649018 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 11 Mar 2021 01:20:22 +0100
Subject: [PATCH 3375/3458] go: update to 1.15.9

Fixes CVE-2021-27918
---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 186575b0676d..25f339b6e589 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.15.8
+version=1.15.9
 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=540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2
+checksum=90983b9c84a92417337dc1942ff066fc8b3a69733b8b5493fd0b9b9db1ead60f
 nostrip=yes
 noverifyrdeps=yes
 

From f819034475d69964a016d08c77a6cdbb779e2757 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, 11 Mar 2021 07:41:47 +0700
Subject: [PATCH 3376/3458] i3: update to 4.19.2.

- remove datetime fixup in meson.build (fixed upstream)
- remove glob replacement in musl (supported from 1.1.24)
- remove perl-AnyEvent-I3 from depends, whoever wants to write the
  binding need to install themself.
---
 srcpkgs/i3/template | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index 51733b6ba53f..f0a69f731b1b 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,40 +1,23 @@
 # Template file for 'i3'
 pkgname=i3
-version=4.19.1
-revision=2
+version=4.19.2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config perl"
 makedepends="pcre-devel yajl-devel libxcb-devel libev-devel
  pango-devel startup-notification-devel libxkbcommon-devel
  xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel
  xcb-util-xrm-devel"
-depends="perl-AnyEvent-I3"
 conf_files="/etc/i3/config /etc/i3/config.keycodes"
 short_desc="Improved tiling window manager"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD-3-Clause"
 homepage="https://i3wm.org/"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.xz"
-checksum=2284c812fc689e0338d8fe9be0b8d1552e548fc168d165f795b26bf497c22b47
+checksum=8a6ee177689dcf22964d20b6093014ee4fa0419345d3fd515d5512d9980bb279
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" libglob-devel";;
-esac
-
-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)
-		vsed -i "/^common_deps/i glob_dep = cc.find_library('glob')" meson.build
-		vsed -i "/^common_deps/a glob_dep," meson.build
-		vsed -i '/include/s,glob.h,libglob/glob.h,g' i3bar/src/main.c libi3/resolve_tilde.c
-		vsed -i '/GLOB_TILDE/s/glob(/g_glob(/g' i3bar/src/main.c libi3/resolve_tilde.c
-		vsed -i 's/globfree(/g_globfree(/g' i3bar/src/main.c libi3/resolve_tilde.c
-		;;
-	esac
+do_check() {
+	: "Michael disables tests in Debian rules, too"
 }
 post_install() {
 	vlicense LICENSE

From 8f930f05e897331fd5f9a2076c9b9f37b5546844 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 Mar 2021 15:23:06 -0500
Subject: [PATCH 3377/3458] python3-setuptools-rust: update to 0.12.0.

---
 .../patches/preserve_rustflags.patch          | 27 -------------------
 srcpkgs/python3-setuptools-rust/template      |  4 +--
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/python3-setuptools-rust/patches/preserve_rustflags.patch

diff --git a/srcpkgs/python3-setuptools-rust/patches/preserve_rustflags.patch b/srcpkgs/python3-setuptools-rust/patches/preserve_rustflags.patch
deleted file mode 100644
index 00be144d52cb..000000000000
--- a/srcpkgs/python3-setuptools-rust/patches/preserve_rustflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
index 07ad5d97d1bb..5704a4a501f4 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=0.11.6
+version=0.12.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ 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
+checksum=faacca4b85d5f43e9e3836418e1cbf9ed2576a27978b522f3d04513ef052cec5
 
 do_check() {
 	echo "Tests have unpackaged dependencies; skipping"

From 8bb725fc04ee1807f3f181f68ce263c788dd15ae 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, 11 Mar 2021 19:13:26 +0700
Subject: [PATCH 3378/3458] i3status: use system glob(3) on musl

GLOB_TILDE is supported in musl 1.1.24+
---
 srcpkgs/i3status/template | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template
index 9474d13234ba..5ef9f206834f 100644
--- a/srcpkgs/i3status/template
+++ b/srcpkgs/i3status/template
@@ -1,9 +1,9 @@
 # Template file for 'i3status'
 pkgname=i3status
 version=2.13
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-builddir $(vopt_if pulseaudio '' --disable-pulseaudio)"
+configure_args="--disable-builddir $(vopt_enable pulseaudio)"
 hostmakedepends="automake asciidoc pkg-config xmlto"
 makedepends="alsa-lib-devel confuse-devel libcap-devel libnl3-devel
  yajl-devel $(vopt_if pulseaudio pulseaudio-devel)"
@@ -20,25 +20,6 @@ conf_files="/etc/i3status.conf"
 build_options="pulseaudio"
 build_options_default="pulseaudio"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		makedepends+=" libglob-devel"
-		export LIBS="${XBPS_CROSS_BASE}/usr/lib/libglob.a"
-		;;
-esac
-
-post_patch() {
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		vsed \
-		  -e '/include/s,glob.h,libglob/glob.h,g' \
-		  -e '/GLOB_TILDE/s/glob(/g_glob(/g' \
-		  -e 's/globfree(/g_globfree(/g' \
-		  -i src/process_runs.c src/print_cpu_temperature.c i3status.c
-		;;
-	esac
-}
-
 pre_configure() {
 	autoreconf -vfi
 }

From fc1308194d941f05a85acc7973190e2d86addfc1 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, 11 Mar 2021 19:26:24 +0700
Subject: [PATCH 3379/3458] i3-gaps: use system glob(3) on musl

---
 srcpkgs/i3-gaps/template | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index 0f6f3ae61ff3..cf193f45eb6c 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,7 +1,7 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
 version=4.19.1
-revision=1
+revision=2
 wrksrc="i3-${version}"
 build_style=meson
 configure_args="-Dmans=true"
@@ -22,22 +22,6 @@ checksum=97f33544f0a64a325b7b98cd4ad17dcf6f2c8ead1350d378154b76af1798e8fc
 provides="i3-${version}_${revision}"
 replaces="i3>=0"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" libglob-devel";;
-esac
-
-pre_build() {
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		vsed -i "/^common_deps/i glob_dep = cc.find_library('glob')" meson.build
-		vsed -i "/^common_deps/a glob_dep," meson.build
-		vsed -i '/include/s,glob.h,libglob/glob.h,g' i3bar/src/main.c libi3/resolve_tilde.c
-		vsed -i '/GLOB_TILDE/s/glob(/g_glob(/g' i3bar/src/main.c libi3/resolve_tilde.c
-		vsed -i 's/globfree(/g_globfree(/g' i3bar/src/main.c libi3/resolve_tilde.c
-		;;
-	esac
-}
-
 do_check() {
 	:
 }

From 209c44f68f627fcede3bfa101d65dc9a048645ac 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, 25 Feb 2021 19:55:17 +0700
Subject: [PATCH 3380/3458] cmake-bootstrap: update to 3.19.6.

---
 srcpkgs/cmake-bootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 539033d6ffa5..4fa366f36c7d 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.4
+version=3.19.6
 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=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
+checksum=ec87ab67c45f47c4285f204280c5cde48e1c920cfcfed1555b27fb3b1a1d20ba
 conflicts="cmake>=0"
 
 CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"

From 217a5f8af10410305aafbf20feae049bdb24c073 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, 25 Feb 2021 19:42:53 +0700
Subject: [PATCH 3381/3458] cmake: update to 3.19.6.

---
 srcpkgs/cmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index e95cc40abc79..f8aa101d4af3 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.19.4
+version=3.19.6
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -16,7 +16,7 @@ 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=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
+checksum=ec87ab67c45f47c4285f204280c5cde48e1c920cfcfed1555b27fb3b1a1d20ba
 
 export CMAKE_GENERATOR="Unix Makefiles"
 

From 5c55a3f96a1fc29e738efb958b226de23578048d 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, 25 Feb 2021 19:55:28 +0700
Subject: [PATCH 3382/3458] cmake-gui: update to 3.19.6.

---
 srcpkgs/cmake-gui/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 369450ed3cde..56b1e84036ea 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,22 +1,28 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.19.4
+version=3.19.6
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
- -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
+ -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1
+ -DCMake_GUI_DISTRIBUTE_WITH_Qt_LGPL=3"
 hostmakedepends="qt5-devel"
 makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
  ncurses-devel qt5-devel rhash-devel"
-depends="desktop-file-utils shared-mime-info"
+depends="desktop-file-utils shared-mime-info cmake>=${version}"
 checkdepends="pax pkg-config"
 short_desc="Cross-platform, open-source build system - Qt GUI"
 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=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
+checksum=ec87ab67c45f47c4285f204280c5cde48e1c920cfcfed1555b27fb3b1a1d20ba
+
+# XXX: cmake is broken if cmake was built with -GNinja
+# https://bugs.gentoo.org/596460
+export CMAKE_GENERATOR="Unix Makefiles"
+make_cmd=make
 
 do_install() {
 	# We are only interested in cmake-gui.

From ddd1141c0685b1282dec959d07394844d935a955 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 10 Mar 2021 12:29:11 +0300
Subject: [PATCH 3383/3458] topgrade: update to 6.7.0.

---
 srcpkgs/topgrade/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 41240b72fe2e..3c0e833c3c71 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=6.3.1
+version=6.7.0
 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=4527a6e0763e8a9f30bddb83c2ad696a5e13c8c5510e2696c54243c83bbc3f15
+checksum=490cc78234ebb69a986223eb25c6ed4aceb9a09024497857eb6f1960a62f880f

From 0a268328e09f9ef899f72dc206ad32e69f3e6b3f Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 10 Mar 2021 14:02:24 +0100
Subject: [PATCH 3384/3458] s: update to 0.5.15.

---
 srcpkgs/s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 585728ea9fab..7ec0a5f572bb 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,6 +1,6 @@
 # Template file for 's'
 pkgname=s
-version=0.5.14
+version=0.5.15
 revision=3
 build_style=go
 go_import_path=github.com/zquestz/s
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=c32eedf6a4080cbe221c902cf7f63b1668b3927edfc448d963d69ed66c8ec2fb
+checksum=d697da32c050d026983a9696d14dace8926838eef9f491937a4f14215b674c6a
 
 post_install() {
 	vlicense LICENSE

From cf5ae30443c6da1ad0557adc0bd9c33e0de4371e Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 10 Mar 2021 14:07:03 +0100
Subject: [PATCH 3385/3458] shfmt: update to 3.2.4.

---
 srcpkgs/shfmt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index b4e1ec13a27f..63249fd7517d 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
 # Template file for 'shfmt'
 pkgname=shfmt
-version=3.2.2
+version=3.2.4
 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=e990aed5bb167f5cfc6790243ec3cc5e18508a64e8c9609ed5015634ba053b16
+checksum=cab10a689c09689175774c78d7c38e594539c18d4581610bb7927d299d0435d8
 
 post_install() {
 	scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1

From 70e9153bc96be2e79c9d071aa2f00ac324d2912c Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 10 Mar 2021 15:37:11 +0100
Subject: [PATCH 3386/3458] kotlin-bin: update to 1.4.31.

---
 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 c566af52ed52..d4ab87fc7c8e 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.30
+version=1.4.31
 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=7b0aae9dca5ea899ef05dedc0a6fdd6e359451e56ff0dd3354443b3208b31800
+checksum=b50e7016febf7510325d685ae69cc62f49a7ca7f670cb4e0888112e3ec09c6ec
 nostrip=yes
 replaces="kotlin>=0"
 

From 91ea79d66dac47c5693cb8ba278ac92eb24fab45 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Wed, 10 Mar 2021 17:48:26 +0100
Subject: [PATCH 3387/3458] dbeaver: update to 21.0.0.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index bf26a79cd7f0..515ee4040c7e 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=7.3.5
+version=21.0.0
 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=64ea39b57f106d0d37b1df8fce63d4c8f73cfe588eb6ffe9d2a215fb77e82d44
+checksum=3924947380b5da47beb7494a5b82744a1fc183a838f912314f3e6f6089df2fb6
 nopie=true
 
 do_build() {

From 836b4e7c03a7c43e43c0d5896a864aa403d00efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Thu, 11 Mar 2021 11:36:11 +0100
Subject: [PATCH 3388/3458] geos: update to 3.9.1.

---
 srcpkgs/geos/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/geos/template b/srcpkgs/geos/template
index 4926620832e1..2e8a299b9d70 100644
--- a/srcpkgs/geos/template
+++ b/srcpkgs/geos/template
@@ -1,6 +1,6 @@
 # Template file for 'geos'
 pkgname=geos
-version=3.9.0
+version=3.9.1
 revision=1
 build_style=gnu-configure
 short_desc="C++ port of the Java Topology Suite (JTS)"
@@ -8,7 +8,7 @@ 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=bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269
+checksum=7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a
 
 geos-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From 227b5b39dde1d7327b6a3e10d0207466800f3c3e Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Wed, 10 Mar 2021 23:25:55 +0200
Subject: [PATCH 3389/3458] R-cran-data.table: update to 1.14.0.

---
 srcpkgs/R-cran-data.table/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index 35159429af1b..700bb33cadfe 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -1,11 +1,11 @@
 # Template file for 'R-cran-data.table'
 pkgname=R-cran-data.table
-version=1.13.0
-revision=2
+version=1.14.0
+revision=1
 build_style=R-cran
 makedepends="libgomp-devel pkg-config zlib-devel"
 short_desc="Extension of 'data.frame'"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MPL-2.0"
 homepage="https://github.com/Rdatatable/data.table/wiki"
-checksum=f6098eb4a0916333783a118b25387c4cb8bdc1801c562764d4bf4bafc3bb3072
+checksum=13f1de244e7fa90fadfb0be964db5ffb324ca024d5f136feb4578b5daedaeb4d

From 4ff240c55631e0cec2771b66a1b98d757dbd73e6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 10 Mar 2021 21:52:55 +0200
Subject: [PATCH 3390/3458] spdx-licenses-list: update to 3.12.

---
 common/travis/license.lst           | 10 ++++++++++
 srcpkgs/spdx-licenses-list/template |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/travis/license.lst b/common/travis/license.lst
index 73e9bf89e983..1e4156264119 100644
--- a/common/travis/license.lst
+++ b/common/travis/license.lst
@@ -43,11 +43,13 @@ BSD-2-Clause
 BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
 BSD-3-Clause-LBNL
+BSD-3-Clause-Modification
 BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-License
 BSD-3-Clause-No-Nuclear-Warranty
 BSD-3-Clause-Open-MPI
 BSD-3-Clause
+BSD-4-Clause-Shortened
 BSD-4-Clause-UC
 BSD-4-Clause
 BSD-Protection
@@ -63,6 +65,7 @@ BitTorrent-1.1
 BlueOak-1.0.0
 Bootloader-exception
 Borceux
+C-UDA-1.0
 CAL-1.0-Combined-Work-Exception
 CAL-1.0
 CATOSL-1.1
@@ -97,6 +100,7 @@ CC-BY-ND-4.0
 CC-BY-SA-1.0
 CC-BY-SA-2.0-UK
 CC-BY-SA-2.0
+CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0-AT
 CC-BY-SA-3.0
@@ -135,6 +139,7 @@ CrystalStacker
 Cube
 D-FSL-1.0
 DOC
+DRL-1.0
 DSDP
 DigiRule-FOSS-exception
 Dotseqn
@@ -161,9 +166,11 @@ Fair
 Fawkes-Runtime-exception
 Font-exception-2.0
 Frameworx-1.0
+FreeBSD-DOC
 FreeImage
 GCC-exception-2.0
 GCC-exception-3.1
+GD
 GFDL-1.1-invariants-only
 GFDL-1.1-invariants-or-later
 GFDL-1.1-no-invariants-only
@@ -246,6 +253,7 @@ Linux-OpenIB
 Linux-syscall-note
 MIT-0
 MIT-CMU
+MIT-Modern-Variant
 MIT-advertising
 MIT-enna
 MIT-feh
@@ -266,6 +274,7 @@ MulanPSL-1.0
 MulanPSL-2.0
 Multics
 Mup
+NAIST-2003
 NASA-1.3
 NBPL-1.0
 NCGL-UK-2.0
@@ -303,6 +312,7 @@ OFL-1.1-RFN
 OFL-1.1-no-RFN
 OFL-1.1
 OGC-1.0
+OGDL-Taiwan-1.0
 OGL-Canada-2.0
 OGL-UK-1.0
 OGL-UK-2.0
diff --git a/srcpkgs/spdx-licenses-list/template b/srcpkgs/spdx-licenses-list/template
index d95b4309d0f7..2b870110f126 100644
--- a/srcpkgs/spdx-licenses-list/template
+++ b/srcpkgs/spdx-licenses-list/template
@@ -2,7 +2,7 @@
 
 # common/travis/license.lst should be updated in sync with this package
 pkgname=spdx-licenses-list
-version=3.11
+version=3.12
 revision=1
 wrksrc="license-list-data-${version}"
 short_desc="SPDX License List"
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://spdx.org"
 distfiles="https://github.com/spdx/license-list-data/archive/v${version}.tar.gz"
-checksum=2b9dc4afe6da2d93af5099271e6dcb303e158e0c1f03bffd2daaf755f8ffec3d
+checksum=f80e9b6886b50b589040789938b260ab61eafe733d5d72f145a726ad82c569b8
 
 do_install() {
 	vmkdir usr/share/spdx

From a30d44ce45c0428111bbd9d935cc1484fa5bf8b4 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Thu, 11 Mar 2021 14:24:18 -0300
Subject: [PATCH 3391/3458] circleci-cli: update to 0.1.15108.

---
 srcpkgs/circleci-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index fc1be221333e..f0eac722b454 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
-version=0.1.15044
+version=0.1.15108
 revision=1
 build_style=go
 go_import_path=github.com/CircleCI-Public/${pkgname}
@@ -11,7 +11,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="MIT"
 homepage="https://circleci-public.github.io/circleci-cli/"
 distfiles="https://github.com/CircleCI-Public/${pkgname}/archive/v${version}.tar.gz"
-checksum=b3206f5fbb6da7588fa93e8b2e8bd91f3a4f73da8979d517273f6db275680105
+checksum=930bc37c181389cebbbcf9a2b836eb55f8c7ebcb9e853666ce5f4213b084a551
 
 pre_build() {
 	packr2

From 0c92893cc14107f50aff85e231279674aca7aa01 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 10 Mar 2021 14:14:40 -0500
Subject: [PATCH 3392/3458] chromium: update to 89.0.4389.82.

- Built for x86_64, x86_64-musl, i686.
- Tested on x86_64.

- Use pipewire 0.3 (default in 90).
- Remove Google API client id and secret.
- Video acceleration is now a feature that must be enabled in
  chrome://flags.

changes by q66: updated ppc64le patches

Closes: https://github.com/void-linux/void-packages/pull/29205
Closes: https://github.com/void-linux/void-packages/pull/29384
---
 .../files/musl-patches/musl-fixes.patch       |  22 +-
 .../chromium-87-openscreen-include.patch      |  25 -
 .../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 --
 ...chromium-89-AXTreeSerializer-include.patch |  25 +
 ...-add-dependency-on-opus-in-webcodecs.patch |  43 ++
 .../patches/chromium-89-dawn-include.patch    |  28 ++
 .../patches/chromium-89-quiche-dcheck.patch   |  29 ++
 .../patches/chromium-89-skia-CropRect.patch   |  38 ++
 ...mium-89-x11-ozone-fix-two-edge-cases.patch | 135 +++++
 ...remove-unsupported-compiler-warnings.patch |  26 -
 .../chromium/patches/sandbox-membarrier.patch |  50 --
 .../patches/xxx-ppc64le-support.patch         | 469 +++++++++---------
 srcpkgs/chromium/template                     |  15 +-
 20 files changed, 540 insertions(+), 581 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-88-StringPool-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-88-ityp-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-89-AXTreeSerializer-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-89-dawn-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-89-quiche-dcheck.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-89-skia-CropRect.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
 delete mode 100644 srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch

diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
index a7832ff32e8d..aec60fd62092 100644
--- a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
+++ b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
@@ -75,24 +75,24 @@
  #if HAVE_UNISTD_H
  #include <unistd.h>
 diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -39,7 +39,9 @@
- #endif  // defined(OS_ANDROID) && defined(__arm__)
- 
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2021-03-10 07:23:00.145810088 -0500
++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc	2021-03-10 10:57:19.405962671 -0500
+@@ -55,7 +55,9 @@
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+ #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if defined(__GLIBC__)
  #include <gnu/libc-version.h>
 +#endif
  
  #include "base/linux_util.h"
  #include "base/strings/string_split.h"
-@@ -295,7 +297,7 @@ void RecordLinuxDistro() {
- #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
- 
+@@ -316,7 +318,7 @@
  void RecordLinuxGlibcVersion() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(__GLIBC__) && !defined(OS_CHROMEOS)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(__GLIBC__) || BUILDFLAG(IS_CHROMEOS_LACROS)
    base::Version version(gnu_get_libc_version());
  
    UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
diff --git a/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch b/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
deleted file mode 100644
index 03ae0e9eda7e..000000000000
--- a/srcpkgs/chromium/patches/chromium-87-openscreen-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c0af4cabb7490db473cd2c28f069956974a4d98 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 2 Oct 2020 12:11:58 +0000
-Subject: [PATCH] IWYU: uint8_t is defined in stdint.h
-
----
- third_party/openscreen/src/util/crypto/random_bytes.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/openscreen/src/util/crypto/random_bytes.h b/third_party/openscreen/src/util/crypto/random_bytes.h
-index 3cb2fa8..025b52c 100644
---- third_party/openscreen/src/util/crypto/random_bytes.h
-+++ third_party/openscreen/src/util/crypto/random_bytes.h
-@@ -7,6 +7,8 @@
- 
- #include <array>
- 
-+#include <stdint.h>
-+
- namespace openscreen {
- 
- std::array<uint8_t, 16> GenerateRandomBytes16();
--- 
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch b/srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch
deleted file mode 100644
index 547810989206..000000000000
--- a/srcpkgs/chromium/patches/chromium-88-AXTreeFormatter-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 0b26a60a36e7..000000000000
--- a/srcpkgs/chromium/patches/chromium-88-BookmarkModelObserver-include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index aa1c52e0b7e2..000000000000
--- a/srcpkgs/chromium/patches/chromium-88-CompositorFrameReporter-dcheck.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index e55bbae2ece7..000000000000
--- a/srcpkgs/chromium/patches/chromium-88-StringPool-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 3eb1537d8012..000000000000
--- a/srcpkgs/chromium/patches/chromium-88-federated_learning-include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 38a11423b2de..000000000000
--- a/srcpkgs/chromium/patches/chromium-88-ideographicSpaceCharacter.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index c54b6fffd541..000000000000
--- a/srcpkgs/chromium/patches/chromium-88-ityp-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index e4161af45c7f..000000000000
--- a/srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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/chromium-89-AXTreeSerializer-include.patch b/srcpkgs/chromium/patches/chromium-89-AXTreeSerializer-include.patch
new file mode 100644
index 000000000000..7372e44d1547
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-89-AXTreeSerializer-include.patch
@@ -0,0 +1,25 @@
+From c06ddc4935bf1394812c011ce5d93898ccc8a53a Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 09 Feb 2021 19:22:57 +0000
+Subject: [PATCH] IWYU: add ctime for std::time
+
+Bug: None
+Change-Id: I8bdae43209984242b9f5e538d74ece4409b65e3c
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679610
+Reviewed-by: Katie Dektar <katie@chromium.org>
+Commit-Queue: Katie Dektar <katie@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#852287}
+---
+
+diff --git a/ui/accessibility/ax_tree_serializer.h b/ui/accessibility/ax_tree_serializer.h
+index ddbbdcd..1790e3b 100644
+--- ui/accessibility/ax_tree_serializer.h
++++ ui/accessibility/ax_tree_serializer.h
+@@ -8,6 +8,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
++#include <ctime>
+ #include <ostream>
+ #include <unordered_map>
+ #include <unordered_set>
diff --git a/srcpkgs/chromium/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch b/srcpkgs/chromium/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch
new file mode 100644
index 000000000000..c25897791d95
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch
@@ -0,0 +1,43 @@
+From b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 27 Jan 2021 20:31:51 +0000
+Subject: [PATCH] add dependency on opus in webcodecs
+
+webcodecs uses opus, but dependency is missing. With unbundled
+opus library build fails, because include path is incomplete.
+
+Bug: 1169758
+Change-Id: I01369364327461196a81002479636cf45017669a
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2644623
+Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
+Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#847754}
+---
+ third_party/blink/renderer/modules/webcodecs/BUILD.gn | 1 +
+ third_party/blink/renderer/modules/webcodecs/DEPS     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/third_party/blink/renderer/modules/webcodecs/BUILD.gn
+index fdf4ca0fafc72..01a7bf809ffca 100644
+--- third_party/blink/renderer/modules/webcodecs/BUILD.gn
++++ third_party/blink/renderer/modules/webcodecs/BUILD.gn
+@@ -65,6 +65,7 @@ blink_modules_sources("webcodecs") {
+     "//media/mojo/clients",
+     "//media/mojo/mojom",
+     "//third_party/libyuv:libyuv",
++    "//third_party/opus",
+   ]
+   if (media_use_openh264) {
+     deps += [ "//third_party/openh264:encoder" ]
+diff --git a/third_party/blink/renderer/modules/webcodecs/DEPS b/third_party/blink/renderer/modules/webcodecs/DEPS
+index b8dd596da8caf..ea1919d12205a 100644
+--- third_party/blink/renderer/modules/webcodecs/DEPS
++++ third_party/blink/renderer/modules/webcodecs/DEPS
+@@ -19,6 +19,7 @@ include_rules = [
+ 
+     "+third_party/libyuv",
+     "+third_party/openh264",
++    "+third_party/opus",
+ 
+     "+ui/gfx/color_space.h",
+     "+ui/gfx/geometry/rect.h",
diff --git a/srcpkgs/chromium/patches/chromium-89-dawn-include.patch b/srcpkgs/chromium/patches/chromium-89-dawn-include.patch
new file mode 100644
index 000000000000..9876ba20eb51
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-89-dawn-include.patch
@@ -0,0 +1,28 @@
+From 5a56bfe8d281250a1deee0d116a9fcde65b9c29a Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 15 Jan 2021 18:37:05 +0000
+Subject: [PATCH] IWYU: add various missing includes
+
+std::weak_ptr and std::shared_ptr require map
+*int*_t types require cstdint
+---
+ third_party/dawn/src/dawn_wire/client/Device.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/dawn/src/dawn_wire/client/Device.h b/third_party/dawn/src/dawn_wire/client/Device.h
+index 3f16700..1082549 100644
+--- third_party/dawn/src/dawn_wire/client/Device.h
++++ third_party/dawn/src/dawn_wire/client/Device.h
+@@ -22,7 +22,9 @@
+ #include "dawn_wire/client/ApiObjects_autogen.h"
+ #include "dawn_wire/client/ObjectBase.h"
+ 
++#include <cstdint>
+ #include <map>
++#include <memory>
+ 
+ namespace dawn_wire { namespace client {
+ 
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-89-quiche-dcheck.patch b/srcpkgs/chromium/patches/chromium-89-quiche-dcheck.patch
new file mode 100644
index 000000000000..b2f164fac9ba
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-89-quiche-dcheck.patch
@@ -0,0 +1,29 @@
+From 7cd4eab0bfca6192f14d6143410e1ae774eb1c29 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 31 Dec 2020 11:57:22 +0000
+Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual
+ pointer
+
+DCHECK_NE comparison requires CheckOpValueStr to be defined for the
+type, or providing an output stream operator. A unique_ptr does not
+provide any. USE DCHECK instead.
+---
+ net/third_party/quiche/src/quic/core/quic_path_validator.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/third_party/quiche/src/quic/core/quic_path_validator.cc b/net/third_party/quiche/src/quic/core/quic_path_validator.cc
+index 0722216..fb2aeaf 100644
+--- net/third_party/quiche/src/quic/core/quic_path_validator.cc
++++ net/third_party/quiche/src/quic/core/quic_path_validator.cc
+@@ -68,7 +68,7 @@ void QuicPathValidator::OnPathResponse(const QuicPathFrameBuffer& probing_data,
+ void QuicPathValidator::StartPathValidation(
+     std::unique_ptr<QuicPathValidationContext> context,
+     std::unique_ptr<ResultDelegate> result_delegate) {
+-  DCHECK_NE(nullptr, context);
++  DCHECK(context);
+   QUIC_DLOG(INFO) << "Start validating path " << *context
+                   << " via writer: " << context->WriterToUse();
+   if (path_context_ != nullptr) {
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-89-skia-CropRect.patch b/srcpkgs/chromium/patches/chromium-89-skia-CropRect.patch
new file mode 100644
index 000000000000..9712c92658f6
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-89-skia-CropRect.patch
@@ -0,0 +1,38 @@
+diff --git a/third_party/skia/include/effects/SkImageFilters.h b/third_party/skia/include/effects/SkImageFilters.h
+index 04cce0a..d06b007 100644
+--- third_party/skia/include/effects/SkImageFilters.h
++++ third_party/skia/include/effects/SkImageFilters.h
+@@ -23,6 +23,9 @@ class SkColorFilter;
+ class SkPaint;
+ class SkRegion;
+ 
++constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
++                                SK_ScalarInfinity, SK_ScalarInfinity};
++
+ // A set of factory functions providing useful SkImageFilter effects. For image filters that take an
+ // input filter, providing nullptr means it will automatically use the dynamic source image. This
+ // source depends on how the filter is applied, but is either the contents of a saved layer when
+@@ -33,8 +36,6 @@ public:
+     // to those types as a crop rect for the image filter factories. It's not intended to be used
+     // directly.
+     struct CropRect {
+-        static constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
+-                                               SK_ScalarInfinity, SK_ScalarInfinity};
+         CropRect() : fCropRect(kNoCropRect) {}
+         // Intentionally not explicit so callers don't have to use this type but can use SkIRect or
+         // SkRect as desired.
+diff --git a/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp b/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
+index 5290b00..fb97fc1 100644
+--- third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
++++ third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
+@@ -47,10 +47,6 @@ static SkImageFilter::CropRect to_legacy_crop_rect(const SkImageFilters::CropRec
+                                          : SkImageFilter::CropRect(SkRect::MakeEmpty(), 0x0);
+ }
+ 
+-// Allow kNoCropRect to be referenced (for certain builds, e.g. macOS libFuzzer chromium target,
+-// see crbug.com/1139725)
+-constexpr SkRect SkImageFilters::CropRect::kNoCropRect;
+-
+ void SkImageFilters::RegisterFlattenables() {
+     SkAlphaThresholdFilter::RegisterFlattenables();
+     SkArithmeticImageFilter::RegisterFlattenables();
diff --git a/srcpkgs/chromium/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch b/srcpkgs/chromium/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
new file mode 100644
index 000000000000..7fb586da169a
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
@@ -0,0 +1,135 @@
+From 5e3a738b1204941aab9f15c0eb3d06e20fefd96e Mon Sep 17 00:00:00 2001
+From: Scott Violet <sky@chromium.org>
+Date: Mon, 8 Mar 2021 21:07:39 +0000
+Subject: [PATCH] x11/ozone: fix two edge cases
+
+WindowTreeHost::OnHostMovedInPixels() may trigger a nested message
+loop (tab dragging), which when the stack unravels means this may
+be deleted. This adds an early out if this happens.
+
+X11WholeScreenMoveLoop has a similar issue, in so far as notifying
+the delegate may delete this.
+
+BUG=1185482
+TEST=WindowTreeHostPlatform.DeleteHostFromOnHostMovedInPixels
+
+Change-Id: Ieca1c90b3e4358da50b332abe2941fdbb50c5c25
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2743555
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Commit-Queue: Scott Violet <sky@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#860852}
+---
+ ui/aura/window_tree_host_platform.cc          | 10 ++++-
+ ui/aura/window_tree_host_platform_unittest.cc | 40 ++++++++++++++++++-
+ ui/base/x/x11_whole_screen_move_loop.cc       |  4 ++
+ 3 files changed, 51 insertions(+), 3 deletions(-)
+
+diff --git a/ui/aura/window_tree_host_platform.cc b/ui/aura/window_tree_host_platform.cc
+index ce8395fe07..7589542026 100644
+--- ui/aura/window_tree_host_platform.cc
++++ ui/aura/window_tree_host_platform.cc
+@@ -214,13 +214,21 @@ void WindowTreeHostPlatform::OnBoundsChanged(const gfx::Rect& new_bounds) {
+   float current_scale = compositor()->device_scale_factor();
+   float new_scale = ui::GetScaleFactorForNativeView(window());
+   gfx::Rect old_bounds = bounds_in_pixels_;
++  auto weak_ref = GetWeakPtr();
+   bounds_in_pixels_ = new_bounds;
+-  if (bounds_in_pixels_.origin() != old_bounds.origin())
++  if (bounds_in_pixels_.origin() != old_bounds.origin()) {
+     OnHostMovedInPixels(bounds_in_pixels_.origin());
++    // Changing the bounds may destroy this.
++    if (!weak_ref)
++      return;
++  }
+   if (bounds_in_pixels_.size() != old_bounds.size() ||
+       current_scale != new_scale) {
+     pending_size_ = gfx::Size();
+     OnHostResizedInPixels(bounds_in_pixels_.size());
++    // Changing the size may destroy this.
++    if (!weak_ref)
++      return;
+   }
+   DCHECK_GT(on_bounds_changed_recursion_depth_, 0);
+   if (--on_bounds_changed_recursion_depth_ == 0) {
+diff --git a/ui/aura/window_tree_host_platform_unittest.cc b/ui/aura/window_tree_host_platform_unittest.cc
+index eda14e2f0c..4de039c88a 100644
+--- ui/aura/window_tree_host_platform_unittest.cc
++++ ui/aura/window_tree_host_platform_unittest.cc
+@@ -34,7 +34,7 @@ class TestWindowTreeHost : public WindowTreeHostPlatform {
+ // OnHostWill/DidProcessBoundsChange. Additionally, this triggers a bounds
+ // change from within OnHostResized(). Such a scenario happens in production
+ // code.
+-class TestWindowTreeHostObserver : public aura::WindowTreeHostObserver {
++class TestWindowTreeHostObserver : public WindowTreeHostObserver {
+  public:
+   TestWindowTreeHostObserver(WindowTreeHostPlatform* host,
+                              ui::PlatformWindow* platform_window)
+@@ -51,7 +51,7 @@ class TestWindowTreeHostObserver : public aura::WindowTreeHostObserver {
+     return on_host_will_process_bounds_change_count_;
+   }
+ 
+-  // aura::WindowTreeHostObserver:
++  // WindowTreeHostObserver:
+   void OnHostResized(WindowTreeHost* host) override {
+     if (!should_change_bounds_in_on_resized_)
+       return;
+@@ -92,5 +92,41 @@ TEST_F(WindowTreeHostPlatformTest, HostWillProcessBoundsChangeRecursion) {
+   EXPECT_EQ(1, observer.on_host_will_process_bounds_change_count());
+ }
+ 
++// Deletes WindowTreeHostPlatform from OnHostMovedInPixels().
++class DeleteHostWindowTreeHostObserver : public WindowTreeHostObserver {
++ public:
++  explicit DeleteHostWindowTreeHostObserver(
++      std::unique_ptr<TestWindowTreeHost> host)
++      : host_(std::move(host)) {
++    host_->AddObserver(this);
++  }
++  ~DeleteHostWindowTreeHostObserver() override = default;
++
++  TestWindowTreeHost* host() { return host_.get(); }
++
++  // WindowTreeHostObserver:
++  void OnHostMovedInPixels(WindowTreeHost* host,
++                           const gfx::Point& new_origin_in_pixels) override {
++    host_->RemoveObserver(this);
++    host_.reset();
++  }
++
++ private:
++  std::unique_ptr<TestWindowTreeHost> host_;
++
++  DISALLOW_COPY_AND_ASSIGN(DeleteHostWindowTreeHostObserver);
++};
++
++// Verifies WindowTreeHostPlatform can be safely deleted when calling
++// OnHostMovedInPixels().
++// Regression test for https://crbug.com/1185482
++TEST_F(WindowTreeHostPlatformTest, DeleteHostFromOnHostMovedInPixels) {
++  std::unique_ptr<TestWindowTreeHost> host =
++      std::make_unique<TestWindowTreeHost>();
++  DeleteHostWindowTreeHostObserver observer(std::move(host));
++  observer.host()->SetBoundsInPixels(gfx::Rect(1, 2, 3, 4));
++  EXPECT_EQ(nullptr, observer.host());
++}
++
+ }  // namespace
+ }  // namespace aura
+diff --git a/ui/base/x/x11_whole_screen_move_loop.cc b/ui/base/x/x11_whole_screen_move_loop.cc
+index 5ed215db66..db678799db 100644
+--- ui/base/x/x11_whole_screen_move_loop.cc
++++ ui/base/x/x11_whole_screen_move_loop.cc
+@@ -78,9 +78,13 @@ X11WholeScreenMoveLoop::~X11WholeScreenMoveLoop() {
+ void X11WholeScreenMoveLoop::DispatchMouseMovement() {
+   if (!last_motion_in_screen_)
+     return;
++  auto weak_ref = weak_factory_.GetWeakPtr();
+   delegate_->OnMouseMovement(last_motion_in_screen_->root_location(),
+                              last_motion_in_screen_->flags(),
+                              last_motion_in_screen_->time_stamp());
++  // The delegate may delete this during dispatch.
++  if (!weak_ref)
++    return;
+   last_motion_in_screen_.reset();
+ }
+ 
diff --git a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
deleted file mode 100644
index 3016b065212d..000000000000
--- a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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",
--
--          # TODO(https://crbug.com/1050281): Clean up, enable.
--          "-Wno-non-c-typedef-for-linkage",
-         ]
- 
-         cflags_c += [
-@@ -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" ]
--        } else {
--          # TODO(https://crbug.com/1049569): Remove after Clang 87b235db.
--          cflags += [ "-Wno-max-tokens" ]
--        }
-       }
-     }
-   }
diff --git a/srcpkgs/chromium/patches/sandbox-membarrier.patch b/srcpkgs/chromium/patches/sandbox-membarrier.patch
index a31a9f6a5e99..86ca16fc2d70 100644
--- a/srcpkgs/chromium/patches/sandbox-membarrier.patch
+++ b/srcpkgs/chromium/patches/sandbox-membarrier.patch
@@ -1,53 +1,3 @@
---- 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_
-
---- 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)
-
---- 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_
- 
---- 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_
- 
 --- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 +++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 @@ -370,6 +370,7 @@
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 805755c21258..389ac3b7aa22 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -1,6 +1,6 @@
-commit e7944c162ca13b2c30b180c06f917f45643b8cca
-Author: q66 <daniel@octaforge.org>
-Date:   Tue Aug 4 19:57:48 2020 +0200
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
 
     ppc64le support
 
@@ -20,10 +20,10 @@ index 286a92a27..ec36a85d3 100755
    src_dir = os.path.dirname(script_dir)
    nacl_dir = os.path.join(src_dir, 'native_client')
 diff --git chrome/installer/linux/BUILD.gn chrome/installer/linux/BUILD.gn
-index b101b0cb2..9fd5a7617 100644
+index 35f01d0a4..28f2e7475 100644
 --- chrome/installer/linux/BUILD.gn
 +++ chrome/installer/linux/BUILD.gn
-@@ -92,8 +92,6 @@ packaging_files = packaging_files_binaries + [
+@@ -94,8 +94,6 @@ packaging_files = packaging_files_binaries + [
                      "$root_out_dir/xdg-mime",
                      "$root_out_dir/xdg-settings",
                      "$root_out_dir/locales/en-US.pak",
@@ -32,7 +32,7 @@ index b101b0cb2..9fd5a7617 100644
                    ]
  
  action_foreach("calculate_deb_dependencies") {
-@@ -329,7 +327,6 @@ group("installer_deps") {
+@@ -315,7 +313,6 @@ group("installer_deps") {
      ":theme_files",
      "//chrome",
      "//chrome:packed_resources",
@@ -41,11 +41,11 @@ index b101b0cb2..9fd5a7617 100644
      "//third_party/crashpad/crashpad/handler:crashpad_handler",
    ]
 diff --git sandbox/features.gni sandbox/features.gni
-index 09280d35f..42514157f 100644
+index db30ae6d6..9dc09bf53 100644
 --- sandbox/features.gni
 +++ sandbox/features.gni
-@@ -11,6 +11,7 @@ import("//build/config/nacl/config.gni")
- use_seccomp_bpf = (is_linux || is_android) &&
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
                    (current_cpu == "x86" || current_cpu == "x64" ||
                     current_cpu == "arm" || current_cpu == "arm64" ||
 -                   current_cpu == "mipsel" || current_cpu == "mips64el")
@@ -53,11 +53,12 @@ index 09280d35f..42514157f 100644
 +                   current_cpu == "ppc64")
  
  use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
 diff --git sandbox/linux/BUILD.gn sandbox/linux/BUILD.gn
-index c27351f9a..9141e1239 100644
+index e9a94b461..cca1a5da5 100644
 --- sandbox/linux/BUILD.gn
 +++ sandbox/linux/BUILD.gn
-@@ -407,6 +407,8 @@ component("sandbox_services") {
+@@ -427,6 +427,8 @@ component("sandbox_services") {
  
  source_set("sandbox_services_headers") {
    sources = [
@@ -151,7 +152,7 @@ index 1a407b952..a6aec544e 100644
  #error Unsupported target platform
  
 diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-index a6d2c0dfb..37fdc179a 100644
+index 6a1ec2389..f20c582dd 100644
 --- sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
 +++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
 @@ -88,7 +88,8 @@ bool IsBaselinePolicyWatched(int sysno) {
@@ -164,7 +165,7 @@ index a6d2c0dfb..37fdc179a 100644
           SyscallSets::IsSocketCall(sysno) ||
  #endif
  #if defined(__arm__)
-@@ -210,7 +211,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
+@@ -227,7 +228,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
    }
  
  #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -173,7 +174,7 @@ index a6d2c0dfb..37fdc179a 100644
    if (sysno == __NR_mmap)
      return RestrictMmapFlags();
  #endif
-@@ -228,7 +229,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
+@@ -245,7 +246,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
      return RestrictPrctl();
  
  #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
@@ -182,7 +183,7 @@ index a6d2c0dfb..37fdc179a 100644
    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,
+@@ -285,7 +286,8 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
    }
  
  #if defined(__i386__) || \
@@ -193,22 +194,20 @@ index a6d2c0dfb..37fdc179a 100644
      return RestrictSocketcallCommand();
  #endif
 diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-index fc36187c9..1affc9189 100644
+index 01c046dda..7e5a6be82 100644
 --- sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
 +++ sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-@@ -291,8 +291,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
- #if !defined(__aarch64__)
+@@ -302,7 +302,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
  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 sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index f51915edc..ca2f4f106 100644
+index 2a97d3916..8e81aa6cf 100644
 --- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 +++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 @@ -40,7 +40,8 @@
@@ -233,7 +232,7 @@ index f51915edc..ca2f4f106 100644
  #if defined(OS_ANDROID)
  
  #if !defined(F_DUPFD_CLOEXEC)
-@@ -98,6 +104,15 @@
+@@ -98,6 +104,15 @@ inline bool IsArchitectureMips() {
  #endif
  }
  
@@ -249,7 +248,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
-@@ -239,6 +254,8 @@
+@@ -239,6 +254,8 @@ ResultExpr RestrictFcntlCommands() {
    uint64_t kOLargeFileFlag = O_LARGEFILE;
    if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
      kOLargeFileFlag = 0100000;
@@ -258,7 +257,7 @@ index f51915edc..ca2f4f106 100644
  
    const Arg<int> cmd(1);
    const Arg<long> long_arg(2);
-@@ -253,14 +270,23 @@
+@@ -253,14 +270,23 @@ ResultExpr RestrictFcntlCommands() {
                F_SETLKW,
                F_GETLK,
                F_DUPFD,
@@ -285,7 +284,7 @@ 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
-@@ -413,7 +439,7 @@
+@@ -413,7 +439,7 @@ ResultExpr RestrictPtrace() {
  #endif
    return Switch(request)
        .CASES((
@@ -294,7 +293,6 @@ index f51915edc..ca2f4f106 100644
                   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
@@ -309,7 +307,7 @@ index ba4289f05..9a4d5ab2d 100644
  // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
  SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
 diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index d3693fd78..d492cf94b 100644
+index 642df7207..34f47eb73 100644
 --- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 +++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 @@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
@@ -322,7 +320,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_time:
  #endif
        return true;
-@@ -41,12 +42,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
+@@ -45,12 +46,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
      case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
      case __NR_clock_settime:    // Privileged.
  #if defined(__i386__) || \
@@ -339,7 +337,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_stime:
  #endif
      default:
-@@ -112,7 +115,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
+@@ -116,7 +119,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
      case __NR_faccessat:  // EPERM not a valid errno.
      case __NR_fchmodat:
      case __NR_fchownat:  // Should be called chownat ?
@@ -348,7 +346,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
  #elif defined(__i386__) || defined(__arm__) || \
      (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-@@ -131,7 +134,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
+@@ -135,7 +138,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
      case __NR_memfd_create:
      case __NR_mkdirat:
      case __NR_mknodat:
@@ -357,7 +355,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_oldlstat:
      case __NR_oldstat:
  #endif
-@@ -145,7 +148,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
+@@ -149,7 +152,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
  #endif
      case __NR_statfs:  // EPERM not a valid errno.
  #if defined(__i386__) || defined(__arm__) || \
@@ -367,7 +365,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_statfs64:
  #endif
      case __NR_symlinkat:
-@@ -155,7 +159,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
+@@ -159,7 +163,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
      case __NR_truncate64:
  #endif
      case __NR_unlinkat:
@@ -377,7 +375,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_utime:
  #endif
      case __NR_utimensat:  // New.
-@@ -174,7 +179,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
+@@ -181,7 +186,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
  #endif
        return true;
  // TODO(jln): these should be denied gracefully as well (moved below).
@@ -387,7 +385,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_fadvise64:  // EPERM not a valid errno.
  #endif
  #if defined(__i386__)
-@@ -187,11 +193,12 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
+@@ -194,11 +200,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__) || \
@@ -402,7 +400,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_oldfstat:
  #endif
  #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-@@ -199,6 +206,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
+@@ -206,6 +213,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.
@@ -411,7 +409,7 @@ index d3693fd78..d492cf94b 100644
  #endif
      default:
        return false;
-@@ -224,7 +233,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) {
+@@ -231,7 +240,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) {
  #endif
      case __NR_getdents64:  // EPERM not a valid errno.
  #if defined(__i386__) || \
@@ -421,7 +419,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_readdir:
  #endif
        return true;
-@@ -265,7 +275,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) {
+@@ -272,7 +282,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) {
  bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
    switch (sysno) {
      case __NR_capset:
@@ -430,7 +428,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_ioperm:  // Intel privilege.
      case __NR_iopl:    // Intel privilege.
  #endif
-@@ -316,7 +326,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
+@@ -323,7 +333,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
      case __NR_rt_sigreturn:
      case __NR_rt_sigtimedwait:
  #if defined(__i386__) || defined(__arm__) || \
@@ -440,7 +438,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_sigaction:
      case __NR_sigprocmask:
      case __NR_sigreturn:
-@@ -332,7 +343,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
+@@ -339,7 +350,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
  #endif
      case __NR_signalfd4:
  #if defined(__i386__) || defined(__arm__) || \
@@ -450,7 +448,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_sigpending:
      case __NR_sigsuspend:
  #endif
-@@ -356,7 +368,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) {
+@@ -363,7 +375,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) {
  #endif
      case __NR_dup3:
  #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
@@ -459,7 +457,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_shutdown:
  #endif
        return true;
-@@ -390,7 +402,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+@@ -397,7 +409,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
      case __NR_membarrier:
      case __NR_wait4:
      case __NR_waitid:
@@ -468,7 +466,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_waitpid:
  #endif
        return true;
-@@ -407,7 +419,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+@@ -414,7 +426,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
  #endif
      case __NR_set_tid_address:
      case __NR_unshare:
@@ -477,7 +475,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_vfork:
  #endif
      default:
-@@ -456,7 +468,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
+@@ -463,7 +475,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
        return true;
      default:
  #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
@@ -486,7 +484,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_socketpair:  // We will want to inspect its argument.
  #endif
        return false;
-@@ -466,7 +478,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
+@@ -473,7 +485,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
  bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
    switch (sysno) {
  #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
@@ -495,7 +493,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_accept:
      case __NR_accept4:
      case __NR_bind:
-@@ -481,7 +493,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+@@ -488,7 +500,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
  }
  
  #if defined(__i386__) || \
@@ -505,7 +503,7 @@ index d3693fd78..d492cf94b 100644
  // Big multiplexing system call for sockets.
  bool SyscallSets::IsSocketCall(int sysno) {
    switch (sysno) {
-@@ -495,7 +508,8 @@ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -502,7 +515,8 @@ bool SyscallSets::IsSocketCall(int sysno) {
  }
  #endif
  
@@ -515,7 +513,7 @@ index d3693fd78..d492cf94b 100644
  bool SyscallSets::IsNetworkSocketInformation(int sysno) {
    switch (sysno) {
      case __NR_getpeername:
-@@ -520,7 +534,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
+@@ -527,7 +541,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
      case __NR_mincore:
      case __NR_mlockall:
  #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -524,7 +522,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_mmap:
  #endif
  #if defined(__i386__) || defined(__arm__) || \
-@@ -550,7 +564,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+@@ -557,7 +571,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
    switch (sysno) {
      case __NR_lseek:
  #if defined(__i386__) || defined(__arm__) || \
@@ -534,7 +532,7 @@ index d3693fd78..d492cf94b 100644
      case __NR__llseek:
  #endif
  #if !defined(__aarch64__)
-@@ -562,26 +577,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+@@ -569,26 +584,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
      case __NR_readv:
      case __NR_pread64:
  #if defined(__arm__) || \
@@ -569,7 +567,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_sendmsg:  // Could specify destination.
      case __NR_sendto:   // Could specify destination.
  #endif
-@@ -638,7 +655,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
+@@ -645,7 +662,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
        return true;
      case __NR_getpriority:
  #if defined(__i386__) || defined(__arm__) || \
@@ -579,7 +577,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_nice:
  #endif
      case __NR_setpriority:
-@@ -650,7 +668,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
+@@ -657,7 +675,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
  bool SyscallSets::IsAdminOperation(int sysno) {
    switch (sysno) {
  #if defined(__i386__) || defined(__arm__) || \
@@ -589,7 +587,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_bdflush:
  #endif
      case __NR_kexec_load:
-@@ -666,7 +685,8 @@ bool SyscallSets::IsAdminOperation(int sysno) {
+@@ -673,7 +692,8 @@ bool SyscallSets::IsAdminOperation(int sysno) {
  
  bool SyscallSets::IsKernelModule(int sysno) {
    switch (sysno) {
@@ -599,7 +597,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_create_module:
      case __NR_get_kernel_syms:  // Should ENOSYS.
      case __NR_query_module:
-@@ -699,7 +719,8 @@ bool SyscallSets::IsFsControl(int sysno) {
+@@ -706,7 +726,8 @@ bool SyscallSets::IsFsControl(int sysno) {
      case __NR_swapoff:
      case __NR_swapon:
  #if defined(__i386__) || \
@@ -609,7 +607,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_umount:
  #endif
      case __NR_umount2:
-@@ -715,7 +736,7 @@ bool SyscallSets::IsNuma(int sysno) {
+@@ -722,7 +743,7 @@ bool SyscallSets::IsNuma(int sysno) {
      case __NR_getcpu:
      case __NR_mbind:
  #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -618,7 +616,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_migrate_pages:
  #endif
      case __NR_move_pages:
-@@ -744,14 +765,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) {
+@@ -751,14 +772,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) {
    switch (sysno) {
      case __NR_acct:  // Privileged.
  #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -637,7 +635,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_ulimit:
  #endif
      case __NR_getrusage:
-@@ -785,7 +807,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) {
+@@ -792,7 +814,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) {
  #endif
      case __NR_sysinfo:
      case __NR_uname:
@@ -646,7 +644,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_olduname:
      case __NR_oldolduname:
  #endif
-@@ -847,8 +869,16 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) {
+@@ -854,8 +876,16 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) {
  }
  #endif
  
@@ -664,7 +662,7 @@ index d3693fd78..d492cf94b 100644
      (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
  // These give a lot of ambient authority and bypass the setuid sandbox.
  bool SyscallSets::IsSystemVSharedMemory(int sysno) {
-@@ -880,7 +910,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) {
+@@ -887,7 +917,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) {
  #endif
  
  #if defined(__i386__) || \
@@ -674,7 +672,7 @@ index d3693fd78..d492cf94b 100644
  // Big system V multiplexing system call.
  bool SyscallSets::IsSystemVIpc(int sysno) {
    switch (sysno) {
-@@ -900,7 +931,8 @@ bool SyscallSets::IsAnySystemV(int sysno) {
+@@ -907,7 +938,8 @@ bool SyscallSets::IsAnySystemV(int sysno) {
    return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
           IsSystemVSharedMemory(sysno);
  #elif defined(__i386__) || \
@@ -684,7 +682,7 @@ index d3693fd78..d492cf94b 100644
    return IsSystemVIpc(sysno);
  #endif
  }
-@@ -953,7 +985,8 @@ bool SyscallSets::IsFaNotify(int sysno) {
+@@ -960,7 +992,8 @@ bool SyscallSets::IsFaNotify(int sysno) {
  bool SyscallSets::IsTimer(int sysno) {
    switch (sysno) {
      case __NR_getitimer:
@@ -694,7 +692,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_alarm:
  #endif
      case __NR_setitimer:
-@@ -1012,18 +1045,22 @@ bool SyscallSets::IsMisc(int sysno) {
+@@ -1019,18 +1052,22 @@ bool SyscallSets::IsMisc(int sysno) {
      case __NR_syncfs:
      case __NR_vhangup:
  // The system calls below are not implemented.
@@ -721,7 +719,7 @@ index d3693fd78..d492cf94b 100644
      case __NR_gtty:
      case __NR_idle:
      case __NR_lock:
-@@ -1031,20 +1068,22 @@ bool SyscallSets::IsMisc(int sysno) {
+@@ -1038,20 +1075,22 @@ bool SyscallSets::IsMisc(int sysno) {
      case __NR_prof:
      case __NR_profil:
  #endif
@@ -889,7 +887,7 @@ index e47e98bf5..d53a7ff56 100644
    SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
  }
 diff --git sandbox/linux/seccomp-bpf/trap.cc sandbox/linux/seccomp-bpf/trap.cc
-index 9884be8bb..98e4371aa 100644
+index f5b86a73a..5e6c4a068 100644
 --- sandbox/linux/seccomp-bpf/trap.cc
 +++ sandbox/linux/seccomp-bpf/trap.cc
 @@ -232,6 +232,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
@@ -940,23 +938,23 @@ index fcfd2aa12..f6eb32fb7 100644
    return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
  #endif
 diff --git sandbox/linux/syscall_broker/broker_process.cc sandbox/linux/syscall_broker/broker_process.cc
-index 8321d2379..7e5ad1de3 100644
+index d72c9d238..77f1d95f5 100644
 --- sandbox/linux/syscall_broker/broker_process.cc
 +++ sandbox/linux/syscall_broker/broker_process.cc
-@@ -157,7 +157,7 @@ bool BrokerProcess::IsSyscallAllowed(int sysno) const {
- #if defined(__NR_fstatat)
-     case __NR_fstatat:
+@@ -169,7 +169,7 @@ bool BrokerProcess::IsSyscallBrokerable(int sysno, bool fast_check) const {
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
  #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);
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
 diff --git sandbox/linux/system_headers/linux_seccomp.h sandbox/linux/system_headers/linux_seccomp.h
-index a60fe2ad3..9dccdb51d 100644
+index 1fa47ed09..39cc9ab53 100644
 --- sandbox/linux/system_headers/linux_seccomp.h
 +++ sandbox/linux/system_headers/linux_seccomp.h
-@@ -29,6 +29,9 @@
+@@ -41,6 +41,9 @@
  #ifndef EM_AARCH64
  #define EM_AARCH64 183
  #endif
@@ -966,7 +964,7 @@ index a60fe2ad3..9dccdb51d 100644
  
  #ifndef __AUDIT_ARCH_64BIT
  #define __AUDIT_ARCH_64BIT 0x80000000
-@@ -54,6 +57,12 @@
+@@ -73,6 +76,12 @@
  #ifndef AUDIT_ARCH_AARCH64
  #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
  #endif
@@ -1055,13 +1053,13 @@ index 000000000..07728e087
 +//TODO: is it necessary to redefine ucontext on PPC64?
 +
 +#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-diff --git services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index fb89b3356..1e984731e 100644
+diff --git sandbox/policy/linux/bpf_renderer_policy_linux.cc sandbox/policy/linux/bpf_renderer_policy_linux.cc
+index 2588fc792..d455c4601 100644
 --- sandbox/policy/linux/bpf_renderer_policy_linux.cc
 +++ sandbox/policy/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"
+ #include "sandbox/policy/linux/sandbox_linux.h"
  
 +// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
 +#ifdef __powerpc64__
@@ -1072,7 +1070,7 @@ index fb89b3356..1e984731e 100644
  // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
  #include <linux/types.h>
 diff --git third_party/angle/src/compiler/translator/InfoSink.h third_party/angle/src/compiler/translator/InfoSink.h
-index 3a807e1e..5258617a 100644
+index 3a807e1e3..5258617a7 100644
 --- third_party/angle/src/compiler/translator/InfoSink.h
 +++ third_party/angle/src/compiler/translator/InfoSink.h
 @@ -92,7 +92,16 @@ class TInfoSinkBase
@@ -1094,7 +1092,7 @@ index 3a807e1e..5258617a 100644
      }
      // Write boolean values as their names instead of integral value.
 diff --git third_party/angle/src/libANGLE/Constants.h third_party/angle/src/libANGLE/Constants.h
-index 42964cc1..6607deeb 100644
+index fcbc9246a..39ae66148 100644
 --- third_party/angle/src/libANGLE/Constants.h
 +++ third_party/angle/src/libANGLE/Constants.h
 @@ -9,6 +9,7 @@
@@ -1106,10 +1104,10 @@ index 42964cc1..6607deeb 100644
  
  #include <stdint.h>
 diff --git third_party/boringssl/BUILD.gn third_party/boringssl/BUILD.gn
-index b435499f4..ac8a84b6d 100644
+index 17cf9cda9..8ce96bd32 100644
 --- third_party/boringssl/BUILD.gn
 +++ third_party/boringssl/BUILD.gn
-@@ -101,6 +101,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
+@@ -103,6 +103,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
        } else {
          public_configs = [ ":no_asm_config" ]
        }
@@ -1124,10 +1122,10 @@ index b435499f4..ac8a84b6d 100644
        public_configs = [ ":no_asm_config" ]
      }
 diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
-index 5617de88..dc8bc176 100644
+index 4af3d7bbf..adbf54159 100644
 --- third_party/breakpad/BUILD.gn
 +++ third_party/breakpad/BUILD.gn
-@@ -598,7 +598,6 @@ if (is_linux || is_android) {
+@@ -596,7 +596,6 @@ if (is_linux || is_chromeos || is_android) {
        "breakpad/src/client/minidump_file_writer.h",
        "breakpad/src/common/convert_UTF.cc",
        "breakpad/src/common/convert_UTF.h",
@@ -1135,7 +1133,7 @@ index 5617de88..dc8bc176 100644
        "breakpad/src/common/linux/elf_core_dump.cc",
        "breakpad/src/common/linux/elf_core_dump.h",
        "breakpad/src/common/linux/elfutils.cc",
-@@ -636,6 +635,14 @@ if (is_linux || is_android) {
+@@ -634,6 +633,14 @@ if (is_linux || is_chromeos || is_android) {
  
      libs = [ "dl" ]
  
@@ -1150,7 +1148,7 @@ index 5617de88..dc8bc176 100644
      include_dirs = [
        ".",
        "breakpad/src",
-@@ -686,7 +693,6 @@ if (is_linux || is_android) {
+@@ -682,7 +689,6 @@ if (is_linux || is_chromeos || is_android) {
        "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
        "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
        "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
@@ -1159,7 +1157,7 @@ index 5617de88..dc8bc176 100644
        "breakpad/src/common/linux/file_id_unittest.cc",
        "breakpad/src/common/linux/linux_libc_support_unittest.cc",
 diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-index 07d9171a..9aed4cb3 100644
+index 07d9171a0..9aed4cb36 100644
 --- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
 +++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
 @@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
@@ -1172,7 +1170,7 @@ index 07d9171a..9aed4cb3 100644
  #error "This code has not been ported to your platform yet."
  #endif
 diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-index aae1dc13..03afec7a 100644
+index aae1dc13b..03afec7a5 100644
 --- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
 +++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
 @@ -270,7 +270,42 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
@@ -1258,7 +1256,7 @@ index aae1dc13..03afec7a 100644
 +
  }  // namespace google_breakpad
 diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-index fb216fa6..593aac82 100644
+index fb216fa6d..593aac822 100644
 --- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
 +++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
 @@ -68,6 +68,10 @@ struct ThreadInfo {
@@ -1285,10 +1283,10 @@ index fb216fa6..593aac82 100644
  
  }  // namespace google_breakpad
 diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index ee515c41..1090470f 100644
+index 6eec1be24..741983a1a 100644
 --- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
 +++ 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) {
+@@ -254,6 +254,48 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc) {
    out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
  #endif
  }
@@ -1338,21 +1336,21 @@ index ee515c41..1090470f 100644
  
  }  // namespace google_breakpad
 diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index 8e74a8a5..7cb667a7 100644
+index 7d4100881..c122ac92e 100644
 --- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
 +++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
 @@ -55,6 +55,9 @@ struct UContextReader {
  #elif defined(__aarch64__)
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+   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);
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
  #endif
 diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index c65feaa1..5a7ab50c 100644
+index a6cb5f984..ae16b64d9 100644
 --- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
 +++ 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) {
@@ -1373,7 +1371,7 @@ index c65feaa1..5a7ab50c 100644
    // 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() {
+@@ -708,11 +715,19 @@ bool ExceptionHandler::WriteMinidump() {
    }
  #endif
  
@@ -1394,7 +1392,7 @@ index c65feaa1..5a7ab50c 100644
    context.tid = sys_gettid();
  
    // Add an exception stream to the minidump for better reporting.
-@@ -726,6 +741,9 @@ bool ExceptionHandler::WriteMinidump() {
+@@ -733,6 +748,9 @@ bool ExceptionHandler::WriteMinidump() {
  #elif defined(__mips__)
    context.siginfo.si_addr =
        reinterpret_cast<void*>(context.context.uc_mcontext.pc);
@@ -1405,7 +1403,7 @@ index c65feaa1..5a7ab50c 100644
  #error "This code has not been ported to your platform yet."
  #endif
 diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-index f44483ff..36ce6d6c 100644
+index f80843ea7..260dd10f7 100644
 --- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
 +++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
 @@ -192,7 +192,11 @@ class ExceptionHandler {
@@ -1422,7 +1420,7 @@ index f44483ff..36ce6d6c 100644
      // In case of MIPS Linux FP state is already part of ucontext_t so
      // 'float_state' is not required.
 diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-index 8d8809fa..e2eb031e 100644
+index 35dcbfd4d..7934370fd 100644
 --- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
 +++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
 @@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) {
@@ -1457,7 +1455,7 @@ index 8d8809fa..e2eb031e 100644
  
    const pid_t child = fork();
 diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-index fa3c1713..6ce709e2 100644
+index fa3c1713a..6ce709e2f 100644
 --- third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
 +++ third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
 @@ -138,7 +138,9 @@ class MicrodumpWriter {
@@ -1503,7 +1501,7 @@ index fa3c1713..6ce709e2 100644
  #endif
    LinuxDumper* dumper_;
 diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-index 6339ac0c..291af106 100644
+index 6339ac0cd..291af106b 100644
 --- third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
 +++ third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
 @@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappings) {
@@ -1530,7 +1528,7 @@ index 6339ac0c..291af106 100644
    ASSERT_NE(std::string::npos,
              buf.find("M 00001000 0000002A 00001000 "
 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-index 41506898..b93e4afc 100644
+index 415068983..b93e4afcf 100644
 --- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
 +++ 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) {
@@ -1556,7 +1554,7 @@ index 41506898..b93e4afc 100644
          for (int i = EF_R0; i <= EF_R31; i++)
            info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-index 1112035b..8523dad6 100644
+index 7fd6532ad..199cbfffd 100644
 --- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
 +++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
 @@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len,
@@ -1571,7 +1569,7 @@ index 1112035b..8523dad6 100644
    const MappingInfo* mapping = FindMapping(stack_pointer);
    if (!mapping)
 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-index f4a75d90..020981f5 100644
+index 7bee160f1..07bb2b81a 100644
 --- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
 +++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
 @@ -63,7 +63,8 @@ namespace google_breakpad {
@@ -1585,7 +1583,7 @@ index f4a75d90..020981f5 100644
  #endif
  
 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-index 3ad48e50..1688c365 100644
+index 331f4bb34..3f722947f 100644
 --- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
 +++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
 @@ -51,6 +51,8 @@
@@ -1598,7 +1596,7 @@ index 3ad48e50..1688c365 100644
  #error This test has not been ported to this platform.
  #endif
 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-index e3ddb81a..fa28575e 100644
+index e3ddb81a6..fa28575ef 100644
 --- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
 +++ 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,
@@ -1644,7 +1642,7 @@ index e3ddb81a..fa28575e 100644
  #error "This code hasn't been ported to your platform yet."
  #endif
 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-index ea6b9a12..9b318fe0 100644
+index da71e15dc..12bfb317a 100644
 --- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
 +++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
 @@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) {
@@ -1667,7 +1665,7 @@ index ea6b9a12..9b318fe0 100644
  #error This test has not been ported to this platform.
  #endif
 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-index f8cdf2a1..cb808c15 100644
+index 32634ef00..2a56948de 100644
 --- third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
 +++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
 @@ -136,7 +136,9 @@ class MinidumpWriter {
@@ -1724,7 +1722,7 @@ index f8cdf2a1..cb808c15 100644
  #endif
    LinuxDumper* dumper_;
 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-index e3b0b16d..ccd8aa0a 100644
+index e3b0b16da..ccd8aa0a4 100644
 --- third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
 +++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
 @@ -48,6 +48,8 @@ class ExceptionHandler;
@@ -1737,7 +1735,7 @@ index e3b0b16d..ccd8aa0a 100644
  typedef std::remove_pointer<fpregset_t>::type fpstate_t;
  #endif
 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-index 3017a49a..364efd79 100644
+index d192e5cbb..fc1bfa8d7 100644
 --- third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
 +++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
 @@ -715,6 +715,9 @@ TEST(MinidumpWriterTest, InvalidStackPointer) {
@@ -1751,7 +1749,7 @@ index 3017a49a..364efd79 100644
  # error "This code has not been ported to your platform yet."
  #endif
 diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-index 4e938269..f0ff15d9 100644
+index 99362945c..c54ba7145 100644
 --- third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
 +++ third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
 @@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) {
@@ -1765,7 +1763,7 @@ index 4e938269..f0ff15d9 100644
    if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
  #else
 diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-index fad59f40..616496d6 100644
+index fad59f40c..616496d67 100644
 --- third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
 +++ third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
 @@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterMap) {
@@ -1783,10 +1781,10 @@ index fad59f40..616496d6 100644
      data1[i] = i & 0x7f;
    }
 diff --git third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-index 43c86314..27325b81 100644
+index 5803b90d5..2a1cf14f0 100644
 --- third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
 +++ third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
-@@ -57,8 +57,9 @@
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
  
    EXPECT_EQ(0U, allocator.pages_allocated());
    uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
@@ -1798,7 +1796,7 @@ index 43c86314..27325b81 100644
      uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
      ASSERT_FALSE(p == NULL);
 diff --git third_party/breakpad/breakpad/src/processor/exploitability_linux.cc third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-index ccc9f145..debaed4d 100644
+index 798056dfa..22bd81fff 100644
 --- third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
 +++ third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
 @@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) {
@@ -1817,7 +1815,7 @@ index ccc9f145..debaed4d 100644
        // Unsupported architecture. Note that ARM architectures are not
        // supported because objdump does not support ARM.
 diff --git third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-index 528ee5f2..72764d6c 100644
+index 528ee5f21..72764d6c1 100644
 --- third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
 +++ third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
 @@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename) {
@@ -1875,7 +1873,7 @@ index 528ee5f2..72764d6c 100644
  
  }  // namespace
 diff --git third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-index a60be323..35b11b6d 100644
+index aade82c99..195aa73f3 100644
 --- third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
 +++ third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
 @@ -77,6 +77,8 @@
@@ -1959,7 +1957,7 @@ index a60be323..35b11b6d 100644
  #error "This code has not been ported to your platform yet"
  #endif
 diff --git third_party/crashpad/crashpad/CONTRIBUTORS third_party/crashpad/crashpad/CONTRIBUTORS
-index 8724b7f3..8e29424e 100644
+index 8724b7f32..8e29424ef 100644
 --- third_party/crashpad/crashpad/CONTRIBUTORS
 +++ third_party/crashpad/crashpad/CONTRIBUTORS
 @@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
@@ -1968,7 +1966,7 @@ index 8724b7f3..8e29424e 100644
  Joshua Peraza <jperaza@chromium.org>
 +Shawn Anastasio <shawn@anastas.io>
 diff --git third_party/crashpad/crashpad/compat/linux/sys/user.h third_party/crashpad/crashpad/compat/linux/sys/user.h
-index 6ed77a98..1fd83469 100644
+index 6ed77a98e..1fd83469a 100644
 --- third_party/crashpad/crashpad/compat/linux/sys/user.h
 +++ third_party/crashpad/crashpad/compat/linux/sys/user.h
 @@ -15,6 +15,7 @@
@@ -1980,7 +1978,7 @@ index 6ed77a98..1fd83469 100644
  
  #include <features.h>
 diff --git third_party/crashpad/crashpad/minidump/minidump_context.h third_party/crashpad/crashpad/minidump/minidump_context.h
-index 3a3e603c..3118d9e9 100644
+index 3a3e603cb..3118d9e9f 100644
 --- third_party/crashpad/crashpad/minidump/minidump_context.h
 +++ third_party/crashpad/crashpad/minidump/minidump_context.h
 @@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
@@ -2055,7 +2053,7 @@ index 3a3e603c..3118d9e9 100644
  
  #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
 diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.cc third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-index d7e53a49..d89eb9e0 100644
+index d7e53a493..d89eb9e01 100644
 --- third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
 +++ third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
 @@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) {
@@ -2121,7 +2119,7 @@ index d7e53a49..d89eb9e0 100644
 +
  }  // namespace crashpad
 diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.h third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-index d4ab936e..1d22fc59 100644
+index d4ab936ee..1d22fc59c 100644
 --- third_party/crashpad/crashpad/minidump/minidump_context_writer.h
 +++ third_party/crashpad/crashpad/minidump/minidump_context_writer.h
 @@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
@@ -2171,7 +2169,7 @@ index d4ab936e..1d22fc59 100644
  
  #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
 diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-index 3216a906..a9fcbe9d 100644
+index 3216a906b..a9fcbe9d8 100644
 --- third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
 +++ third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
 @@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromSnapshot) {
@@ -2197,10 +2195,10 @@ index 3216a906..a9fcbe9d 100644
  }  // namespace test
  }  // namespace crashpad
 diff --git third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-index a1340760..95dc9252 100644
+index 0974e3ddf..b71ec5880 100644
 --- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
 +++ third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-@@ -126,6 +126,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
    static constexpr char kCPU[] = "mips";
  #elif defined(ARCH_CPU_MIPS64EL)
    static constexpr char kCPU[] = "mips64";
@@ -2210,10 +2208,10 @@ index a1340760..95dc9252 100644
  #error define kCPU for this CPU
  #endif
 diff --git third_party/crashpad/crashpad/snapshot/capture_memory.cc third_party/crashpad/crashpad/snapshot/capture_memory.cc
-index a51626cc..61e0b20a 100644
+index 7a1b2763c..beda8da9e 100644
 --- third_party/crashpad/crashpad/snapshot/capture_memory.cc
 +++ third_party/crashpad/crashpad/snapshot/capture_memory.cc
-@@ -111,6 +111,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
+@@ -112,6 +112,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]);
    }
@@ -2226,7 +2224,7 @@ index a51626cc..61e0b20a 100644
  #error Port.
  #endif
 diff --git third_party/crashpad/crashpad/snapshot/cpu_architecture.h third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-index 811a7209..f4f83981 100644
+index 811a72095..f4f83981d 100644
 --- third_party/crashpad/crashpad/snapshot/cpu_architecture.h
 +++ third_party/crashpad/crashpad/snapshot/cpu_architecture.h
 @@ -43,7 +43,10 @@ enum CPUArchitecture {
@@ -2242,7 +2240,7 @@ index 811a7209..f4f83981 100644
  
  }  // namespace crashpad
 diff --git third_party/crashpad/crashpad/snapshot/cpu_context.cc third_party/crashpad/crashpad/snapshot/cpu_context.cc
-index 6fb8d7e7..b01f7cad 100644
+index c75b5555e..aeade577a 100644
 --- third_party/crashpad/crashpad/snapshot/cpu_context.cc
 +++ third_party/crashpad/crashpad/snapshot/cpu_context.cc
 @@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer() const {
@@ -2272,7 +2270,7 @@ index 6fb8d7e7..b01f7cad 100644
      case kCPUArchitectureX86:
      case kCPUArchitectureARM:
 diff --git third_party/crashpad/crashpad/snapshot/cpu_context.h third_party/crashpad/crashpad/snapshot/cpu_context.h
-index fb23c467..eebede63 100644
+index fb23c4679..eebede63c 100644
 --- third_party/crashpad/crashpad/snapshot/cpu_context.h
 +++ third_party/crashpad/crashpad/snapshot/cpu_context.h
 @@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
@@ -2309,7 +2307,7 @@ index fb23c467..eebede63 100644
  };
  
 diff --git third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-index 9f46a489..aa677c4e 100644
+index 9f46a4897..aa677c4eb 100644
 --- third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
 +++ third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
 @@ -15,6 +15,7 @@
@@ -2400,24 +2398,20 @@ index 9f46a489..aa677c4e 100644
  }  // namespace crashpad
  
 diff --git third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-index be22c903..c5df23d1 100644
+index d32bd1937..2dd538c2b 100644
 --- third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
 +++ third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-@@ -159,9 +159,11 @@ void TestAgainstTarget(PtraceConnection* connection) {
-           const bool is_vdso_mapping =
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection* connection) {
                device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
            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,
+ #endif
 diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-index cd40b3b1..6bcf23b6 100644
+index cd40b3b12..6bcf23b6f 100644
 --- third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
 +++ third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
 @@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
@@ -2491,7 +2485,7 @@ index cd40b3b1..6bcf23b6 100644
  
  bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
 diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-index ea0cd210..e42df520 100644
+index ea0cd2106..e42df520f 100644
 --- third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
 +++ third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
 @@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot {
@@ -2504,7 +2498,7 @@ index ea0cd210..e42df520 100644
    } context_union_;
    CPUContext context_;
 diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-index e4ff1ab7..25534dd0 100644
+index c17170b43..b6a714cc6 100644
 --- third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
 +++ third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
 @@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
@@ -2537,7 +2531,7 @@ index e4ff1ab7..25534dd0 100644
  #error Port.
  #endif
 diff --git third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-index b96abfe7..df12ca56 100644
+index ee246e8bc..9555dce04 100644
 --- third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
 +++ third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
 @@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) {
@@ -2549,21 +2543,8 @@ index b96abfe7..df12ca56 100644
  #else
  #error Port.
  #endif
-diff --git third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-index 5b572361..049c3285 100644
---- third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-+++ third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-@@ -612,6 +612,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 third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index 11002468..8e335a09 100644
+index 110024680..a1f2da259 100644
 --- third_party/crashpad/crashpad/snapshot/linux/signal_context.h
 +++ third_party/crashpad/crashpad/snapshot/linux/signal_context.h
 @@ -422,6 +422,89 @@ static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
@@ -2657,10 +2638,10 @@ index 11002468..8e335a09 100644
  #error Port.
  #endif  // ARCH_CPU_X86_FAMILY
 diff --git third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-index 8564d3d4..b690ecd4 100644
+index a99da3e4b..03b973083 100644
 --- third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
 +++ third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-@@ -203,6 +203,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const {
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const {
  #elif defined(ARCH_CPU_MIPS_FAMILY)
    return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
                                      : kCPUArchitectureMIPSEL;
@@ -2669,7 +2650,7 @@ index 8564d3d4..b690ecd4 100644
  #else
  #error port to your architecture
  #endif
-@@ -218,6 +220,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const {
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const {
  #elif defined(ARCH_CPU_MIPS_FAMILY)
    // Not implementable on MIPS
    return 0;
@@ -2679,7 +2660,7 @@ index 8564d3d4..b690ecd4 100644
  #else
  #error port to your architecture
  #endif
-@@ -238,6 +243,9 @@ std::string SystemSnapshotLinux::CPUVendor() const {
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVendor() const {
  #elif defined(ARCH_CPU_MIPS_FAMILY)
    // Not implementable on MIPS
    return std::string();
@@ -2689,7 +2670,7 @@ index 8564d3d4..b690ecd4 100644
  #else
  #error port to your architecture
  #endif
-@@ -371,6 +379,9 @@ bool SystemSnapshotLinux::NXEnabled() const {
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() const {
  #elif defined(ARCH_CPU_MIPS_FAMILY)
    // Not implementable on MIPS
    return false;
@@ -2699,8 +2680,21 @@ index 8564d3d4..b690ecd4 100644
  #else
  #error Port.
  #endif  // ARCH_CPU_X86_FAMILY
+diff --git third_party/crashpad/crashpad/snapshot/linux/test_modules.cc third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+index b2450c206..7ba78b2ae 100644
+--- third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,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 third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-index e3e2bebd..8ef43752 100644
+index e3e2bebdd..8ef43752e 100644
 --- third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
 +++ third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
 @@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
@@ -2719,7 +2713,7 @@ index e3e2bebd..8ef43752 100644
  #error Port.
  #endif
 diff --git third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-index 44cc6f6d..d4136461 100644
+index 44cc6f6d9..d4136461e 100644
 --- third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
 +++ third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
 @@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
@@ -2732,7 +2726,7 @@ index 44cc6f6d..d4136461 100644
  #error Port.
  #endif  // ARCH_CPU_X86_FAMILY
 diff --git third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-index d3d5ebdf..3fd730cb 100644
+index d3d5ebdfb..3fd730cb5 100644
 --- third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
 +++ third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
 @@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnection* connection) {
@@ -2747,23 +2741,8 @@ index d3d5ebdf..3fd730cb 100644
      if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
        LOG(ERROR) << "duplicate auxv entry";
        return false;
-diff --git third_party/crashpad/crashpad/util/linux/ptrace_broker.cc third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-index 155a1e0c..5e50ceb5 100644
---- third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-+++ 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 third_party/crashpad/crashpad/util/linux/ptracer.cc third_party/crashpad/crashpad/util/linux/ptracer.cc
-index 557e0d36..08ae434b 100644
+index 557e0d363..08ae434b8 100644
 --- third_party/crashpad/crashpad/util/linux/ptracer.cc
 +++ third_party/crashpad/crashpad/util/linux/ptracer.cc
 @@ -398,6 +398,64 @@ bool GetThreadArea64(pid_t tid,
@@ -2842,7 +2821,7 @@ index 557e0d36..08ae434b 100644
                             info->thread_context,
                             &info->thread_specific_data_address,
 diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h
-index 5b55c24a..dea0d1f3 100644
+index 5b55c24a7..dea0d1f39 100644
 --- third_party/crashpad/crashpad/util/linux/thread_info.h
 +++ third_party/crashpad/crashpad/util/linux/thread_info.h
 @@ -28,6 +28,10 @@
@@ -2964,10 +2943,10 @@ index 5b55c24a..dea0d1f3 100644
    LinuxVMAddress thread_specific_data_address;
  };
 diff --git third_party/crashpad/crashpad/util/misc/capture_context.h third_party/crashpad/crashpad/util/misc/capture_context.h
-index 3ff71184..3e82f4b9 100644
+index d21a24f19..acc325349 100644
 --- third_party/crashpad/crashpad/util/misc/capture_context.h
 +++ third_party/crashpad/crashpad/util/misc/capture_context.h
-@@ -68,6 +68,7 @@ using NativeCPUContext = ucontext_t;
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
  //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
  //!     Linux               | ARM/ARM64    | `r0`/`x0`
  //!     Linux               | MIPS/MIPS64  | `$a0`
@@ -2976,7 +2955,7 @@ index 3ff71184..3e82f4b9 100644
  //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
  //!     this function.
 diff --git third_party/crashpad/crashpad/util/misc/capture_context_linux.S third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-index 52215ee5..b3e4a3ec 100644
+index 52215ee5d..b3e4a3ec7 100644
 --- third_party/crashpad/crashpad/util/misc/capture_context_linux.S
 +++ third_party/crashpad/crashpad/util/misc/capture_context_linux.S
 @@ -32,7 +32,7 @@
@@ -3204,7 +3183,7 @@ index 52215ee5..b3e4a3ec 100644
 +  blr
  #endif  // __i386__
 diff --git third_party/crashpad/crashpad/util/misc/capture_context_test.cc third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-index cf23c2de..5f264bc9 100644
+index cf23c2def..5f264bc92 100644
 --- third_party/crashpad/crashpad/util/misc/capture_context_test.cc
 +++ third_party/crashpad/crashpad/util/misc/capture_context_test.cc
 @@ -57,7 +57,7 @@ void TestCaptureContext() {
@@ -3217,10 +3196,10 @@ index cf23c2de..5f264bc9 100644
    // likely fail.
    const uintptr_t kReferencePC =
 diff --git third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-index 9fc5db28..5f69f8dc 100644
+index 30a2ab21d..60509f21d 100644
 --- third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
 +++ third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-@@ -36,6 +36,8 @@ void SanityCheckContext(const NativeCPUContext& context) {
+@@ -35,6 +35,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));
@@ -3229,7 +3208,7 @@ index 9fc5db28..5f69f8dc 100644
  #endif
  }
  
-@@ -50,6 +52,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
    return context.uc_mcontext.pc;
  #elif defined(ARCH_CPU_MIPS_FAMILY)
    return context.uc_mcontext.pc;
@@ -3238,7 +3217,7 @@ index 9fc5db28..5f69f8dc 100644
  #endif
  }
  
-@@ -64,6 +68,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
    return context.uc_mcontext.sp;
  #elif defined(ARCH_CPU_MIPS_FAMILY)
    return context.uc_mcontext.gregs[29];
@@ -3248,10 +3227,10 @@ index 9fc5db28..5f69f8dc 100644
  }
  
 diff --git third_party/crashpad/crashpad/util/posix/signals_test.cc third_party/crashpad/crashpad/util/posix/signals_test.cc
-index 58bfa8f8..8fc37c46 100644
---- third_party/crashpad/crashpad/util/posix/signals_test.cc.orig	2020-11-17 13:39:47.000000000 -0500
-+++ third_party/crashpad/crashpad/util/posix/signals_test.cc	2020-11-18 21:06:33.433408623 -0500
-@@ -46,9 +46,9 @@
+index 54cc2f19f..298b5c993 100644
+--- third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
    return sig == SIGABRT ||
           sig == SIGALRM ||
           sig == SIGBUS ||
@@ -3263,7 +3242,7 @@ index 58bfa8f8..8fc37c46 100644
  #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
           sig == SIGILL ||
  #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-@@ -117,9 +117,11 @@
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
        break;
      }
  
@@ -3276,7 +3255,7 @@ index 58bfa8f8..8fc37c46 100644
      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 @@
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
        fstat(quotient, &stat_buf);
        break;
      }
@@ -3286,10 +3265,10 @@ index 58bfa8f8..8fc37c46 100644
  #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
      case SIGILL: {
 diff --git third_party/dav1d/BUILD.gn third_party/dav1d/BUILD.gn
-index 788dc6cf..5fd7e8fd 100644
+index 6b4566fc3..c07f732ad 100644
 --- third_party/dav1d/BUILD.gn
 +++ third_party/dav1d/BUILD.gn
-@@ -182,6 +182,8 @@ static_library("dav1d_8bit") {
+@@ -184,6 +184,8 @@ static_library("dav1d_8bit") {
      sources += arm_template_sources
    } else if (current_cpu == "arm64") {
      sources += arm_template_sources
@@ -3298,7 +3277,7 @@ index 788dc6cf..5fd7e8fd 100644
    }
  
    cflags = dav1d_copts
-@@ -210,6 +212,8 @@ static_library("dav1d_10bit") {
+@@ -212,6 +214,8 @@ static_library("dav1d_10bit") {
      sources += arm_template_sources
    } else if (current_cpu == "arm64") {
      sources += arm_template_sources
@@ -3307,9 +3286,9 @@ index 788dc6cf..5fd7e8fd 100644
    }
  
    cflags = dav1d_copts
-@@ -256,6 +260,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
-       ":dav1d_config",
-     ]
+@@ -263,6 +267,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
+       defines = [ "PREFIX" ]
+     }
  
 +    cflags = dav1d_copts
 +  }
@@ -3329,7 +3308,7 @@ index 788dc6cf..5fd7e8fd 100644
      cflags = dav1d_copts
    }
  }
-@@ -285,5 +304,7 @@ static_library("dav1d") {
+@@ -292,5 +311,7 @@ static_library("dav1d") {
      }
    } else if (current_cpu == "arm" || current_cpu == "arm64") {
      deps += [ ":dav1d_arm" ]
@@ -3339,7 +3318,7 @@ index 788dc6cf..5fd7e8fd 100644
  }
 diff --git third_party/dav1d/config/linux/ppc64/config.h third_party/dav1d/config/linux/ppc64/config.h
 new file mode 100644
-index 00000000..f6ca57f7
+index 000000000..9fbbf75cc
 --- /dev/null
 +++ third_party/dav1d/config/linux/ppc64/config.h
 @@ -0,0 +1,39 @@
@@ -3383,10 +3362,10 @@ index 00000000..f6ca57f7
 +#define HAVE_UNISTD_H 1
 +
 diff --git third_party/dav1d/dav1d_generated.gni third_party/dav1d/dav1d_generated.gni
-index 8becac02..d5f4fcac 100644
+index c59cb0821..3060284a8 100644
 --- third_party/dav1d/dav1d_generated.gni
 +++ third_party/dav1d/dav1d_generated.gni
-@@ -71,6 +71,11 @@ arm_template_sources = [
+@@ -82,6 +82,11 @@ arm_template_sources = [
    "libdav1d/src/arm/mc_init_tmpl.c",
  ]
  
@@ -3399,7 +3378,7 @@ index 8becac02..d5f4fcac 100644
    "libdav1d/src/cdef_apply_tmpl.c",
    "libdav1d/src/cdef_tmpl.c",
 diff --git third_party/dav1d/generate_source.py third_party/dav1d/generate_source.py
-index 9ab5e00b..ad3feffe 100755
+index 9ab5e00b8..ad3feffee 100755
 --- third_party/dav1d/generate_source.py
 +++ third_party/dav1d/generate_source.py
 @@ -50,7 +50,8 @@ def WriteGn(fd):
@@ -3413,7 +3392,7 @@ index 9ab5e00b..ad3feffe 100755
    WriteArray(fd, "template_sources", template_sources)
  
 diff --git third_party/dav1d/libdav1d/src/ppc/types.h third_party/dav1d/libdav1d/src/ppc/types.h
-index 0b4bd72f..a0caa5e7 100644
+index 0b4bd72f0..a0caa5e71 100644
 --- third_party/dav1d/libdav1d/src/ppc/types.h
 +++ third_party/dav1d/libdav1d/src/ppc/types.h
 @@ -51,4 +51,19 @@
@@ -3437,10 +3416,10 @@ index 0b4bd72f..a0caa5e7 100644
 +
  #endif /* DAV1D_SRC_PPC_TYPES_H */
 diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
-index d2baee9d..9955ce44 100644
+index e4ac22644..1c57015db 100644
 --- third_party/lss/linux_syscall_support.h
 +++ third_party/lss/linux_syscall_support.h
-@@ -3922,7 +3922,7 @@ struct kernel_statfs {
+@@ -3947,7 +3947,7 @@ struct kernel_statfs {
        LSS_REG(2, buf);
        LSS_BODY(void*, mmap2, "0"(__r2));
      }
@@ -3449,7 +3428,7 @@ index d2baee9d..9955ce44 100644
      #define __NR__mmap2 __NR_mmap2
      LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
                           size_t,                   l, int,               p,
-@@ -4033,7 +4033,7 @@ struct kernel_statfs {
+@@ -4058,7 +4058,7 @@ struct kernel_statfs {
    #if defined(__i386__) ||                                                    \
        defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
       (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
@@ -3471,10 +3450,10 @@ index bdac4d784..51e0f2cac 100644
  #  define SIMD_SZ 4
  #  define VZERO() ((vector float) vec_splat_u8(0))
 diff --git third_party/skia/src/sksl/SkSLString.cpp third_party/skia/src/sksl/SkSLString.cpp
-index 88eb1c7d..4be33fa5 100644
+index ec3e56964..4cf8999a2 100644
 --- third_party/skia/src/sksl/SkSLString.cpp
 +++ third_party/skia/src/sksl/SkSLString.cpp
-@@ -240,7 +240,12 @@ String to_string(double value) {
+@@ -234,7 +234,12 @@ String to_string(double value) {
      if (needsDotZero) {
          buffer << ".0";
      }
@@ -3487,12 +3466,12 @@ index 88eb1c7d..4be33fa5 100644
 +    return String(ret.c_str());
  }
  
- SKSL_INT stoi(const String& s) {
+ bool stod(const StringFragment& s, SKSL_FLOAT* value) {
 diff --git third_party/sqlite/src/amalgamation/sqlite3.c third_party/sqlite/src/amalgamation/sqlite3.c
-index 1b2c2ec7..7593dba1 100644
+index 6b4a7899d..b8c7fe414 100644
 --- third_party/sqlite/src/amalgamation/sqlite3.c
 +++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14400,7 +14400,8 @@ typedef INT16_TYPE LogEst;
+@@ -14474,7 +14474,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)   ||    \
@@ -3503,10 +3482,10 @@ index 1b2c2ec7..7593dba1 100644
  # elif defined(sparc)     || defined(__ppc__) || \
         defined(__ARMEB__) || defined(__AARCH64EB__)
 diff --git third_party/sqlite/src/amalgamation_dev/sqlite3.c third_party/sqlite/src/amalgamation_dev/sqlite3.c
-index 19c87689..c7ab039e 100644
+index d30c9b7de..cf75a69d9 100644
 --- third_party/sqlite/src/amalgamation_dev/sqlite3.c
 +++ third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -14413,7 +14413,8 @@ typedef INT16_TYPE LogEst;
+@@ -14487,7 +14487,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)   ||    \
@@ -3517,10 +3496,10 @@ index 19c87689..c7ab039e 100644
  # elif defined(sparc)     || defined(__ppc__) || \
         defined(__ARMEB__) || defined(__AARCH64EB__)
 diff --git third_party/sqlite/src/ext/rtree/rtree.c third_party/sqlite/src/ext/rtree/rtree.c
-index efaef813..4cd57d55 100644
+index f5b57a5e2..80a2d0ad8 100644
 --- third_party/sqlite/src/ext/rtree/rtree.c
 +++ third_party/sqlite/src/ext/rtree/rtree.c
-@@ -432,7 +432,7 @@ struct RtreeMatchArg {
+@@ -450,7 +450,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)   ||    \
@@ -3530,10 +3509,10 @@ index efaef813..4cd57d55 100644
  #elif defined(sparc)    || defined(__ppc__)
  # define SQLITE_BYTEORDER    4321
 diff --git third_party/sqlite/src/src/sqliteInt.h third_party/sqlite/src/src/sqliteInt.h
-index 122e26ad..ec21dcb5 100644
+index 245070d4f..b25164e95 100644
 --- third_party/sqlite/src/src/sqliteInt.h
 +++ third_party/sqlite/src/src/sqliteInt.h
-@@ -868,7 +868,8 @@ typedef INT16_TYPE LogEst;
+@@ -877,7 +877,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)   ||    \
@@ -3544,10 +3523,10 @@ index 122e26ad..ec21dcb5 100644
  # elif defined(sparc)     || defined(__ppc__) || \
         defined(__ARMEB__) || defined(__AARCH64EB__)
 diff --git third_party/webrtc/modules/desktop_capture/differ_block.cc third_party/webrtc/modules/desktop_capture/differ_block.cc
-index dd9ab457..c005d959 100644
---- third_party/webrtc/modules/desktop_capture/differ_block.cc.orig	2020-11-17 13:42:02.000000000 -0500
-+++ third_party/webrtc/modules/desktop_capture/differ_block.cc	2020-11-18 21:11:03.039905360 -0500
-@@ -30,11 +30,7 @@
+index 4f0c5430c..54ee0829e 100644
+--- third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ 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) {
@@ -3560,7 +3539,7 @@ index dd9ab457..c005d959 100644
      bool have_sse2 = GetCPUInfo(kSSE2) != 0;
      // For x86 processors, check if SSE2 is supported.
      if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
      } else {
        diff_proc = &VectorDifference_C;
      }
@@ -3572,10 +3551,10 @@ index dd9ab457..c005d959 100644
    }
  
 diff --git third_party/webrtc/rtc_base/system/arch.h third_party/webrtc/rtc_base/system/arch.h
-index ed216e66..25d36c07 100644
+index be2367b85..be4ee4233 100644
 --- third_party/webrtc/rtc_base/system/arch.h
 +++ third_party/webrtc/rtc_base/system/arch.h
-@@ -50,6 +50,18 @@
+@@ -79,6 +79,18 @@
  #elif defined(__EMSCRIPTEN__)
  #define WEBRTC_ARCH_32_BITS
  #define WEBRTC_ARCH_LITTLE_ENDIAN
@@ -3594,15 +3573,15 @@ index ed216e66..25d36c07 100644
  #else
  #error Please add support for your architecture in rtc_base/system/arch.h
  #endif
- diff --git v8/BUILD.gn v8/BUILD.gn
-index 167e63503..125c445ea 100644
+diff --git v8/BUILD.gn v8/BUILD.gn
+index f39529a3a..e84fc449e 100644
 --- v8/BUILD.gn
 +++ v8/BUILD.gn
-@@ -696,6 +696,12 @@ config("toolchain") {
+@@ -850,6 +850,12 @@ config("toolchain") {
      }
      if (host_byteorder == "little") {
        defines += [ "V8_TARGET_ARCH_PPC_LE" ]
-+        cflags += [
++      cflags += [
 +        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
 +        "-mcpu=power8",
 +        "-maltivec",
@@ -3612,11 +3591,11 @@ index 167e63503..125c445ea 100644
        defines += [ "V8_TARGET_ARCH_PPC_BE" ]
        if (current_os == "aix") {
 diff --git ui/gl/features.gni ui/gl/features.gni
-index cb2c98649..5e09bc1f7 100644
+index 5fda9b6..3d2dd8b 100644
 --- ui/gl/features.gni
 +++ ui/gl/features.gni
-@@ -25,5 +25,6 @@ declare_args() {
-                         is_chromeos || is_fuchsia) &&
+@@ -32,5 +32,6 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
                         (target_cpu == "x86" || target_cpu == "x64" ||
                          target_cpu == "arm" || target_cpu == "arm64" ||
 -                        target_cpu == "mipsel" || target_cpu == "mips64el")
@@ -3624,11 +3603,11 @@ index cb2c98649..5e09bc1f7 100644
 +                        target_cpu == "ppc64")
  }
 diff --git v8/test/BUILD.gn v8/test/BUILD.gn
-index f6d30537a..287b27080 100644
+index fb872ad39..45fc585dd 100644
 --- v8/test/BUILD.gn
 +++ v8/test/BUILD.gn
-@@ -31,7 +31,7 @@ group("gn_all") {
-     deps += [
+@@ -36,7 +36,7 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
        "cctest:cctest",
        "cctest:generate-bytecode-expectations",
 -      "unittests:unittests",
@@ -3636,7 +3615,7 @@ index f6d30537a..287b27080 100644
      ]
    }
  }
-@@ -73,7 +73,7 @@ group("v8_bot_default") {
+@@ -78,7 +78,7 @@ group("v8_bot_default") {
      "message:v8_message",
      "mjsunit:v8_mjsunit",
      "mkgrokdump:mkgrokdump",
@@ -3645,7 +3624,7 @@ index f6d30537a..287b27080 100644
      "wasm-api-tests:wasm_api_tests",
      "wasm-js:v8_wasm_js",
      "wasm-spec-tests:v8_wasm_spec_tests",
-@@ -93,7 +93,7 @@ group("v8_default") {
+@@ -98,7 +98,7 @@ group("v8_default") {
      "message:v8_message",
      "mjsunit:v8_mjsunit",
      "mkgrokdump:mkgrokdump",
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 098cb904da98..5800c4e6e105 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.182
+version=89.0.4389.82
 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=30411fc3ec2d33df4c5cad41f21affa3823c80f7dbd394f6d68f9a1e81015b81
+checksum=df4914407b68afdc6449cb8e3f1b08d110eb8689ac41f86490e337fa4d1be379
 nocross=yes
 
 lib32disabled=yes
@@ -36,7 +36,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
  minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
  re2-devel fontconfig-devel freetype-devel opus-devel
  ffmpeg-devel libva-devel python-setuptools xcb-proto
- $(vopt_if pipewire libpipewire0.2-devel) $(vopt_if sndio sndio-devel)"
+ $(vopt_if pipewire pipewire-devel) $(vopt_if sndio sndio-devel)"
 depends="libexif hwids desktop-file-utils hicolor-icon-theme xdg-utils"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -91,7 +91,7 @@ do_configure() {
 
 	# compile gn early, so it can be used to generate gni stuff
 	AR="ar" CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD LD=$CXX_FOR_BUILD \
-	python2 tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
+	tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
 
 	# we need to generate ppc64 stuff for libvpx as it's not shipped
 	# this has to be done before unbundling, but after gn is built
@@ -152,16 +152,14 @@ do_configure() {
 	done
 
 	# switch to system provided dependencies
-	python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
 
-	python2 third_party/libaddressinput/chromium/tools/update-strings.py
+	third_party/libaddressinput/chromium/tools/update-strings.py
 
 	# 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+=(
@@ -199,6 +197,7 @@ do_configure() {
 
 	conf+=(
 		"rtc_use_pipewire=$(vopt_if pipewire true false)"
+		'rtc_pipewire_version="0.3"'
 	)
 
 	# Use explicit library dependencies instead of dlopen.

From e4f1ea4c53fc9bd583f51404272c720b3895def0 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 10 Mar 2021 14:20:48 -0500
Subject: [PATCH 3393/3458] chromium-widevine: update to 89.0.4389.82.

---
 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 4c9600e6eca4..e7026792dd76 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=ab00e9412f5f20e30c7db5dc987473248f4adf9ebf2c3f928ef62e1ffb104fe6
+checksum=183089861c5c4c048b479f64b3baac2345bbd06736115210f4180d4c69fc1feb
 _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 d7a0587caf5a..4f016b60aa97 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.182
+version=89.0.4389.82
 revision=1
 archs="x86_64"
 create_wrksrc=yes

From 2a1c618e46d5f442ee549a4a9056d93758ab8584 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 11 Mar 2021 18:58:46 +0100
Subject: [PATCH 3394/3458] synapse: update to 1.29.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index e9ffab6b7075..98cef830f2c3 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.28.0
+version=1.29.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=509c5241ae6621b397d769cc9665a8f86983b2e8f17d63795721601600d8132c
+checksum=01650226eabe9dbf04e01a457aafb8d6b147707b4d764d18692bde1786d608f3
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 1ccaab44ba47353b15625696b4ed335aca1d954a Mon Sep 17 00:00:00 2001
From: Alexander Gehrke <github@qwertyuiop.de>
Date: Mon, 8 Mar 2021 14:30:09 +0100
Subject: [PATCH 3395/3458] pueue: update to 0.12.0

---
 srcpkgs/pueue/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pueue/template b/srcpkgs/pueue/template
index 9323800e3779..7ddbff9e72ce 100644
--- a/srcpkgs/pueue/template
+++ b/srcpkgs/pueue/template
@@ -1,20 +1,31 @@
 # Template file for 'pueue'
 pkgname=pueue
-version=0.10.2
+version=0.12.0
 revision=1
 build_style=cargo
+build_helper="qemu"
 short_desc="Command-line tool for managing long-running tasks"
 maintainer="crater2150 <void@qwertyuiop.de>"
 license="MIT"
 homepage="https://github.com/Nukesor/pueue"
 distfiles="https://github.com/Nukesor/pueue/archive/v${version}.tar.gz"
-checksum=dbd333079df9249609f6a01d7c96175ec9d74f9d621688b95ec755134b7fa1f5
+checksum=9c3930380120bf8479caa55236fb9fdbbad5bfe3d41c0729a667c777cbc856e2
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
 
+post_build() {
+	for shell in bash fish zsh; do
+		vtargetrun target/${RUST_TARGET}/release/pueue completions $shell .
+	done
+}
+
 post_install() {
 	vlicense LICENSE
+
+	vcompletion _pueue zsh pueue
+	vcompletion pueue.bash bash pueue
+	vcompletion pueue.fish fish pueue
 }

From 62627ebd4a5e9e6dcb2cc0d84f1b54310a9634ce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 11 Mar 2021 19:25:29 +0100
Subject: [PATCH 3396/3458] flatpak: update to 1.10.2.

fixes CVE-2021-21381
---
 srcpkgs/flatpak/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 9e7334e1b82f..da8807535ee1 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.10.1
+version=1.10.2
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -22,7 +22,7 @@ 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=c1354f42bf3b5d51aeb4028c9b62fd4ffc673ef2ff6e583c17777f5dafdbdcb7
+checksum=db152739d072f8ff299e4e888d8963a1b4538da7b10e0b86525be438f2e1dde4
 
 build_options="gir"
 build_options_default="gir"

From ed4e5fdbda1ed95997e8906b0376f1c6ccab2a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 17:09:43 -0300
Subject: [PATCH 3397/3458] iwd: update to 1.12.

Don't use external ell anymore:
- ABI isn't stable
- makes updating harder if bluez and IWD depend on different versions of ell
---
 srcpkgs/iwd/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index d3a413da37ba..3274f358eedc 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,13 +1,13 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.11
+version=1.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
- --enable-external-ell --enable-dbus-policy --enable-wired"
+ --enable-dbus-policy --enable-wired"
 hostmakedepends="python3-docutils pkg-config"
-makedepends="readline-devel dbus-devel ell-devel"
-depends="dbus ell>=0.36"
+makedepends="readline-devel dbus-devel"
+depends="dbus"
 checkdepends="python3 $depends"
 short_desc="Internet Wireless Daemon by Intel that aims to replace wpa_supplicant"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -15,7 +15,7 @@ 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=db854f569cfa94dc32120d8cf2e7d483a16679f238e1a4794837d0e455ea7aa9
+checksum=4238c394d35ee6e99291009424d5530183aa5367c6f4f5349a95a56c5c94a211
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 55ed5e15d06829f4f6d5066e57f6e5aa5060c8b2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Mar 2021 21:19:51 +0100
Subject: [PATCH 3398/3458] qemu: add support for ppcle in linux-user

---
 srcpkgs/qemu/patches/xxx-ppcle.patch | 126 +++++++++++++++++++++++++++
 srcpkgs/qemu/template                |   2 +-
 2 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/qemu/patches/xxx-ppcle.patch

diff --git a/srcpkgs/qemu/patches/xxx-ppcle.patch b/srcpkgs/qemu/patches/xxx-ppcle.patch
new file mode 100644
index 000000000000..99396bff9dd5
--- /dev/null
+++ b/srcpkgs/qemu/patches/xxx-ppcle.patch
@@ -0,0 +1,126 @@
+From 7ece08d7902d5a8c007deeb0b75cb533a41dd882 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 7 Mar 2021 01:47:42 +0100
+Subject: [PATCH] support ppcle architecture
+
+---
+ configure                                    | 14 ++++++++++++--
+ default-configs/targets/ppcle-linux-user.mak |  4 ++++
+ linux-user/ppc/target_syscall.h              |  4 ++++
+ scripts/qemu-binfmt-conf.sh                  |  6 +++++-
+ tests/tcg/configure.sh                       |  2 ++
+ 5 files changed, 27 insertions(+), 3 deletions(-)
+ create mode 100644 default-configs/targets/ppcle-linux-user.mak
+
+diff --git configure configure
+index 18c26e0..03d3e18 100755
+--- configure
++++ configure
+@@ -653,7 +653,11 @@ elif check_define _ARCH_PPC ; then
+       cpu="ppc64"
+     fi
+   else
+-    cpu="ppc"
++    if check_define _LITTLE_ENDIAN ; then
++      cpu="ppcle"
++    else
++      cpu="ppc"
++    fi
+   fi
+ elif check_define __mips__ ; then
+   cpu="mips"
+@@ -683,6 +687,9 @@ ARCH=
+ case "$cpu" in
+   ppc|ppc64|s390x|sparc64|x32|riscv32|riscv64)
+   ;;
++  ppcle)
++    ARCH="ppc"
++  ;;
+   ppc64le)
+     ARCH="ppc64"
+   ;;
+@@ -6783,7 +6790,7 @@ if test "$linux" = "yes" ; then
+   i386|x86_64|x32)
+     linux_arch=x86
+     ;;
+-  ppc|ppc64|ppc64le)
++  ppc|ppcle|ppc64|ppc64le)
+     linux_arch=powerpc
+     ;;
+   s390x)
+@@ -6960,6 +6967,9 @@ if test -n "$cross_prefix"; then
+         i386|x86_64)
+             echo "cpu_family = 'x86'" >> $cross
+             ;;
++        ppcle)
++            echo "cpu_family = 'ppc'" >> $cross
++            ;;
+         ppc64le)
+             echo "cpu_family = 'ppc64'" >> $cross
+             ;;
+diff --git default-configs/targets/ppcle-linux-user.mak default-configs/targets/ppcle-linux-user.mak
+new file mode 100644
+index 0000000..2259243
+--- /dev/null
++++ default-configs/targets/ppcle-linux-user.mak
+@@ -0,0 +1,4 @@
++TARGET_ARCH=ppc
++TARGET_SYSTBL_ABI=common,nospu,32
++TARGET_SYSTBL=syscall.tbl
++TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
+diff --git linux-user/ppc/target_syscall.h linux-user/ppc/target_syscall.h
+index b9c4b81..cf26497 100644
+--- linux-user/ppc/target_syscall.h
++++ linux-user/ppc/target_syscall.h
+@@ -65,7 +65,11 @@ struct target_revectored_struct {
+ #define UNAME_MACHINE "ppc64le"
+ #endif
+ #else
++#ifdef TARGET_WORDS_BIGENDIAN
+ #define UNAME_MACHINE "ppc"
++#else
++#define UNAME_MACHINE "ppcle"
++#endif
+ #endif
+ #define UNAME_MINIMUM_RELEASE "2.6.32"
+ 
+diff --git scripts/qemu-binfmt-conf.sh scripts/qemu-binfmt-conf.sh
+index 9f1580a..393943f 100755
+--- scripts/qemu-binfmt-conf.sh
++++ scripts/qemu-binfmt-conf.sh
+@@ -46,6 +46,10 @@ ppc_magic='\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x
+ ppc_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+ ppc_family=ppc
+ 
++ppcle_magic='\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14\x00'
++ppcle_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00'
++ppc_family=ppcle
++
+ ppc64_magic='\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15'
+ ppc64_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+ ppc64_family=ppc
+@@ -148,7 +152,7 @@ qemu_get_family() {
+     "Power Macintosh"|ppc64|powerpc|ppc)
+         echo "ppc"
+         ;;
+-    ppc64el|ppc64le)
++    ppc64el|ppc64le|ppcel|ppcle)
+         echo "ppcle"
+         ;;
+     arm|armel|armhf|arm64|armv[4-9]*l|aarch64)
+diff --git tests/tcg/configure.sh tests/tcg/configure.sh
+index e1b70e2..e07f5fe 100755
+--- tests/tcg/configure.sh
++++ tests/tcg/configure.sh
+@@ -59,6 +59,8 @@ fi
+ : $(cross_cc_mips="mips-linux-gnu-gcc")
+ : ${cross_cc_ppc="powerpc-linux-gnu-gcc"}
+ : ${cross_cc_cflags_ppc="-m32"}
++: ${cross_cc_ppcle="powerpcle-linux-gnu-gcc"}
++: ${cross_cc_cflags_ppcle="-m32"}
+ : ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"}
+ : ${cross_cc_ppc64le="powerpc64le-linux-gnu-gcc"}
+ : $(cross_cc_riscv64="riscv64-linux-gnu-gcc")
+-- 
+2.30.1
+
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index ae18a557078d..83e43ff5cbae 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
 # This package should be updated together with qemu-user-static
 pkgname=qemu
 version=5.2.0
-revision=1
+revision=2
 build_style=configure
 hostmakedepends="gettext pkg-config perl python3 automake libtool flex
  python3-Sphinx texinfo ninja"

From e567aa7935553d8e64d9bddd40f6bbd53c0f98ad Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 11 Mar 2021 22:35:33 +0200
Subject: [PATCH 3399/3458] mtpaint: update to 3.50.07.

---
 srcpkgs/mtpaint/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mtpaint/template b/srcpkgs/mtpaint/template
index 0f79101d2053..4b8174adf027 100644
--- a/srcpkgs/mtpaint/template
+++ b/srcpkgs/mtpaint/template
@@ -1,8 +1,8 @@
 # Template file for 'mtpaint'
 pkgname=mtpaint
-version=3.50.06
+version=3.50.07
 revision=1
-_commit=70306581a6212b728ab35fbbbbe72702863c5acb
+_commit=da57515755c9f44182e31eb316869f890c0db817
 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=1b984a486c3707d130a0dc4b9636e1f744bccac5b995daa6cda7451cd19a192e
+checksum=a2c37fd7b44ffbb455c0cd5c5616273829c315e5143d044c750807bdcf8971dc
 
 post_install() {
 	vdoc doc/vcode.t2t

From cf2ac24dd5ea83d1254f78d8c9d4710f229163ff Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Thu, 11 Mar 2021 18:12:00 +0100
Subject: [PATCH 3400/3458] iproute2: update to 5.11.0.

---
 srcpkgs/iproute2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 540ee3126912..66bdccf6024c 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.10.0
+version=5.11.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -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=a54a34ae309c0406b2d1fb3a46158613ffb83d33fefd5d4a27f0010237ac53e9
+checksum=c5e2ea108212b3445051b35953ec267f9f3469e1d5c67ac034ab559849505c54
 
 conf_files="
  /etc/iproute2/ematch_map

From 2957dfe083b8172fd3a2907f3db87270fe4dd89d Mon Sep 17 00:00:00 2001
From: prez <prez@national.shitposting.agency>
Date: Wed, 10 Mar 2021 15:54:07 +0100
Subject: [PATCH 3401/3458] ksshaskpass: add alternatives.

---
 srcpkgs/ksshaskpass/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index f4cc8c1edbd7..7d11c4d32500 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,7 +1,7 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
 version=5.21.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-devel kdoctools qt5-qmake
@@ -13,3 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=85527240fe0a2dd7da5e89740678b473b36f14959b201cddd50ef3c0890dd2fd
+alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 458aaa3c9e872c938063b893d55cf855d875e4c9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Mar 2021 21:47:05 +0100
Subject: [PATCH 3402/3458] qemu-user-static: rebuild with ppcle, add missing
 binfmts

---
 srcpkgs/qemu-user-static/template | 38 +++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 01d4d7acb563..bca3bd70967b 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,7 +2,7 @@
 # This package should be updated together with qemu
 pkgname=qemu-user-static
 version=5.2.0
-revision=1
+revision=2
 wrksrc="qemu-${version}"
 build_style=configure
 hostmakedepends="pkg-config automake python3 ninja"
@@ -14,10 +14,15 @@ homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
 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"
+_fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
+ microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k
+ ppc ppcle ppc64 ppc64le riscv32 riscv64 s390x sh4 sh4eb
+ sparc sparc32plus sparc64 x86_64 xtensa xtensaeb"
 
 _aarch64_magic='\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7'
 _aarch64_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+_aarch64_be_magic='\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7'
+_aarch64_be_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 _alpha_magic='\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90'
 _alpha_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
 _arm_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00'
@@ -26,12 +31,16 @@ _armeb_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x
 _armeb_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 _cris_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00'
 _cris_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
+_hppa_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x0f'
+_hppa_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 _i386_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00'
 _i386_mask='\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
 _m68k_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04'
 _m68k_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 _microblaze_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab'
 _microblaze_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+_microblazeel_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba'
+_microblazeel_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
 _mips_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
 _mips_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 _mipsel_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
@@ -40,12 +49,24 @@ _mips64_magic='\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\
 _mips64_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 _mips64el_magic='\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
 _mips64el_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xfe\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
+_mipsn32_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'
+_mipsn32_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+_mipsn32el_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'
+_mipsn32el_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
+_or1k_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x5c'
+_or1k_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 _ppc_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14'
 _ppc_mask='\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+_ppcle_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14\x00'
+_ppcle_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00'
 _ppc64_magic='\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15'
 _ppc64_mask='\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
-_ppc64abi32_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15'
-_ppc64abi32_mask='\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
+_ppc64le_magic='\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00'
+_ppc64le_mask='\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00'
+_riscv32_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'
+_riscv32_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
+_riscv64_magic='\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'
+_riscv64_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
 _s390x_magic='\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16'
 _s390x_mask='\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 _sh4_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00'
@@ -60,14 +81,17 @@ _sparc64_magic='\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00
 _sparc64_mask='\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 _x86_64_magic='\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00'
 _x86_64_mask='\xff\xff\xff\xff\xff\xfe\xfe\xfc\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
-_ppc64le_magic='\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00'
-_ppc64le_mask='\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00'
+_xtensa_magic='\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x5e\x00'
+_xtensa_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
+_xtensaeb_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x5e'
+_xtensaeb_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i386*) _omit="i386|x86_64" ;;
 	aarch64*) _omit="aarch64" ;;
 	armv*) _omit="arm" ;;
-	mips*) _omit="${XBPS_TARGET_MACHINE%-*}" ;;
+	ppc64le*) _omit="ppc64le|ppcle" ;;
+	ppc64*) _omit="ppc64|ppc" ;;
 	*) _omit="${XBPS_TARGET_MACHINE%-*}" ;;
 esac
 

From 2da058d594247149d0f613266cc33f82e9b79b75 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 11 Mar 2021 22:42:06 +0100
Subject: [PATCH 3403/3458] qem-user-static: remove dead code

---
 srcpkgs/qemu-user-static/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index bca3bd70967b..396eaeb30591 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -87,7 +87,7 @@ _xtensaeb_magic='\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x0
 _xtensaeb_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i386*) _omit="i386|x86_64" ;;
+	x86_64*) _omit="i386|x86_64" ;;
 	aarch64*) _omit="aarch64" ;;
 	armv*) _omit="arm" ;;
 	ppc64le*) _omit="ppc64le|ppcle" ;;

From 4fc13ab7143095be1ca526ba7bf2672ad1e6fa21 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Tue, 9 Mar 2021 11:23:20 -0700
Subject: [PATCH 3404/3458] mbuffer: update to 20210209

By ericonr:
- add checkdeps

Closes: #29352 [via git-merge-pr]
---
 srcpkgs/mbuffer/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index a3a17c73a84c..d3833b914ca4 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,13 +1,14 @@
 # Template file for 'mbuffer'
 pkgname=mbuffer
-version=20200929
-revision=2
+version=20210209
+revision=1
 build_style=gnu-configure
 makedepends="openssl-devel"
+checkdepends="tar"
 short_desc="Buffer data streams with many additional functions"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.maier-komor.de/mbuffer.html"
-distfiles="http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"
-checksum=53a6e3c14e9a049f18a09840653dd84f18e7ec7560f2dcf2b61c0ab5f0ead4e8
+homepage="https://www.maier-komor.de/mbuffer.html"
+distfiles="https://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"
+checksum=e81f2788e2621f20f848181ef2cb19ac6d12328691437f301574b253fd899a0c
 conf_files="/etc/mbuffer.rc"

From 7317af549f838741a81947ac5ee295654c81e9ac Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Fri, 12 Mar 2021 08:26:42 +1000
Subject: [PATCH 3405/3458] saml2aws: update to 2.28.4

---
 srcpkgs/saml2aws/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 89bfbcc6ebe3..640caeec61ac 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,6 +1,6 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
-version=2.28.2
+version=2.28.4
 revision=1
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
@@ -13,7 +13,7 @@ maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"
 homepage="https://github.com/Versent/saml2aws"
 distfiles="https://github.com/Versent/saml2aws/archive/v${version}.tar.gz"
-checksum=d20f1f8b82b3621dccab216ab763058fd28762836dae6cf650cf9e08b41120ac
+checksum=0a1bfd2ab51d5a9914969f5b2db19803809b27114fe127b669a8d90c543e1766
 
 post_install() {
 	vlicense LICENSE.md

From 4b4c437d0c54a2bd917f8fe2c0c6c4c312462df7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 10 Mar 2021 11:21:41 +0100
Subject: [PATCH 3406/3458] python3-boto3: update to 1.17.24.

---
 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 5ee2fe25e98b..04edad1080c0 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.17.17
+version=1.17.24
 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=1e72508628811ab2514cebee19a45c66b1ce11ac6bae5e69a867607dece8c454
+checksum=689d020a5e36aa1a51415d9c7d8a5c43cc13c7f4fb7caf2a94d6d87f11ceaa92
 
 post_install() {
 	vlicense LICENSE

From 96079d63a4a726ea60ffc247c9fcde1d5f01fb81 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 11 Mar 2021 16:27:07 +0100
Subject: [PATCH 3407/3458] linux5.10: update to 5.10.23.

---
 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 6ab3eee78065..3a480c0a5b00 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.22
+version=5.10.23
 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=245b16b532d67ca34805bd66790e3697d19269499d9b27056d73bfd0823163df
+checksum=f6e21c03ec6ff85b26d77c59fdab81e64707792a57593643307df192749edb6a
 python_version=3
 patch_args="-Np1"
 

From af9e22a7dc9c2a9d0351625b125c1479fab54cd7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Mar 2021 00:32:58 +0100
Subject: [PATCH 3408/3458] base-files: unblacklist some framebuffer drivers

these drivers don't have modesetting counterparts, and blacklisting
them means breaking graphics on systems that need them
---
 srcpkgs/base-files/files/blacklist.conf | 8 --------
 srcpkgs/base-files/template             | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/srcpkgs/base-files/files/blacklist.conf b/srcpkgs/base-files/files/blacklist.conf
index c19b95f47738..561645d4d67e 100644
--- a/srcpkgs/base-files/files/blacklist.conf
+++ b/srcpkgs/base-files/files/blacklist.conf
@@ -12,23 +12,15 @@
 blacklist i8xx_tco
 	
 # framebuffer drivers
-blacklist aty128fb
-blacklist atyfb
 blacklist radeonfb
-blacklist i810fb
 blacklist cirrusfb
 blacklist intelfb
 blacklist kyrofb
-blacklist i2c-matroxfb
 blacklist hgafb
 blacklist nvidiafb
 blacklist rivafb
-blacklist savagefb
-blacklist sstfb
 blacklist neofb
 blacklist tridentfb
-blacklist tdfxfb
-blacklist virgefb
 blacklist vga16fb
 	
 # ISDN - see bugs 154799, 159068
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 0683d19209c4..ff629498408b 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=10
+revision=11
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From 0244555adf34bd65afcbe3e2e5381b822529db70 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, 12 Mar 2021 07:52:48 +0700
Subject: [PATCH 3409/3458] geos: move pkgconfig to -devel

---
 srcpkgs/geos/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geos/template b/srcpkgs/geos/template
index 2e8a299b9d70..efc698ab3dc8 100644
--- a/srcpkgs/geos/template
+++ b/srcpkgs/geos/template
@@ -1,7 +1,7 @@
 # Template file for 'geos'
 pkgname=geos
 version=3.9.1
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="C++ port of the Java Topology Suite (JTS)"
 maintainer="Nyx70 <n.y.x@bluewin.ch>"
@@ -16,8 +16,9 @@ geos-devel_package() {
 	pkg_install() {
 		vmove usr/bin/geos-config
 		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/libgeos.so
+		vmove usr/lib/libgeos_c.so
 		vmove "usr/lib/*.a"
-		vmove "usr/lib/libgeos.so"
-		vmove "usr/lib/libgeos_c.so"
 	}
 }

From 29ad29b0b7f7cceee516fafc1381f696c7102959 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Mar 2021 01:47:41 +0100
Subject: [PATCH 3410/3458] linux4.4: update to 4.4.261

---
 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 dc7d3d86e6b6..83bfcc974680 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.260
+version=4.4.261
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version%.*}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/patch-${version}.xz"
 checksum="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
- 597944cea613d39ac4452f9ba073819e7d38e50e2cb113509ec5a5baae0f5459"
+ 7fe0edc77e6ba8d41035488402a2f05c58a64c101cb5556ea0f6e229dc306eed"
 skip_extraction="patch-${version}.xz"
 python_version=2 #unverified
 

From b6d9599f6ce34fea1147f286cdb637f78ecae87e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Mar 2021 01:48:19 +0100
Subject: [PATCH 3411/3458] linux4.9: update to 4.9.261

---
 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 f51dc1b74d64..b26655e58fb0 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.260
+version=4.9.261
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a
- 49497a2b9a268c9f19cb489ea9fc1a95ff17c97f8437e77c209518551a086c2b"
+ f808e190ab3d4b254b22c8b93936747c135a47c1a66d657af0e494bfbc125ca5"
 python_version=2 #unverified
 skip_extraction="patch-${version}.xz"
 patch_args="-Np1"

From 1d0b1b098427884483e3b796dc1e45537e3e5e81 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Mar 2021 01:48:59 +0100
Subject: [PATCH 3412/3458] linux4.14: update to 4.14.225

---
 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 a75047665615..974c394bb285 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.224
+version=4.14.225
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="http://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${version}.xz"
 checksum="f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
- a644325b768cd6dcdacdc753131a3d059b9839712e8e559eb88a37ac47d04f23"
+ b9afed9ae1f63b67fa01d17b3146f23a2ab5ef8ce458f3aec4d0b174553d0c52"
 skip_extraction="patch-${version}.xz"
 python_version=2 #unverified
 patch_args="-Np1"

From 15b64ba582c9af0d9271190bdc01fcf76bffc72a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Mar 2021 01:49:51 +0100
Subject: [PATCH 3413/3458] linux4.19: update to 4.19.180

---
 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 9af18aadb339..ffebf8584c05 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.179
+version=4.19.180
 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=499d31a33e763b4b4d5dacf96977cf875fd982363dfb96ca50bb8ada4d243e92
+checksum=1da85d7c838ddd4858cdbf76a00fa0a99bf11584c5658d739b6b55b6a0b7bb5f
 python_version=2 #unverified
 patch_args="-Np1"
 

From 44c4791ba99a4fafaac12ace6c7fdf671b1e2d0c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Mar 2021 01:50:39 +0100
Subject: [PATCH 3414/3458] linux5.4: update to 5.4.105

---
 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 b53ccb8ed47e..8564910a48cf 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.103
+version=5.4.105
 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=84e33a7cf1b58d2daafd9726841d648c73970d52879ada83b1cc19e60f179e8b
+checksum=244e4cd16184285df55ec5a9501daba011aa8b85c5527ee05eab4592e70fb8b6
 python_version=3
 patch_args="-Np1"
 

From 5c7224203af2c0b1ae8932789ab3176bd65efb09 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 12 Mar 2021 01:51:10 +0100
Subject: [PATCH 3415/3458] linux5.11: update to 5.11.6

---
 srcpkgs/linux5.11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 9654ab1a73fd..b385fba645df 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.4
+version=5.11.6
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- d509c3900cf02a8d9f1692ffcc9d4a27d2b515ad50c0a231d5d00a125e9bd7a8"
+ 0306b61e431413af6991bb0d8ae0f1b72b508cc36380a225399030049d961ea4"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 9e4c399d7a6a033a2920d3da26090b065556c316 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 10 Mar 2021 09:41:47 +0100
Subject: [PATCH 3416/3458] glfw: update to 3.3.3.

---
 srcpkgs/glfw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glfw/template b/srcpkgs/glfw/template
index 85fca269c75f..9db52afc0e09 100644
--- a/srcpkgs/glfw/template
+++ b/srcpkgs/glfw/template
@@ -1,7 +1,7 @@
 # Template file for 'glfw'
 # update together with glfw-wayland
 pkgname=glfw
-version=3.3.2
+version=3.3.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=ec5764961bb9262d5a5c24523b1522d121d7a7b06ce2affe921c6d438324cc8d
+checksum=2daed24366d729ea78a3aa0dfbc268a786ac43903f2990d8a215fab6b4dc154b
 
 glfw-devel_package() {
 	depends="glfw>=${version}_${revision} $makedepends"

From 74da639160bb688d47f2138362f210add54633ee Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 10 Mar 2021 09:41:49 +0100
Subject: [PATCH 3417/3458] glfw-wayland: update to 3.3.3.

---
 srcpkgs/glfw-wayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template
index d05dae113b9d..ca283a9ddc7a 100644
--- a/srcpkgs/glfw-wayland/template
+++ b/srcpkgs/glfw-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'glfw-wayland'
 pkgname=glfw-wayland
-version=3.3.2
+version=3.3.3
 revision=1
 wrksrc=glfw-${version}
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/glfw/glfw-${version}.tar.bz2"
-checksum=ec5764961bb9262d5a5c24523b1522d121d7a7b06ce2affe921c6d438324cc8d
+checksum=2daed24366d729ea78a3aa0dfbc268a786ac43903f2990d8a215fab6b4dc154b
 provides="glfw-${version}_${revision}"
 replaces="glfw>=0"
 

From 8d42e874e73af7a9400a2a92cf26c7af1981fff6 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 18 Feb 2021 16:15:04 +0100
Subject: [PATCH 3418/3458] New package: python3-pytest-flake8-1.0.7

---
 srcpkgs/python3-pytest-flake8/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-flake8/template

diff --git a/srcpkgs/python3-pytest-flake8/template b/srcpkgs/python3-pytest-flake8/template
new file mode 100644
index 000000000000..701d19fad336
--- /dev/null
+++ b/srcpkgs/python3-pytest-flake8/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pytest-flake8'
+pkgname=python3-pytest-flake8
+version=1.0.7
+revision=1
+wrksrc=pytest-flake8-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest flake8"
+checkdepends="$depends"
+short_desc="Pytest plugin to check FLAKE8 requirements"
+maintainer="Paper <paper@tilde.institute>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/pytest-flake8/"
+changelog="https://raw.githubusercontent.com/tholo/pytest-flake8/master/CHANGELOG"
+distfiles="${PYPI_SITE}/p/pytest-flake8/pytest-flake8-${version}.tar.gz"
+checksum=f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b
+
+post_install() {
+	vlicense LICENSE
+}

From 2ee8edaa7ebb8c240644fc02b872f20cb2c4591e Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Tue, 2 Mar 2021 20:53:15 +0100
Subject: [PATCH 3419/3458] python3-numpy-stl: add python3-pytest-flake8 dep

---
 srcpkgs/python3-numpy-stl/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/python3-numpy-stl/template b/srcpkgs/python3-numpy-stl/template
index 83756860cdae..42fa5e4ad932 100644
--- a/srcpkgs/python3-numpy-stl/template
+++ b/srcpkgs/python3-numpy-stl/template
@@ -8,7 +8,7 @@ build_helper="numpy"
 hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel"
 depends="python3-setuptools python3-numpy python3-utils"
-checkdepends="$depends python3-pytest-cov python3-docutils"
+checkdepends="$depends python3-pytest-cov python3-pytest-flake8 python3-docutils"
 short_desc="Python3 library to make working with STL files fast and easy"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
@@ -22,10 +22,6 @@ pre_build() {
 	sed -i '/setup_requires=/d' setup.py
 }
 
-pre_check() {
-	vsed -i pytest.ini -e s/--flake8//
-}
-
 pkg_install() {
 	vlicense LICENSE
 }

From b2b392a74ca54349509e28656e0a66b85318d238 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:16:59 -0500
Subject: [PATCH 3420/3458] protobuf26: update to 3.15.6.

---
 srcpkgs/protobuf26/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf26/template
index 7923c0ed6f18..e21142f3fac8 100644
--- a/srcpkgs/protobuf26/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf26'
 pkgname=protobuf26
-version=3.15.5
+version=3.15.6
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=bc3dbf1f09dba1b2eb3f2f70352ee97b9049066c9040ce0c9b67fb3294e91e4b
+checksum=65e020a42bdab44a66664d34421995829e9e79c60e5adaa08282fd14ca552f57
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"

From 9508392dd21f83f655d5cc64d3b29a50057b66f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:17:03 -0500
Subject: [PATCH 3421/3458] python3-protobuf: update to 3.15.6.

---
 srcpkgs/python3-protobuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index ed4358613cf7..f987b0238757 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.15.5
+version=3.15.6
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=be8a929c6178bb6cbe9e2c858be62fa08966a39ae758a8493a88f0ed1efb6097
+checksum=2b974519a2ae83aa1e31cff9018c70bbe0e303a46a598f982943c49ae1d4fcd3
 
 build_options="cppext"
 build_options_default="cppext"

From 12fd9c66ac72907492fb05239c01f8483162cb6f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:17:37 -0500
Subject: [PATCH 3422/3458] python3-hypothesis: update to 6.8.0.

---
 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 49e37d638f66..7d4aeac554c8 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.6.0
+version=6.8.0
 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=77a22432d69a821084857b81ab899e51d38f8ed43eb920595db570a128a96f55
+checksum=91b92c9d74ca1dbfab0f4e7d670975c9cc069767fcc7bdbcd377fed0560601e8
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From ce19fd085157ffd38ac16b5e653f88221524a1df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:18:18 -0500
Subject: [PATCH 3423/3458] python3-prompt_toolkit: update to 3.0.17.

---
 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 5cd63f4abe63..85cf23c3f708 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.16
+version=3.0.17
 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=0fa02fa80363844a4ab4b8d6891f62dd0645ba672723130423ca4037b80c1974
+checksum=9397a7162cf45449147ad6042fa37983a081b8a73363a5253dd4072666333137
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From 1bc625733049b2893cc7e6c32bfc62d31a9c4f5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:18:55 -0500
Subject: [PATCH 3424/3458] python3-pytools: update to 2021.2.

---
 srcpkgs/python3-pytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 27159ef8f6ee..146866452004 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2021.1.2
+version=2021.2
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="X11"
 homepage="https://pypi.org/project/pytools"
 distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz"
-checksum=551b4add9547b85bfad68ff3f13930c3087644f5e24e84b99c82301c302d08d6
+checksum=50f2d5b2196a18950fa1397d5ad7ea52daa5985e6196bfd06ba608a7caf93d07
 
 post_install() {
 	vlicense LICENSE

From fd9acf2694d4b15da2bc60fd287dff7e10e4b6b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:19:22 -0500
Subject: [PATCH 3425/3458] python3-pyopencl: update to 2021.1.3.

---
 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 ee439a881aa6..8c7e13fbee2a 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.2
+version=2021.1.3
 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=18871bc80c5a94869521189cf2c04d72c88367a441a9a033f72f66792ac33d29
+checksum=a428683690f66383cb59c675c2991ced45f0c9b722373e53a643c1b75de89c12
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From cbdf757075deae41b2f04288ab5fb9f9483decc6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:20:23 -0500
Subject: [PATCH 3426/3458] python3-setuptools-rust: update to 0.12.1.

---
 srcpkgs/python3-setuptools-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 5704a4a501f4..7933cc5ce784 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=0.12.0
+version=0.12.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ 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=faacca4b85d5f43e9e3836418e1cbf9ed2576a27978b522f3d04513ef052cec5
+checksum=647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e
 
 do_check() {
 	echo "Tests have unpackaged dependencies; skipping"

From bc15a0a2632368e24a8d76235b37747e4988b98d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:39:13 -0500
Subject: [PATCH 3427/3458] python3-setuptools: update to 54.1.1.

---
 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 c77068ebc397..07655e0d2f3c 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=54.0.0
+version=54.1.1
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
@@ -12,7 +12,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=34efee89c4c879204f5739ec6d9d3635195b0b7d2b51e25c9261a327367ec5ff
+checksum=1ce82798848a978696465866bb3aaab356003c42d6143e1111fcf069ac838274
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From 49799c263f146d76217888138ef943565a72f347 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:39:38 -0500
Subject: [PATCH 3428/3458] tox: update to 3.23.0.

---
 srcpkgs/tox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 8f0aada772c5..b4d6380c5e67 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.22.0
+version=3.23.0
 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=ed1e650cf6368bcbc4a071eeeba363c480920e0ed8a9ad1793c7caaa5ad33d49
+checksum=05a4dbd5e4d3d8269b72b55600f0b0303e2eb47ad5c6fe76d3576f4c58d93661
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script

From 0ba37051c6c5d249f545f3b4205b027770e307e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:39:59 -0500
Subject: [PATCH 3429/3458] python3-acme: update to 1.13.0.

---
 srcpkgs/python3-acme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 0ee9596cc13d..31f97a8d7ea3 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
-version=1.12.0
+version=1.13.0
 revision=1
 wrksrc="acme-${version}"
 build_style=python3-module
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/certbot"
 distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz"
-checksum=aa363474d50e9fdda27acb8b1aa7efb26fecc5650e02039a0de3a3f0e696c2f2
+checksum=6b4257dfd6a6d5f01e8cd4f0b10422c17836bed7c67e9c5b0a0ad6c7d651c088

From 05b083a273d4cc128291226b1c0d2d414c092085 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:40:59 -0500
Subject: [PATCH 3430/3458] certbot: update to 1.13.0.

---
 srcpkgs/certbot/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index e5cde381a41c..2642bb26b35e 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.12.0
+version=1.13.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,8 +14,4 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz"
-checksum=5ee738773479bcb7794e43fedd2415acc0969b75bdd2a21f451e3bff9d99df59
-
-do_check() {
-	python3 -m pytest
-}
+checksum=64cf41b57df7667d9d849fcaa9031a4f151788246733d1f4c3f37a5aa5e2f458

From ebe855c328c6c8dc358ced7772576ba990eb0932 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:41:02 -0500
Subject: [PATCH 3431/3458] certbot-nginx: update to 1.13.0.

---
 srcpkgs/certbot-nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template
index 0210edcf90ac..189735143579 100644
--- a/srcpkgs/certbot-nginx/template
+++ b/srcpkgs/certbot-nginx/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-nginx'
 pkgname=certbot-nginx
-version=1.12.0
+version=1.13.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-nginx/certbot-nginx-${version}.tar.gz"
-checksum=3fb6a55290d37ad466681a89a85ceca4c4026fdd8702f3010b87a74266a6fe7b
+checksum=9e972cc19c0fa9e5b7863da0423b156fbfb5623fd30b558fd2fd6d21c24c0b08

From a26baa922c9e4bf1136ed3b8b3911d2c1f980311 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 12 Mar 2021 08:41:05 -0500
Subject: [PATCH 3432/3458] certbot-apache: update to 1.13.0.

---
 srcpkgs/certbot-apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template
index 95d03bda96ba..f4a4e287c1c1 100644
--- a/srcpkgs/certbot-apache/template
+++ b/srcpkgs/certbot-apache/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-apache'
 pkgname=certbot-apache
-version=1.12.0
+version=1.13.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik S. <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-apache/certbot-apache-${version}.tar.gz"
-checksum=e5679b40d99bd241f4fcd9fe44b73e6e25ccc969a617131ff6ebc90d562a49f2
+checksum=4b5a16e80c1418e2edc05fc2578f522fb24974b2c13eb747cdfeef69e5bd5ae1

From b0a796a1f8664787c9561708cff629df99a6d893 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 12 Mar 2021 12:07:11 +0200
Subject: [PATCH 3433/3458] sublime-merge-bin: update to 2049.

---
 srcpkgs/sublime-merge-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index 3a1604294e23..3eb3184ee6ef 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2047
+version=2049
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=2ad671b58d5a00f8ccef4bcc6c2b4e119a4b16c4b79b448bf03775e822e4400d
+checksum=bbe44b5c128f8e86582312e167e7fbf57be223b58290ac02c4c0c606c108ffbd
 _license_checksum=0cf0c605c296198b1b176dcb56343e7eb4f297fdcc7ec64dc347bcabf48fc4e8
 nopie=yes
 repository=nonfree

From 0f16423738d3b61724b1d01f14e1b4051e77a68b Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Mon, 1 Mar 2021 10:17:05 +0100
Subject: [PATCH 3434/3458] isl: update to 0.23 (with soname; fixing license
 and homepage)

---
 common/shlibs        |  2 +-
 srcpkgs/isl/template | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 42f37d8a08bc..86567af2ad0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1100,7 +1100,7 @@ libfltk_images.so.1.3 fltk-1.3.0_1
 libspectre.so.1 libspectre-0.2.6_1
 libsratom-0.so.0 sratom-0.4.0_1
 libpwquality.so.1 libpwquality-1.1.1_1
-libisl.so.10 isl-0.10_1
+libisl.so.23 isl-0.23_1
 libisl.so.19 isl15-0.19_1
 libcloog-isl.so.4 cloog-0.18.1_1
 librtmp.so.1 librtmp-2.4.20161210_9
diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template
index 9a79dc216a14..d8a3cbe082a1 100644
--- a/srcpkgs/isl/template
+++ b/srcpkgs/isl/template
@@ -1,16 +1,16 @@
 # Template file for 'isl'
 pkgname=isl
-version=0.12.2
-revision=2
+version=0.23
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 makedepends="gmp-devel"
 short_desc="Integer Set Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://freecode.com/projects/isl"
-license="LGPL-2.1"
+license="MIT"
+homepage="http://isl.gforge.inria.fr"
 distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2"
-checksum=f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4
+checksum=c58922c14ae7d0791a77932f377840890f19bc486b653fa64eba7f1026fb214d
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS="-I${XBPS_MASTERDIR}/usr/include"
@@ -18,12 +18,13 @@ if [ -z "$CHROOT_READY" ]; then
 fi
 
 post_install() {
+	vlicense LICENSE
 	# Remove gdb python files.
 	rm -f ${DESTDIR}/usr/lib/*.py
 }
 
 isl-devel_package() {
-	depends="gmp-devel isl>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 678d2e521dfae72cfb967550cfed90640f163580 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolopiazzalunga@gmail.com>
Date: Mon, 1 Mar 2021 10:19:55 +0100
Subject: [PATCH 3435/3458] cloog: update to 0.20.0, change distfiles origin

---
 srcpkgs/cloog/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template
index 13aa6cad577d..18a84032fdd4 100644
--- a/srcpkgs/cloog/template
+++ b/srcpkgs/cloog/template
@@ -1,7 +1,7 @@
 # Template file for 'cloog'
 pkgname=cloog
-version=0.18.4
-revision=2
+version=0.20.0
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--with-isl=system --with-gmp=system --with-gmp-exec-prefix=${XBPS_CROSS_BASE}"
@@ -10,8 +10,8 @@ short_desc="Library that generates loops for scanning polyhedra"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.bastoul.net/cloog/"
-distfiles="http://www.bastoul.net/cloog/pages/download/cloog-$version.tar.gz"
-checksum=325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e
+distfiles="https://github.com/periscop/cloog/releases/download/cloog-${version}/cloog-${version}.tar.gz"
+checksum=835c49951ff57be71dcceb6234d19d2cc22a3a5df84aea0a9d9760d92166fc72
 
 cloog-devel_package() {
 	depends="${makedepends} cloog>=${version}_${revision}"

From cb10113660ed0d12c23cc463591341663288b513 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 12 Mar 2021 12:20:20 +0200
Subject: [PATCH 3436/3458] goodvibes: update to 0.6.3.

---
 srcpkgs/goodvibes/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 554c9f035290..44ac0bf3836a 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,7 +1,7 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.6.2
-revision=2
+version=0.6.3
+revision=1
 wrksrc="goodvibes-v${version}"
 build_style=meson
 hostmakedepends="appstream-glib desktop-file-utils pkg-config gettext"
@@ -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=01eb5dd4853e0f38b159b7f46d87507b8c524cb4a29df899961684873eab4fdc
+checksum=8c22aedf839518fa4d4a82bfab4c6efee9c3054a4bc0d3f1bb1a7434ce843c5c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"

From 244f942581c567f07c35fdeb87857b7376b7c5ff Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 17 Jan 2021 15:25:52 +0100
Subject: [PATCH 3437/3458] dhcpcd: update to 9.4.0

---
 srcpkgs/dhcpcd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 599ca8770188..e651bd019067 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=9.3.4
-revision=2
+version=9.4.0
+revision=1
 build_style=configure
 make_check_target=test
 configure_args="
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/dhcpcd"
 distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=5c823a0b981b52e7e0fd3183ae220422d6fcc3aa511af31dcb1a7ee6cb0f1c39
+checksum=41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513
 lib32disabled=yes
 conf_files=/etc/dhcpcd.conf
 

From e8baabc012e498a2e3cf2e3dd91db28564d39d88 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Mar 2021 13:49:13 +0100
Subject: [PATCH 3438/3458] fio: update to 3.26.

---
 srcpkgs/fio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index 05c982420830..e15691e0b3dd 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,6 +1,6 @@
 # Template file for 'fio'
 pkgname=fio
-version=3.25
+version=3.26
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=d8157676bc78a50f3ac82ffc6f80ffc3bba93cbd892fc4882533159a0cdbc1e8
+checksum=8bd6987fd9b8c2a75d3923661566ade50b99f61fa4352148975e65577ffa4024
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in

From 546a364f1bb77a39cce58fc34a975b51add88280 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Mar 2021 13:51:29 +0100
Subject: [PATCH 3439/3458] kubecfg: update to 0.18.0.

---
 srcpkgs/kubecfg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index b315f7246df7..d2c94d74503c 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,6 +1,6 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
-version=0.17.0
+version=0.18.0
 revision=1
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
@@ -10,4 +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=3e98d4d328b2265b4105c77fb83d2af78cec7e10adc8964b7fd45bade8dcdb7d
+checksum=710cedf1604ab8d7880cc4ea0e171bc8785067b23e8610665fd6b18de8a15793

From 869e47b8f849f2d7b04e1340c131ab739bc86dc4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Mar 2021 13:52:03 +0100
Subject: [PATCH 3440/3458] netpbm: update to 10.93.02.

---
 srcpkgs/netpbm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 50caefdece5d..83460a517728 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,9 +1,9 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.93.01
+version=10.93.02
 revision=1
-_githash=7f8184372a7db4ad9ac7b30ce892b61e3d375dac
+_githash=b722c09c991306f5ce77a310195e9b1262547ef1
 _githash_guide=c3ea5d343ccdc2945b6ee3bc157af66f89433fd9
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
@@ -16,7 +16,7 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="23cba2a798563d618380432c603bd8efa0440148cfcf8edca2f5fb09526c0e42
+checksum="a2f6613baabd8c7d8c421d5ef95984fbd62bcc10c42f60ac48ec347f83fcbeb4
  73e83e94b4089d11d2b349b66b6edae801ff24f6a8b9d2f8ea3beb7a9cdceddf"
 
 post_extract() {

From 6f9857396ad75497f7aafb5ecf52ed9602b0cc35 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Mar 2021 13:52:21 +0100
Subject: [PATCH 3441/3458] passwdqc: update to 2.0.1.

---
 srcpkgs/passwdqc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template
index 11c67086cc15..5df4fb5d68d1 100644
--- a/srcpkgs/passwdqc/template
+++ b/srcpkgs/passwdqc/template
@@ -1,6 +1,6 @@
 # Template file for 'passwdqc'
 pkgname=passwdqc
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=gnu-makefile
 make_install_args="SHARED_LIBDIR=/usr/lib SECUREDIR=/usr/lib/security"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause,0BSD"
 homepage="http://www.openwall.com/passwdqc/"
 distfiles="http://www.openwall.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a57ae2711275d81e301bcebe531fffc100f583051e1154c73f2d9cd9ab1e4c94
+checksum=5637e2c72b2738128f378b350f69253cbd5ebeffa7b550820640d1ae2638a868
 
 do_build() {
 	make ${makejobs} CC="$CC" LD="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \

From 613551494f91af981b61a5b14478441a807a9a30 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Mar 2021 19:54:53 +0100
Subject: [PATCH 3442/3458] msmtp: update to 1.8.15.

---
 srcpkgs/msmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 5886fc8229c3..f0cc0849b7df 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'msmtp'
 pkgname=msmtp
-version=1.8.14
+version=1.8.15
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/msmtp/"
 distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=d56f065d711486e9c234618515a02a48a48dab4051b34f3e108fbecb6fb773b4
+checksum=2265dc639ebf2edf3069fffe0a3bd76749f8b58f4001d5cdeae19873949099ce
 
 build_options="idn sasl gnome msmtpd"
 build_options_default="idn sasl"

From 2d7dd0dc255be20d108713bcb8b1c369a7bc99d8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Mar 2021 19:56:27 +0100
Subject: [PATCH 3443/3458] mpop: update to 1.4.13.

---
 srcpkgs/mpop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template
index 0ef398c11a44..c54a96ae848e 100644
--- a/srcpkgs/mpop/template
+++ b/srcpkgs/mpop/template
@@ -1,6 +1,6 @@
 # Template file for 'mpop'
 pkgname=mpop
-version=1.4.12
+version=1.4.13
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/mpop/"
 distfiles="https://marlam.de/mpop/releases/mpop-${version}.tar.xz"
-checksum=5f6355b52d9c360619623a40c66c1a5571e393b43fe58375c0de35429ac3480a
+checksum=b3498466c65b650add1a6e79209b27ba86375673a45c96a5927bed685a327dc1

From 54bee3b38a1997e04a9a4094c4b0230e8b94ae45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Mar 2021 15:04:12 -0300
Subject: [PATCH 3444/3458] network-manager-applet: fix crash in connection
 editor.

---
 .../patches/fix-crash.patch                   | 52 +++++++++++++++++++
 srcpkgs/network-manager-applet/template       |  3 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/network-manager-applet/patches/fix-crash.patch

diff --git a/srcpkgs/network-manager-applet/patches/fix-crash.patch b/srcpkgs/network-manager-applet/patches/fix-crash.patch
new file mode 100644
index 000000000000..3c0fd7d63ed3
--- /dev/null
+++ b/srcpkgs/network-manager-applet/patches/fix-crash.patch
@@ -0,0 +1,52 @@
+From da6b2bb94250d8ffb218caf921c9df8c394372d4 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Mon, 15 Feb 2021 14:15:20 +0100
+Subject: [PATCH] editor: fix crash when evaluating secondaries
+
+The compound literal goes out of scope when the enclosing block
+ends. Replace it with an array on the stack.
+
+ 0  __strlen_avx2 () at ../sysdeps/x86_64/multiarch/strlen-avx2.S:65
+ 1  0x00007ffff73eba44 in g_strdup (str=0x6c15375cc4e4b600 <error: Cannot access memory at address 0x6c15375cc4e4b600>)
+ 2  0x00007ffff73ed42d in g_strdupv (str_array=0x7fffffffc520) at ../../../glib/gstrfuncs.c:2552
+ 3  0x00007ffff74b9b70 in boxed_proxy_collect_value (value=0x7fffffffc350, n_collect_values=<optimized out>, collect_values=<optimized out>, collect_flags=<optimized out>)
+ 4  0x00007ffff74c49fc in g_object_set_valist (object=0x555555a02780 [NMSettingConnection], first_property_name=<optimized out>, var_args=0x7fffffffc400)
+ 5  0x00007ffff74c52fc in g_object_set (_object=0x555555a02780, first_property_name=first_property_name@entry=0x5555555a3471 "secondaries")
+ 6  0x0000555555580ff8 in ui_to_setting (self=<optimized out>) at ../src/connection-editor/page-general.c:421
+ 7  ce_page_validate_v (page=<optimized out>, connection=<optimized out>, error=0x7fffffffc5c0) at ../src/connection-editor/page-general.c:450
+ 8  0x0000555555569313 in ce_page_validate (self=0x555555898f20 [CEPageGeneral], connection=connection@entry=0x5555557fe840, error=error@entry=0x7fffffffc5c0) at ../src/connection-editor/ce-page.c:161
+ 9  0x000055555557343b in connection_editor_validate (editor=0x555555a2a840 [NMConnectionEditor]) at ../src/connection-editor/nm-connection-editor.c:357
+ [...]
+
+Fixes: 768eb7dfa974 ("c-e: fix initializing drop-down list for connection.secondaries")
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/issues/125
+---
+ src/connection-editor/page-general.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c
+index 358582ff..794407d6 100644
+--- a/src/connection-editor/page-general.c
++++ b/src/connection-editor/page-general.c
+@@ -392,7 +392,7 @@ static void
+ ui_to_setting (CEPageGeneral *self)
+ {
+ 	CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self);
+-	const char *const*secondaries = NULL;
++	const char *secondaries[2] = { NULL, NULL };
+ 	gs_free char *secondaries_uuid = NULL;
+ 	GtkTreeIter iter;
+ 	gboolean autoconnect = FALSE, everyone = FALSE;
+@@ -415,7 +415,7 @@ ui_to_setting (CEPageGeneral *self)
+ 	    && gtk_combo_box_get_active_iter (priv->dependent_vpn, &iter)) {
+ 		gtk_tree_model_get (GTK_TREE_MODEL (priv->dependent_vpn_store), &iter,
+ 		                                    COL_UUID, &secondaries_uuid, -1);
+-		secondaries = (const char *[]) { secondaries_uuid, NULL };
++		secondaries[0] = secondaries_uuid;
+ 	}
+ 
+ 	g_object_set (G_OBJECT (priv->setting), NM_SETTING_CONNECTION_SECONDARIES, secondaries, NULL);
+-- 
+GitLab
+
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index be2ecd7c2e88..6c5a37d1429f 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=1.20.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dselinux=false"
 hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config"
@@ -17,4 +17,5 @@ homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=8ab205385d8380e3b7e4994b46f6ff009c453e3430bd2b2853c74263f69a5253
+patch_args=-Np1
 lib32disabled=yes

From 23509ec29ae531d1243411737bf54d758ba6b362 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 10 Mar 2021 22:01:35 +0100
Subject: [PATCH 3445/3458] xbps-src: simplify dbulk-dump output

* List dependencies of subpackages as part of the source packages
  dependencies, knowing the subpackage they are coming from does
  not matter to a build scheduler as long as xbps-src requires
  those to exist in the same way to main depends= have to exist.
* Resolve virtual? packages through existing means in xbps-src to
  avoid duplicating and possibly diverting from xbps-src's
  behaviour in tools that use dbulk-dump.
* Filter out dependencies on the template itself from sub packages,
  this matches the xbps-src behaviour and there is no need to
  have to duplicate logic for this into the scheduling tool.
* Error out on archs= restrictions as we do already on broken=
  and nocross=, there shouldn't be the need to discover archs=
  restrictions when attempting to build the package.
---
 common/xbps-src/shutils/build_dependencies.sh |  5 ++---
 common/xbps-src/shutils/pkgtarget.sh          |  2 +-
 xbps-src                                      | 21 +++++++------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index ebf5a0bc1316..d60ee556de24 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -32,19 +32,18 @@ setup_pkg_depends() {
             if [ -z "$foo" ]; then
                 msg_error "$pkgver: failed to resolve virtual dependency for '$j' (missing from etc/virtual)\n"
             fi
-            _deps+="$foo "
+            [[ $out ]] && echo "$foo"
         else
             foo="$($XBPS_UHELPER_CMD getpkgdepname ${_depname} 2>/dev/null)"
             if [ -z "$foo" ]; then
                 foo="$($XBPS_UHELPER_CMD getpkgname ${_depname} 2>/dev/null)"
                 [ -z "$foo" ] && foo="${_depname}"
             fi
-            _deps+="$foo "
+            [[ $out ]] && echo "$foo"
         fi
         run_depends+="${_depname} "
     done
 
-    [[ $out && $_deps ]] && echo "$_deps"
     return 0
 }
 
diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index 6c6f03ff726f..314dc5aeabe2 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -21,7 +21,7 @@ check_pkg_arch() {
             esac
         done
         if [ -z "$nonegation" -a -n "$match" ] || [ -n "$nonegation" -a -z "$match" ]; then
-            msg_red "$pkgname: this package cannot be built for ${_arch}.\n"
+            msg_red "${pkgname}-${version}_${revision}: this package cannot be built for ${_arch}.\n"
             exit 2
         fi
     fi
diff --git a/xbps-src b/xbps-src
index a488ed3f849e..e2ecbf36e4f9 100755
--- a/xbps-src
+++ b/xbps-src
@@ -891,33 +891,28 @@ case "$XBPS_TARGET" in
         ;;
     dbulk-dump)
         read_pkg
+        check_pkg_arch "$XBPS_CROSS_BUILD"
         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
+        for x in hostmakedepends makedepends; do
             arr=(${!x})
             if [[ ${#arr} -gt 0 ]]; then
                 printf '%s:\n' "$x"
                 printf ' %s\n' "${arr[@]}"
             fi
         done
+        _cleandeps=$(setup_pkg_depends "" 1 1 | { grep -vF "$(printf "%s\n" $pkgname $subpackages)" || :; } | sort -u) || exit 1
+        if [[ $_cleandeps ]]; then
+                printf 'depends:\n'
+                printf ' %s\n' $_cleandeps
+        fi
         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
+            printf ' %s\n' $subpackages
         fi
         ;;
     show-options)

From 14e8ae621aca317e3e81d0d5829dac777e1c9244 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, 13 Mar 2021 08:21:28 +0700
Subject: [PATCH 3446/3458] kubecfg: broken on 32-bit system

---
 srcpkgs/kubecfg/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index d2c94d74503c..56b00292d8b4 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -11,3 +11,7 @@ license="Apache-2.0"
 homepage="https://github.com/bitnami/kubecfg"
 distfiles="https://github.com/bitnami/kubecfg/archive/v${version}.tar.gz"
 checksum=710cedf1604ab8d7880cc4ea0e171bc8785067b23e8610665fd6b18de8a15793
+
+if [ "$XBPS_TARGET_WORDSIZE" != 64 ]; then
+	broken="vendor/github.com/google/go-jsonnet/builtins.go:865:82: constant -9223372036854775808 overflows int"
+fi

From 0316b5455f1d61302b8a1d70f1464d3ea2ff99b1 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, 12 Mar 2021 22:21:27 +0700
Subject: [PATCH 3447/3458] apostrophe: update to 2.4.

---
 srcpkgs/apostrophe/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 4a60c9a66dcb..c3d1c8e56e05 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,6 +1,6 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.3
+version=2.4
 revision=1
 wrksrc=apostrophe-v$version
 build_style=meson
@@ -9,8 +9,8 @@ hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
 depends="python3-regex python3-pypandoc gspell iso-codes libhandy1"
 short_desc="GTK+ based distraction free Markdown editor"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/somas/apostrophe"
 distfiles="$homepage/-/archive/v$version/apostrophe-v$version.tar.bz2"
-checksum=329138535cd52fc2436ea36c04af0cbb618b83391398b6f374dd994403fdfbd7
+checksum=63bdcca0887e678e9fee368470b3620a697655f18f7e0e65870890e1b8202a3a

From f44ef34cca5fcc9308fbd9a05c63585522110ed9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 13 Mar 2021 03:25:36 +0100
Subject: [PATCH 3448/3458] cross-profiles: fix qemu name for ppcle

---
 common/cross-profiles/ppcle-musl.sh | 2 +-
 common/cross-profiles/ppcle.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/cross-profiles/ppcle-musl.sh b/common/cross-profiles/ppcle-musl.sh
index 4c69ceb140a9..2ba308f224d5 100644
--- a/common/cross-profiles/ppcle-musl.sh
+++ b/common/cross-profiles/ppcle-musl.sh
@@ -1,7 +1,7 @@
 # Cross build profile for little endian PowerPC.
 
 XBPS_TARGET_MACHINE="ppcle-musl"
-XBPS_TARGET_QEMU_MACHINE="ppc"
+XBPS_TARGET_QEMU_MACHINE="ppcle"
 XBPS_CROSS_TRIPLET="powerpcle-linux-musl"
 XBPS_CROSS_CFLAGS="-mcpu=power8 -mtune=power9"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/common/cross-profiles/ppcle.sh b/common/cross-profiles/ppcle.sh
index c4ece96b7bf9..3e5230b194ef 100644
--- a/common/cross-profiles/ppcle.sh
+++ b/common/cross-profiles/ppcle.sh
@@ -1,7 +1,7 @@
 # Cross build profile for little endian PowerPC.
 
 XBPS_TARGET_MACHINE="ppcle"
-XBPS_TARGET_QEMU_MACHINE="ppc"
+XBPS_TARGET_QEMU_MACHINE="ppcle"
 XBPS_CROSS_TRIPLET="powerpcle-linux-gnu"
 XBPS_CROSS_CFLAGS="-mcpu=power8 -mtune=power9"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"

From 60150c61d5d1a0e05f4b34a87281526c4f80c532 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Mar 2021 14:14:45 +0100
Subject: [PATCH 3449/3458] stress-ng: update to 0.12.05.

---
 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 efee65e76d9c..23bf4a46e2e2 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.04
+version=0.12.05
 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=b4e34bda8db4ed37e33b7a861bc06ad77cbbd234d63236da2cb58f02e3f3218e
+checksum=af7779aee38e6d94726ed7d5cf36384a64d50c86e42fff89c141d8609913f425

From c28801643858bf04119fd051c2e64a7bdcbe8957 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 13 Mar 2021 18:04:58 +0100
Subject: [PATCH 3450/3458] simple-scan: update to 3.38.5.

---
 srcpkgs/simple-scan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index 0e5b3c9a2cc2..b9df63878f87 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,6 +1,6 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=3.38.2
+version=3.38.5
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a88d80729682888649cdfcdfa8692b0a34acde569dc080888f279afc3a9c4d0b
+checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d

From 473df9bbf63bbab2308ec111682ff2d415d6cf74 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 13 Mar 2021 20:46:13 +0100
Subject: [PATCH 3451/3458] ImageMagick: update to 7.0.11.3.

---
 srcpkgs/ImageMagick/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 2e59b3052ea2..6a721b174560 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 _majorver=7.0.11
-_patchver=1
+_patchver=3
 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=c04992429200d1168d6f45e2615e8ad6939dddb8f7559ebda669bcac66bc3165
+checksum=ceef1e81f4ab8ebfe9e61c494b8355c1b32bbb262aa6ec12b737c607e3078a40
 
 subpackages="libmagick libmagick-devel"
 

From 661e2d392de3df5fb8cac03f627d7b13c68348e9 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 13 Mar 2021 20:50:45 +0100
Subject: [PATCH 3452/3458] ImageMagick6: update to 6.9.12.3.

---
 srcpkgs/ImageMagick6/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 341bdf824bea..fe0eeba05f5c 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.12
-_patchver=1
+_patchver=3
 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=9a799c054ff5925cbeb730624aa398562aac0550f30389ea5aadbeeda6007f95
+checksum=46f8e7224cd34aaab2de8e5221ed23d357d154ad63f1a6c28e4fa0a650537190
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"

From da6b89219998d206f0ba7ced7566b2cf9cca8c4c Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 13 Mar 2021 21:35:15 +0100
Subject: [PATCH 3453/3458] python-py: update to 1.10.0.

---
 srcpkgs/python-py/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template
index 56c013c84680..a4986bc3d631 100644
--- a/srcpkgs/python-py/template
+++ b/srcpkgs/python-py/template
@@ -1,7 +1,7 @@
 # Template file for 'python-py'
 pkgname=python-py
-version=1.9.0
-revision=2
+version=1.10.0
+revision=1
 wrksrc="py-${version}"
 build_style=python2-module
 hostmakedepends="python-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pytest-dev/py"
 changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
-checksum=9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342
+checksum=21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3
 
 post_install() {
 	vlicense LICENSE

From 18dfc75ae17536f3333d0f28b70efada7bae1a12 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 13 Mar 2021 21:23:01 +0100
Subject: [PATCH 3454/3458] kdenlive: update to 20.12.3.

---
 srcpkgs/kdenlive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index dc0d28372b2b..a59a101dd921 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -18,7 +18,7 @@ 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=3fcb3f4fd7d77d70296fb6bcbbf716cda92acc8e5d6733448787b6a9a064013e
+checksum=8d9f94699befc59b0a410d99dcafd445f33126678c18d859df4fceb553a88586
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From 4f4dea80e989b53059627a63881ca46a8d94123d Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 13 Mar 2021 21:08:06 +0100
Subject: [PATCH 3455/3458] postgresql: update to 9.6.21.

---
 srcpkgs/postgresql/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e5eda8fb05c4..25f7e62bd8da 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=9.6.20
-revision=2
+version=9.6.21
+revision=1
 build_style=gnu-configure
 make_build_target=world
 configure_args="--with-openssl --with-python
@@ -19,7 +19,9 @@ 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}/${pkgname}-${version}.tar.bz2"
-checksum=3d08cba409d45ab62d42b24431a0d55e7537bcd1db2d979f5f2eefe34d487bb6
+checksum=930feaef28885c97ec40c26ab6221903751eeb625de92b22602706d7d47d1634
+# initdb fails on github actions, works locally with xbps-uunshare
+make_check=extended
 
 conf_files="
 	/etc/default/${pkgname}

From dd5eaca8f40e23c0b12a49785ee2e7319e938719 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 13 Mar 2021 21:59:50 +0000
Subject: [PATCH 3456/3458] python-b2sdk: update to 1.4.0.

---
 srcpkgs/python-b2sdk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 838d3c2fb897..f0a8aec07813 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,8 +1,8 @@
 # Template file for 'python-b2sdk'
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
-version=1.3.0
-revision=2
+version=1.4.0
+revision=1
 wrksrc="b2sdk-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -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=af53e2449414b772a0bd6fad311d98a171c3693f77ebca933499946e786715ae
+checksum=fb82cbaef5dd7499b62622010fc8e328944ca8cbdd00b485530ab6600de1129d
 
 post_install() {
 	vlicense LICENSE

From e751e470405db1ee7bda34fcd58612e034f9cb81 Mon Sep 17 00:00:00 2001
From: m3tav3rse <mtvrs@tuta.io>
Date: Sat, 13 Mar 2021 22:08:44 +0100
Subject: [PATCH 3457/3458] hex: update to 0.4.1.

---
 srcpkgs/hex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hex/template b/srcpkgs/hex/template
index 8127d42b2e8f..0fcd9618cb81 100644
--- a/srcpkgs/hex/template
+++ b/srcpkgs/hex/template
@@ -1,6 +1,6 @@
 # Template file for 'hex'
 pkgname=hex
-version=0.3.0
+version=0.4.1
 revision=1
 build_style=cargo
 short_desc="Futuristic take on hexdump"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/sitkevij/hex"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d929593ae5851c6cb7e778f759fca380245d6053fa3b0cb9643e598a37015c84
+checksum=993c7ab59c98a1b97f348d6609e2ef7cb199f46e85bb06e093a9e01d06d85c97
 
 post_install() {
 	vlicense LICENSE

From 4a98fd10e265660e369ed1d01dac33c872d5296d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Mar 2021 00:33:42 +0100
Subject: [PATCH 3458/3458] android-tools: update to 30.0.5p1.

---
 ...s-fix-dependencies-on-protobuf-heade.patch | 63 -------------------
 srcpkgs/android-tools/template                |  6 +-
 2 files changed, 3 insertions(+), 66 deletions(-)
 delete 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
deleted file mode 100644
index 0d883b4f0fb4..000000000000
--- a/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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 b394a98c10bc..8d95b870e055 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=30.0.5
-revision=2
+version=30.0.5p1
+revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
@@ -12,7 +12,7 @@ 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=1b870a3f28d75e4907c95dbe8e71b4014f56be636d089a75257ef3922ad39d62
+checksum=8400387db0ff3c7d030418b9f63ea171917c26e6bcc82d9dc666c8c4c02e9806
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

Re: [PR PATCH] [Updated] New package: wally-cli-2.0.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 336 bytes --]

There is an updated pull request by waynevanson against master on the void-packages repository

https://github.com/waynevanson/void-packages package/wally-cli
https://github.com/void-linux/void-packages/pull/28000

New package: wally-cli-2.0.0


A patch file from https://github.com/void-linux/void-packages/pull/28000.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/wally-cli-28000.patch --]
[-- Type: text/x-diff, Size: 2299 bytes --]

From 2252b0bb3c09500fb27f2f16e4fce772cb2f5711 Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 15 Mar 2021 01:55:20 +1100
Subject: [PATCH] New package: walli-cli-2.0.0

---
 srcpkgs/wally-cli/INSTALL.msg |  2 ++
 srcpkgs/wally-cli/template    | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 srcpkgs/wally-cli/INSTALL.msg
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/INSTALL.msg b/srcpkgs/wally-cli/INSTALL.msg
new file mode 100644
index 000000000000..bf74d3bf5954
--- /dev/null
+++ b/srcpkgs/wally-cli/INSTALL.msg
@@ -0,0 +1,2 @@
+Please add your user to the group 'plugdev' by executing the following:
+usermod -aG plugdev \"\$USER\"
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 000000000000..7328b9e676e5
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,33 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+archs="x86_64"
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+go_import_path="github.com/zsa/wally-cli"
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+conf_files="/usr/lib/udev/rules.d/50-wally.rules"
+system_groups="plugdev"
+
+post_install() {
+	vlicense license.md
+
+	# WALLY UDEV RULE FOR DEVICE RELATED EVENT
+	vmkdir /usr/lib/udev/rules.d/
+	cat <<EOF | tee "$PKGDESTDIR/usr/lib/udev/rules.d/50-wally.rules"
+	# Teensy rules for the Ergodox EZ
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+	ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+	KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+	# STM32 rules for the Moonlander and Planck EZ
+	SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
+EOF
+}

Re: [PR PATCH] [Updated] New package: wally-cli-2.0.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 336 bytes --]

There is an updated pull request by waynevanson against master on the void-packages repository

https://github.com/waynevanson/void-packages package/wally-cli
https://github.com/void-linux/void-packages/pull/28000

New package: wally-cli-2.0.0


A patch file from https://github.com/void-linux/void-packages/pull/28000.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/wally-cli-28000.patch --]
[-- Type: text/x-diff, Size: 4040 bytes --]

From 0b4f6ac8b8884c9a10a4b4b9e9b90ba2f6c9012b Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 15 Mar 2021 01:55:20 +1100
Subject: [PATCH] New package: wally-cli-2.0.0

---
 srcpkgs/wally-cli/INSTALL.msg          |  2 ++
 srcpkgs/wally-cli/files/50-wally.rules |  8 ++++++++
 srcpkgs/wally-cli/files/LICENSE        |  9 +++++++++
 srcpkgs/wally-cli/template             | 24 ++++++++++++++++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/wally-cli/INSTALL.msg
 create mode 100644 srcpkgs/wally-cli/files/50-wally.rules
 create mode 100644 srcpkgs/wally-cli/files/LICENSE
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/INSTALL.msg b/srcpkgs/wally-cli/INSTALL.msg
new file mode 100644
index 000000000000..bf74d3bf5954
--- /dev/null
+++ b/srcpkgs/wally-cli/INSTALL.msg
@@ -0,0 +1,2 @@
+Please add your user to the group 'plugdev' by executing the following:
+usermod -aG plugdev \"\$USER\"
diff --git a/srcpkgs/wally-cli/files/50-wally.rules b/srcpkgs/wally-cli/files/50-wally.rules
new file mode 100644
index 000000000000..58b5716f1d1e
--- /dev/null
+++ b/srcpkgs/wally-cli/files/50-wally.rules
@@ -0,0 +1,8 @@
+# Teensy rules for the Ergodox EZ
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+
+# STM32 rules for the Moonlander and Planck EZ
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
\ No newline at end of file
diff --git a/srcpkgs/wally-cli/files/LICENSE b/srcpkgs/wally-cli/files/LICENSE
new file mode 100644
index 000000000000..45bbd402c83a
--- /dev/null
+++ b/srcpkgs/wally-cli/files/LICENSE
@@ -0,0 +1,9 @@
+## License (MIT)
+
+Copyright 2019-2020, ZSA Technology Labs Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 000000000000..6051a52c6de5
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,24 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+archs="x86_64"
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+go_import_path="github.com/zsa/wally-cli"
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+conf_files="/usr/lib/udev/rules.d/50-wally.rules"
+system_groups="plugdev"
+
+post_install() {
+	vlicense "$FILESDIR/LICENSE"
+
+	# WALLY UDEV RULE FOR DEVICE RELATED EVENT
+	vinstall "$FILESDIR/50-wally.rules" 0644 /usr/lib/udev/rules.d
+}

Re: [PR REVIEW] New package: wally-cli-2.0.0

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#discussion_r597688604

Comment:
please add a note that vendoring the license file is obsolete with the next release

Re: [PR REVIEW] New package: wally-cli-2.0.0

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#discussion_r597689007

Comment:
no need to scream, besides the next line is self-explanatory

Re: [PR REVIEW] New package: wally-cli-2.0.0

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#discussion_r597743002

Comment:
why is this limited to x86_64 (glibc)?

Re: [PR REVIEW] New package: wally-cli-2.0.0

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#discussion_r597744042

Comment:
did you come up with them?

Re: [PR REVIEW] New package: wally-cli-2.0.0

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#discussion_r597743002

Comment:
why is this limited to x86_64 (glibc)? (it builds fine for `x86_64-musl` as well)

Re: [PR REVIEW] New package: wally-cli-2.0.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

New review comment by waynevanson on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#discussion_r598032610

Comment:
I got them from https://github.com/zsa/wally/wiki/Linux-install#2-create-a-udev-rule-file

I've written this in the file at `files/50-wally.rules`

Re: [PR REVIEW] New package: wally-cli-2.0.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

New review comment by waynevanson on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#discussion_r598045656

Comment:
I would've left it here for testing purposes when starting the file. I will update this to what works.

I cannot get these to cross compile and I've added what I can test

Re: [PR PATCH] [Updated] New package: wally-cli-2.0.0

[waynevanson]

[-- Attachment #1: Type: text/plain, Size: 336 bytes --]

There is an updated pull request by waynevanson against master on the void-packages repository

https://github.com/waynevanson/void-packages package/wally-cli
https://github.com/void-linux/void-packages/pull/28000

New package: wally-cli-2.0.0


A patch file from https://github.com/void-linux/void-packages/pull/28000.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/wally-cli-28000.patch --]
[-- Type: text/x-diff, Size: 4236 bytes --]

From e1a67b2f944d14aa4cc56f493fe9db90d8c6ec4a Mon Sep 17 00:00:00 2001
From: Wayne Van Son <waynevanson@gmail.com>
Date: Mon, 15 Mar 2021 01:55:20 +1100
Subject: [PATCH] New package: wally-cli-2.0.0

---
 srcpkgs/wally-cli/INSTALL.msg          |  4 ++++
 srcpkgs/wally-cli/files/50-wally.rules | 11 +++++++++++
 srcpkgs/wally-cli/files/LICENSE        |  9 +++++++++
 srcpkgs/wally-cli/template             | 24 ++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 srcpkgs/wally-cli/INSTALL.msg
 create mode 100644 srcpkgs/wally-cli/files/50-wally.rules
 create mode 100644 srcpkgs/wally-cli/files/LICENSE
 create mode 100644 srcpkgs/wally-cli/template

diff --git a/srcpkgs/wally-cli/INSTALL.msg b/srcpkgs/wally-cli/INSTALL.msg
new file mode 100644
index 000000000000..2ed1727da203
--- /dev/null
+++ b/srcpkgs/wally-cli/INSTALL.msg
@@ -0,0 +1,4 @@
+Please add your user to the group 'plugdev' by executing the following:
+
+groupadd -f plugdev
+usermod -aG plugdev "$USER"
diff --git a/srcpkgs/wally-cli/files/50-wally.rules b/srcpkgs/wally-cli/files/50-wally.rules
new file mode 100644
index 000000000000..742cde5c1f91
--- /dev/null
+++ b/srcpkgs/wally-cli/files/50-wally.rules
@@ -0,0 +1,11 @@
+# These rules are derived from the instructions at
+# https://github.com/zsa/wally/wiki/Linux-install#2-create-a-udev-rule-file
+
+# Teensy rules for the Ergodox EZ
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", MODE:="0666"
+KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", MODE:="0666"
+
+# STM32 rules for the Moonlander and Planck EZ
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666", SYMLINK+="stm32_dfu"
\ No newline at end of file
diff --git a/srcpkgs/wally-cli/files/LICENSE b/srcpkgs/wally-cli/files/LICENSE
new file mode 100644
index 000000000000..45bbd402c83a
--- /dev/null
+++ b/srcpkgs/wally-cli/files/LICENSE
@@ -0,0 +1,9 @@
+## License (MIT)
+
+Copyright 2019-2020, ZSA Technology Labs Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
new file mode 100644
index 000000000000..ffaf24c0b8f6
--- /dev/null
+++ b/srcpkgs/wally-cli/template
@@ -0,0 +1,24 @@
+# Template file for 'wally-cli'
+pkgname=wally-cli
+version=2.0.0
+revision=1
+archs="x86_64 x86_64-musl i686"
+wrksrc="wally-cli-${version}-linux"
+build_style=go
+go_import_path="github.com/zsa/wally-cli"
+makedepends="libusb-devel pkg-config go-bindata"
+short_desc="Flashing firmware for ZSA keyboards"
+maintainer="Wayne Van Son <waynevanson@gmail.com>"
+license="MIT"
+homepage="https://www.zsa.io/wally/"
+distfiles="https://github.com/zsa/wally-cli/archive/${version}-linux.tar.gz"
+checksum="2641c7deededeeba1aecf6b3ae3e87050a0cfd81c8b41323b2304ebe21e61745"
+conf_files="/usr/lib/udev/rules.d/50-wally.rules"
+system_groups="plugdev"
+nocross="yes"
+
+post_install() {
+	# vendoring license is obsolete in the next release
+	vlicense "$FILESDIR/LICENSE"
+	vinstall "$FILESDIR/50-wally.rules" 0644 /usr/lib/udev/rules.d
+}

Re: [PR REVIEW] New package: wally-cli-2.0.0

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#discussion_r599455479

Comment:
after readin the cross build log,
```
aarch64-linux-musl-pkg-config: exec: "aarch64-linux-musl-pkg-config": executable file not found in $PATH
```
it's obvious you have to  `hostmakedepends="pkg-config"`
this makes it cross compile.
please remove the arch restriction if it's not necessary

Re: [PR REVIEW] New package: wally-cli-2.0.0

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#discussion_r599396042

Comment:
since you set `system_groups="plugdev"` in the template, `groupadd` is superfluous

Re: [PR PATCH] [Closed]: New package: wally-cli-2.0.0

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

There's a closed pull request on the void-packages repository

New package: wally-cli-2.0.0
https://github.com/void-linux/void-packages/pull/28000

Description:

Re: New package: wally-cli-2.0.0

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/28000#issuecomment-804930654

Comment:
I applied my suggestions and merged, i hope that's ok with you ;)