Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: simutron-1.0.1-SR2
@ 2020-10-19 17:24 Logarithmus
  2020-10-19 17:38 ` ericonr
                   ` (44 more replies)
  0 siblings, 45 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-19 17:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages simutron
https://github.com/void-linux/void-packages/pull/25742

New package: simutron-1.0.1-SR2
Simulator for simple logic circuits and AVR microcontrollers (relies on `simavr` as a backend).
Requires https://github.com/void-linux/void-packages/pull/25741 to be merged.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-simutron-25742.patch --]
[-- Type: text/x-diff, Size: 2499 bytes --]

From 05b16595ac5ace6ab6c2521e48d4839e69107ef4 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Mon, 19 Oct 2020 18:02:15 +0300
Subject: [PATCH] New package: simutron-1.0.1-SR2

---
 srcpkgs/simutron/patches/firmware.patch | 17 +++++++++++++++++
 srcpkgs/simutron/template               | 24 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/simutron/patches/firmware.patch
 create mode 100644 srcpkgs/simutron/template

diff --git a/srcpkgs/simutron/patches/firmware.patch b/srcpkgs/simutron/patches/firmware.patch
new file mode 100644
index 00000000000..5afe900c898
--- /dev/null
+++ b/srcpkgs/simutron/patches/firmware.patch
@@ -0,0 +1,17 @@
+--- plugins/avrmcu/plugin/firmware.c	2018-05-16 10:41:20.000000000 +0300
++++ plugins/avrmcu/plugin/firmware.c	2020-10-19 16:26:22.168329997 +0300
+@@ -118,10 +118,10 @@
+             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;
++//			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 00000000000..def94777921
--- /dev/null
+++ b/srcpkgs/simutron/template
@@ -0,0 +1,24 @@
+# Template file for 'simutron'
+pkgname=simutron
+version=1.0.1
+revision=1
+_commit=r292
+_rev=SR2
+wrksrc=${pkgname}-code-${_commit}-branches-RB-${version}-${_rev}
+build_wrksrc=build
+build_style=qmake
+hostmakedepends="qt5-qmake pkg-config"
+makedepends="simavr-devel qt5-devel"
+depends="libelf"
+short_desc="AVR simulator IDE"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="GPL-3.0-only"
+homepage="https://sourceforge.net/projects/simutron/"
+distfiles="https://sourceforge.net/code-snapshots/svn/s/si/${pkgname}/code/${pkgname}-code-${_commit}-branches-RB-${version}-${_rev}.zip"
+checksum=fb3f5897477a9e1afa36f3e7ac44793777871fdf339fae220a6e699e168e1ea8
+nostrip_files="LCD20x4Test.elf"
+
+post_extract() {
+	rm usr/share/simutron/examples/MENWIZ/LCD20x4Test/bin/Debug/LCD20x4Test.elf
+	rm usr/share/simutron/examples/MENWIZ/LCD20x4Test/bin/Release/LCD20x4Test.elf
+}

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
@ 2020-10-19 17:38 ` ericonr
  2020-10-19 17:40 ` [PR PATCH] [Updated] " Logarithmus
                   ` (43 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: ericonr @ 2020-10-19 17:38 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25742#issuecomment-712323095

Comment:
The change from #25741 should be in this PR.

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PR PATCH] [Updated] New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
  2020-10-19 17:38 ` ericonr
@ 2020-10-19 17:40 ` Logarithmus
  2020-10-20 11:56 ` Logarithmus
                   ` (42 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-19 17:40 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages simutron
https://github.com/void-linux/void-packages/pull/25742

New package: simutron-1.0.1-SR2
Simulator for simple logic circuits and AVR microcontrollers (relies on `simavr` as a backend).
Requires https://github.com/void-linux/void-packages/pull/25741 to be merged.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-simutron-25742.patch --]
[-- Type: text/x-diff, Size: 3135 bytes --]

From 05b16595ac5ace6ab6c2521e48d4839e69107ef4 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Mon, 19 Oct 2020 18:02:15 +0300
Subject: [PATCH 1/2] New package: simutron-1.0.1-SR2

---
 srcpkgs/simutron/patches/firmware.patch | 17 +++++++++++++++++
 srcpkgs/simutron/template               | 24 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/simutron/patches/firmware.patch
 create mode 100644 srcpkgs/simutron/template

diff --git a/srcpkgs/simutron/patches/firmware.patch b/srcpkgs/simutron/patches/firmware.patch
new file mode 100644
index 00000000000..5afe900c898
--- /dev/null
+++ b/srcpkgs/simutron/patches/firmware.patch
@@ -0,0 +1,17 @@
+--- plugins/avrmcu/plugin/firmware.c	2018-05-16 10:41:20.000000000 +0300
++++ plugins/avrmcu/plugin/firmware.c	2020-10-19 16:26:22.168329997 +0300
+@@ -118,10 +118,10 @@
+             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;
++//			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 00000000000..def94777921
--- /dev/null
+++ b/srcpkgs/simutron/template
@@ -0,0 +1,24 @@
+# Template file for 'simutron'
+pkgname=simutron
+version=1.0.1
+revision=1
+_commit=r292
+_rev=SR2
+wrksrc=${pkgname}-code-${_commit}-branches-RB-${version}-${_rev}
+build_wrksrc=build
+build_style=qmake
+hostmakedepends="qt5-qmake pkg-config"
+makedepends="simavr-devel qt5-devel"
+depends="libelf"
+short_desc="AVR simulator IDE"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="GPL-3.0-only"
+homepage="https://sourceforge.net/projects/simutron/"
+distfiles="https://sourceforge.net/code-snapshots/svn/s/si/${pkgname}/code/${pkgname}-code-${_commit}-branches-RB-${version}-${_rev}.zip"
+checksum=fb3f5897477a9e1afa36f3e7ac44793777871fdf339fae220a6e699e168e1ea8
+nostrip_files="LCD20x4Test.elf"
+
+post_extract() {
+	rm usr/share/simutron/examples/MENWIZ/LCD20x4Test/bin/Debug/LCD20x4Test.elf
+	rm usr/share/simutron/examples/MENWIZ/LCD20x4Test/bin/Release/LCD20x4Test.elf
+}

From a7a0180aeffcdeb9853f85b28fb0434774fc7316 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Mon, 19 Oct 2020 18:10:14 +0300
Subject: [PATCH 2/2] common/shlibs: add shlibs for simavr

---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..2a8981219d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,5 @@ libneatvnc.so.0 neatvnc-0.2.0_1
 libtdjson.so.1.6.0 libtd-1.6.0_1
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libsimavr.so.1 simavr-1.6_2
+libsimavrparts.so.1 simavr-1.6_2

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PR PATCH] [Updated] New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
  2020-10-19 17:38 ` ericonr
  2020-10-19 17:40 ` [PR PATCH] [Updated] " Logarithmus
@ 2020-10-20 11:56 ` Logarithmus
  2020-10-20 11:58 ` Logarithmus
                   ` (41 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-20 11:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages simutron
https://github.com/void-linux/void-packages/pull/25742

New package: simutron-1.0.1-SR2
Simulator for simple logic circuits and AVR microcontrollers (relies on `simavr` as a backend).
Requires https://github.com/void-linux/void-packages/pull/25741 to be merged.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-simutron-25742.patch --]
[-- Type: text/x-diff, Size: 3169 bytes --]

From 69dd4798b7cc40eadb9c057f9a57c465c0c34e01 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Mon, 19 Oct 2020 18:02:15 +0300
Subject: [PATCH 1/2] New package: simutron-1.0.1-SR2

---
 srcpkgs/simutron/patches/firmware.patch | 17 ++++++++++++++
 srcpkgs/simutron/template               | 31 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 srcpkgs/simutron/patches/firmware.patch
 create mode 100644 srcpkgs/simutron/template

diff --git a/srcpkgs/simutron/patches/firmware.patch b/srcpkgs/simutron/patches/firmware.patch
new file mode 100644
index 00000000000..5afe900c898
--- /dev/null
+++ b/srcpkgs/simutron/patches/firmware.patch
@@ -0,0 +1,17 @@
+--- plugins/avrmcu/plugin/firmware.c	2018-05-16 10:41:20.000000000 +0300
++++ plugins/avrmcu/plugin/firmware.c	2020-10-19 16:26:22.168329997 +0300
+@@ -118,10 +118,10 @@
+             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;
++//			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 00000000000..c3f21256590
--- /dev/null
+++ b/srcpkgs/simutron/template
@@ -0,0 +1,31 @@
+# Template file for 'simutron'
+pkgname=simutron
+version=1.0.1
+revision=1
+_commit=r292
+_rev=SR2
+build_wrksrc=build
+build_style=qmake
+hostmakedepends="subversion qt5-qmake pkg-config"
+makedepends="simavr-devel qt5-devel"
+depends="libelf"
+short_desc="AVR simulator IDE"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
+license="GPL-3.0-only"
+homepage="https://sourceforge.net/projects/simutron/"
+#distfiles="https://sourceforge.net/p/${pkgname}/code/HEAD/tarball"
+#checksum=fb3f5897477a9e1afa36f3e7ac44793777871fdf339fae220a6e699e168e1ea8
+nostrip_files="LCD20x4Test.elf"
+
+do_fetch() {
+	svn checkout "https://svn.code.sf.net/p/${pkgname}/code/branches/RB-${version}-${_rev}" "$wrksrc"
+}
+
+do_extract() {
+	echo "No need to extract"
+}
+
+post_extract() {
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Debug/LCD20x4Test.elf
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Release/LCD20x4Test.elf
+}

From aa681329a5378fcd94211fe84eed1d6e8f55e9da Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Tue, 20 Oct 2020 14:55:20 +0300
Subject: [PATCH 2/2] common/shlibs: add shlibs for simavr

---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..2a8981219d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,5 @@ libneatvnc.so.0 neatvnc-0.2.0_1
 libtdjson.so.1.6.0 libtd-1.6.0_1
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libsimavr.so.1 simavr-1.6_2
+libsimavrparts.so.1 simavr-1.6_2

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
                   ` (2 preceding siblings ...)
  2020-10-20 11:56 ` Logarithmus
@ 2020-10-20 11:58 ` Logarithmus
  2020-10-20 12:04 ` [PR PATCH] [Updated] " Logarithmus
                   ` (40 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-20 11:58 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/25742#issuecomment-712798523

Comment:
It turns out that Sourceforge's direct links to snapshot aren't persistent. This resulted in 404 Not Found.
Unfortunately, `simutron`'s repo provides tarballs only for binaries. So I decided to use `svn` directly.
Hope that CI check will pass this time.

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PR PATCH] [Updated] New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
                   ` (3 preceding siblings ...)
  2020-10-20 11:58 ` Logarithmus
@ 2020-10-20 12:04 ` Logarithmus
  2020-10-20 12:33 ` Logarithmus
                   ` (39 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-20 12:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages simutron
https://github.com/void-linux/void-packages/pull/25742

New package: simutron-1.0.1-SR2
Simulator for simple logic circuits and AVR microcontrollers (relies on `simavr` as a backend).
Requires https://github.com/void-linux/void-packages/pull/25741 to be merged.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-simutron-25742.patch --]
[-- Type: text/x-diff, Size: 3025 bytes --]

From 2a91cd67ab50e70eced5666ceb89bb543d2d6531 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Mon, 19 Oct 2020 18:02:15 +0300
Subject: [PATCH 1/2] New package: simutron-1.0.1-SR2

---
 srcpkgs/simutron/patches/firmware.patch | 17 +++++++++++++++
 srcpkgs/simutron/template               | 29 +++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 srcpkgs/simutron/patches/firmware.patch
 create mode 100644 srcpkgs/simutron/template

diff --git a/srcpkgs/simutron/patches/firmware.patch b/srcpkgs/simutron/patches/firmware.patch
new file mode 100644
index 00000000000..5afe900c898
--- /dev/null
+++ b/srcpkgs/simutron/patches/firmware.patch
@@ -0,0 +1,17 @@
+--- plugins/avrmcu/plugin/firmware.c	2018-05-16 10:41:20.000000000 +0300
++++ plugins/avrmcu/plugin/firmware.c	2020-10-19 16:26:22.168329997 +0300
+@@ -118,10 +118,10 @@
+             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;
++//			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 00000000000..4e706b8d753
--- /dev/null
+++ b/srcpkgs/simutron/template
@@ -0,0 +1,29 @@
+# Template file for 'simutron'
+pkgname=simutron
+version=1.0.1
+revision=1
+_commit=r292
+_rev=SR2
+build_wrksrc=build
+build_style=qmake
+hostmakedepends="subversion qt5-qmake pkg-config"
+makedepends="simavr-devel qt5-devel"
+depends="libelf"
+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"
+}
+
+do_extract() {
+	echo "No need to extract"
+}
+
+post_extract() {
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Debug/LCD20x4Test.elf
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Release/LCD20x4Test.elf
+}

From ac23629fdcb54580ecf3a0fa6f052eb14cd57b59 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Tue, 20 Oct 2020 15:03:53 +0300
Subject: [PATCH 2/2] common/shlibs: add shlibs for simavr

---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..2a8981219d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,5 @@ libneatvnc.so.0 neatvnc-0.2.0_1
 libtdjson.so.1.6.0 libtd-1.6.0_1
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libsimavr.so.1 simavr-1.6_2
+libsimavrparts.so.1 simavr-1.6_2

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
                   ` (4 preceding siblings ...)
  2020-10-20 12:04 ` [PR PATCH] [Updated] " Logarithmus
@ 2020-10-20 12:33 ` Logarithmus
  2020-10-20 23:55 ` [PR PATCH] [Updated] " Logarithmus
                   ` (38 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-20 12:33 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/25742#issuecomment-712798523

Comment:
It turns out that Sourceforge's direct links to snapshot aren't persistent. This resulted in 404 Not Found.
Unfortunately, `simutron`'s repo provides tarballs only for binaries. So I decided to use `svn` directly.
Hope that CI check will pass this time.
**UPD** Uh oh, it failed again, there's something wrong with ARM targets, and for x86_64-musl it failed to connect to the repository...

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PR PATCH] [Updated] New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
                   ` (5 preceding siblings ...)
  2020-10-20 12:33 ` Logarithmus
@ 2020-10-20 23:55 ` Logarithmus
  2020-10-21 12:57 ` Logarithmus
                   ` (37 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-20 23:55 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages simutron
https://github.com/void-linux/void-packages/pull/25742

New package: simutron-1.0.1-SR2
Simulator for simple logic circuits and AVR microcontrollers (relies on `simavr` as a backend).
Requires https://github.com/void-linux/void-packages/pull/25741 to be merged.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-simutron-25742.patch --]
[-- Type: text/x-diff, Size: 3040 bytes --]

From 5d3b93485174b0b9ceaa1f94b3bc29da204be9ed Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Mon, 19 Oct 2020 18:02:15 +0300
Subject: [PATCH 1/2] New package: simutron-1.0.1-SR2

---
 srcpkgs/simutron/patches/firmware.patch | 17 +++++++++++++++
 srcpkgs/simutron/template               | 29 +++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 srcpkgs/simutron/patches/firmware.patch
 create mode 100644 srcpkgs/simutron/template

diff --git a/srcpkgs/simutron/patches/firmware.patch b/srcpkgs/simutron/patches/firmware.patch
new file mode 100644
index 00000000000..5afe900c898
--- /dev/null
+++ b/srcpkgs/simutron/patches/firmware.patch
@@ -0,0 +1,17 @@
+--- plugins/avrmcu/plugin/firmware.c	2018-05-16 10:41:20.000000000 +0300
++++ plugins/avrmcu/plugin/firmware.c	2020-10-19 16:26:22.168329997 +0300
+@@ -118,10 +118,10 @@
+             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;
++//			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 00000000000..331a6469831
--- /dev/null
+++ b/srcpkgs/simutron/template
@@ -0,0 +1,29 @@
+# Template file for 'simutron'
+pkgname=simutron
+version=1.0.1
+revision=1
+_commit=r292
+_rev=SR2
+build_wrksrc=build
+build_style=qmake
+hostmakedepends="subversion qt5-qmake qt5-host-tools pkg-config"
+makedepends="simavr-devel qt5-devel"
+depends="libelf"
+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"
+}
+
+do_extract() {
+	echo "No need to extract"
+}
+
+post_extract() {
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Debug/LCD20x4Test.elf
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Release/LCD20x4Test.elf
+}

From ae45849ebc0eba9d0cfe0103bf253bc5f3a8ec2c Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 21 Oct 2020 02:55:12 +0300
Subject: [PATCH 2/2] common/shlibs: add shlibs for simavr

---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..2a8981219d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,5 @@ libneatvnc.so.0 neatvnc-0.2.0_1
 libtdjson.so.1.6.0 libtd-1.6.0_1
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libsimavr.so.1 simavr-1.6_2
+libsimavrparts.so.1 simavr-1.6_2

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
                   ` (6 preceding siblings ...)
  2020-10-20 23:55 ` [PR PATCH] [Updated] " Logarithmus
@ 2020-10-21 12:57 ` Logarithmus
  2020-10-31  2:04 ` [PR PATCH] [Updated] " Logarithmus
                   ` (36 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-21 12:57 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/25742#issuecomment-712798523

Comment:
It turns out that Sourceforge's direct links to snapshot aren't persistent. This resulted in 404 Not Found.
Unfortunately, `simutron`'s repo provides tarballs only for binaries. So I decided to use `svn` directly.
Hope that CI check will pass this time.
**UPD** Uh oh, it failed again, there's something wrong with ARM targets, and for x86_64-musl it failed to connect to the repository...
@ericonr **UPD 2** luckily, adding `qt5-host-tools` to `hostmakedependencies` fixed the problem.

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PR PATCH] [Updated] New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
                   ` (7 preceding siblings ...)
  2020-10-21 12:57 ` Logarithmus
@ 2020-10-31  2:04 ` Logarithmus
  2020-10-31  2:26 ` Logarithmus
                   ` (35 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-31  2:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages simutron
https://github.com/void-linux/void-packages/pull/25742

New package: simutron-1.0.1-SR2
Simulator for simple logic circuits and AVR microcontrollers (relies on `simavr` as a backend).
Requires https://github.com/void-linux/void-packages/pull/25741 to be merged.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-simutron-25742.patch --]
[-- Type: text/x-diff, Size: 3040 bytes --]

From 5d3b93485174b0b9ceaa1f94b3bc29da204be9ed Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Mon, 19 Oct 2020 18:02:15 +0300
Subject: [PATCH 1/2] New package: simutron-1.0.1-SR2

---
 srcpkgs/simutron/patches/firmware.patch | 17 +++++++++++++++
 srcpkgs/simutron/template               | 29 +++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 srcpkgs/simutron/patches/firmware.patch
 create mode 100644 srcpkgs/simutron/template

diff --git a/srcpkgs/simutron/patches/firmware.patch b/srcpkgs/simutron/patches/firmware.patch
new file mode 100644
index 00000000000..5afe900c898
--- /dev/null
+++ b/srcpkgs/simutron/patches/firmware.patch
@@ -0,0 +1,17 @@
+--- plugins/avrmcu/plugin/firmware.c	2018-05-16 10:41:20.000000000 +0300
++++ plugins/avrmcu/plugin/firmware.c	2020-10-19 16:26:22.168329997 +0300
+@@ -118,10 +118,10 @@
+             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;
++//			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 00000000000..331a6469831
--- /dev/null
+++ b/srcpkgs/simutron/template
@@ -0,0 +1,29 @@
+# Template file for 'simutron'
+pkgname=simutron
+version=1.0.1
+revision=1
+_commit=r292
+_rev=SR2
+build_wrksrc=build
+build_style=qmake
+hostmakedepends="subversion qt5-qmake qt5-host-tools pkg-config"
+makedepends="simavr-devel qt5-devel"
+depends="libelf"
+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"
+}
+
+do_extract() {
+	echo "No need to extract"
+}
+
+post_extract() {
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Debug/LCD20x4Test.elf
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Release/LCD20x4Test.elf
+}

From ae45849ebc0eba9d0cfe0103bf253bc5f3a8ec2c Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 21 Oct 2020 02:55:12 +0300
Subject: [PATCH 2/2] common/shlibs: add shlibs for simavr

---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..2a8981219d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,5 @@ libneatvnc.so.0 neatvnc-0.2.0_1
 libtdjson.so.1.6.0 libtd-1.6.0_1
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libsimavr.so.1 simavr-1.6_2
+libsimavrparts.so.1 simavr-1.6_2

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PR PATCH] [Updated] New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
                   ` (8 preceding siblings ...)
  2020-10-31  2:04 ` [PR PATCH] [Updated] " Logarithmus
@ 2020-10-31  2:26 ` Logarithmus
  2020-11-02 16:27 ` Logarithmus
                   ` (34 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-10-31  2:26 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages simutron
https://github.com/void-linux/void-packages/pull/25742

New package: simutron-1.0.1-SR2
Simulator for simple logic circuits and AVR microcontrollers (relies on `simavr` as a backend).
Requires https://github.com/void-linux/void-packages/pull/25741 to be merged.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-simutron-25742.patch --]
[-- Type: text/x-diff, Size: 3027 bytes --]

From d55c0a88f90d94a2f45ad79bac8177a731e9ce7f Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Mon, 19 Oct 2020 18:02:15 +0300
Subject: [PATCH 1/2] New package: simutron-1.0.1-SR2

---
 srcpkgs/simutron/patches/firmware.patch | 17 +++++++++++++++
 srcpkgs/simutron/template               | 28 +++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 srcpkgs/simutron/patches/firmware.patch
 create mode 100644 srcpkgs/simutron/template

diff --git a/srcpkgs/simutron/patches/firmware.patch b/srcpkgs/simutron/patches/firmware.patch
new file mode 100644
index 00000000000..5afe900c898
--- /dev/null
+++ b/srcpkgs/simutron/patches/firmware.patch
@@ -0,0 +1,17 @@
+--- plugins/avrmcu/plugin/firmware.c	2018-05-16 10:41:20.000000000 +0300
++++ plugins/avrmcu/plugin/firmware.c	2020-10-19 16:26:22.168329997 +0300
+@@ -118,10 +118,10 @@
+             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;
++//			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 00000000000..df0d5c0cad6
--- /dev/null
+++ b/srcpkgs/simutron/template
@@ -0,0 +1,28 @@
+# Template file for 'simutron'
+pkgname=simutron
+version=1.0.1
+revision=1
+_rev=SR2
+build_wrksrc=build
+build_style=qmake
+hostmakedepends="subversion qt5-qmake qt5-host-tools pkg-config"
+makedepends="simavr-devel qt5-devel"
+depends="libelf"
+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"
+}
+
+do_extract() {
+	echo "No need to extract"
+}
+
+post_extract() {
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Debug/LCD20x4Test.elf
+	rm share/simutron/examples/MENWIZ/LCD20x4Test/bin/Release/LCD20x4Test.elf
+}

From e6eb5e8c0484695d487040647c617bd59c19b008 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 31 Oct 2020 05:25:44 +0300
Subject: [PATCH 2/2] common/shlibs: add shlibs for simavr

---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index e0e75cea1b4..eb83b5feeaf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3992,3 +3992,5 @@ libSeExpr2Editor.so.3 seexpr-krita-3.4.4.0_1
 libSeExpr2.so.3 seexpr-krita-3.4.4.0_1
 liburing.so.1 liburing-0.7_1
 libbson-1.0.so.0 libbson-1.17.0_1
+libsimavr.so.1 simavr-1.6_2
+libsimavrparts.so.1 simavr-1.6_2

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
                   ` (9 preceding siblings ...)
  2020-10-31  2:26 ` Logarithmus
@ 2020-11-02 16:27 ` Logarithmus
  2020-11-10 22:09 ` [PR PATCH] [Updated] " Logarithmus
                   ` (33 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-11-02 16:27 UTC (permalink / raw)
  To: ml

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

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/25742#issuecomment-720578486

Comment:
@ericonr what's the heck, CI failed due to `ncurses`?
```
=> ERROR: libedit-20191231.3.1_1: failed to install 'ncurses-devel-6.2_4' dependency! (error 19)
ncurses-libs-6.2_4 in transaction breaks installed pkg `ncurses-6.2_2'
```

^ permalink raw reply	[flat|nested] 46+ messages in thread

* Re: [PR PATCH] [Updated] New package: simutron-1.0.1-SR2
  2020-10-19 17:24 [PR PATCH] New package: simutron-1.0.1-SR2 Logarithmus
                   ` (10 preceding siblings ...)
  2020-11-02 16:27 ` Logarithmus
@ 2020-11-10 22:09 ` Logarithmus
  2020-11-10 22:12 ` Logarithmus
                   ` (32 subsequent siblings)
  44 siblings, 0 replies; 46+ messages in thread
From: Logarithmus @ 2020-11-10 22:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Logarithmus/void-packages simutron
https://github.com/void-linux/void-packages/pull/25742

New package: simutron-1.0.1-SR2
Simulator for simple logic circuits and AVR microcontrollers (relies on `simavr` as a backend).
Requires https://github.com/void-linux/void-packages/pull/25741 to be merged.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-simutron-25742.patch --]
[-- Type: text/x-diff, Size: 2223057 bytes --]

From c22f3cac866d88b6a0889bb9350682230794e1b5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Wed, 28 Oct 2020 20:30:48 +0300
Subject: [PATCH] New package: simulide-0.4.13

---
 .mailmap                                      |     1 -
 Manual.md                                     |     4 +-
 common/build-style/cmake.sh                   |    16 +-
 common/build-style/gnu-makefile.sh            |     2 +-
 common/shlibs                                 |    36 +-
 srcpkgs/FeatherPad/template                   |     4 +-
 srcpkgs/ImageMagick/template                  |     6 +-
 srcpkgs/ImageMagick6/template                 |     6 +-
 srcpkgs/MultiMarkdown/template                |     6 +-
 srcpkgs/ProcDump-for-Linux/template           |     6 +-
 srcpkgs/Rocket.Chat-Desktop/template          |     4 +-
 srcpkgs/Signal-Desktop/template               |     4 +-
 srcpkgs/Thunar/template                       |     4 +-
 .../fix-compilation-with-newer-go.patch       |    47 +
 srcpkgs/abireport/template                    |     8 +-
 srcpkgs/afl/template                          |     7 -
 srcpkgs/akonadi-calendar/template             |     4 +-
 srcpkgs/akonadi-contacts/template             |     4 +-
 srcpkgs/akonadi-import-wizard/template        |     4 +-
 srcpkgs/akonadi-mime/template                 |     4 +-
 srcpkgs/akonadi-notes/template                |     4 +-
 srcpkgs/akonadi-search/template               |     4 +-
 srcpkgs/akonadi5/template                     |     4 +-
 srcpkgs/alembic/template                      |     4 +-
 ...ix-mailcap-rendering-no-content-type.patch |    65 -
 srcpkgs/alot/template                         |     2 +-
 ...lugin_dir_set-snd_plugin_dir-must-be.patch |    32 -
 srcpkgs/alsa-lib/template                     |     4 +-
 srcpkgs/alsa-utils/template                   |     4 +-
 srcpkgs/amdvlk/template                       |    33 +-
 srcpkgs/amiri-font/template                   |     3 +-
 srcpkgs/archiver/template                     |     4 +-
 srcpkgs/ark/template                          |     4 +-
 srcpkgs/artwiz-fonts/template                 |     3 +-
 srcpkgs/asciidoc/template                     |     6 +-
 srcpkgs/asio/template                         |     6 +-
 srcpkgs/aspell/template                       |    10 +-
 srcpkgs/ballerburg/template                   |    13 -
 srcpkgs/baloo-widgets5/template               |     4 +-
 srcpkgs/bcc/template                          |     4 +-
 srcpkgs/bctoolbox/template                    |     4 +-
 srcpkgs/bettercap/template                    |     6 +-
 srcpkgs/bijiben/template                      |     6 +-
 srcpkgs/bindfs/template                       |     4 +-
 srcpkgs/binutils/template                     |    25 +-
 srcpkgs/birdtray/template                     |     6 +-
 srcpkgs/bluefish/template                     |    23 +-
 srcpkgs/bmake/template                        |    10 +-
 srcpkgs/borgmatic/template                    |     6 +-
 srcpkgs/bpytop/template                       |     4 +-
 srcpkgs/brltty/template                       |     8 +-
 srcpkgs/brother-brscan3/template              |     2 +-
 srcpkgs/brother-brscan4/template              |    28 +-
 srcpkgs/bs1770gain/template                   |    14 +
 srcpkgs/btrfs-progs/template                  |     4 +-
 srcpkgs/c-blosc/template                      |     4 +-
 srcpkgs/calendarsupport/template              |     4 +-
 ...ot-don-t-try-to-import-plistlib.Data.patch |    27 -
 srcpkgs/calibre/template                      |     4 +-
 srcpkgs/cantarell-fonts/template              |     3 +-
 srcpkgs/capnproto/template                    |     6 +-
 srcpkgs/castero/template                      |     6 +-
 ...uild-and-install-man-page-by-default.patch |    32 -
 srcpkgs/ccache/template                       |    23 +-
 srcpkgs/ccls/template                         |     6 +-
 srcpkgs/cherry-font/template                  |     3 +-
 srcpkgs/chezmoi/template                      |     4 +-
 srcpkgs/chromium-widevine/INSTALL             |     2 +-
 srcpkgs/chromium-widevine/template            |     2 +-
 ...roto-fix-underflow-in-Fp1616ToDouble.patch |    37 -
 srcpkgs/chromium/template                     |     4 +-
 srcpkgs/cifs-utils/template                   |     8 +-
 srcpkgs/clipgrab/template                     |     4 +-
 srcpkgs/cmake-gui/template                    |     6 +-
 srcpkgs/cmake/template                        |    13 +-
 srcpkgs/cmst/template                         |     4 +-
 srcpkgs/colord/template                       |    10 +-
 srcpkgs/corecollector-devel                   |     1 -
 srcpkgs/corecollector/template                |    28 -
 srcpkgs/coreutils/template                    |     6 +-
 srcpkgs/cozy/template                         |     5 +-
 srcpkgs/cpp-utilities/template                |     4 +-
 srcpkgs/crash/template                        |    16 +-
 srcpkgs/cropgui/patches/python3-support.patch |    11 +
 srcpkgs/cropgui/template                      |     6 +-
 .../files/use-pure-64bit-configs.patch        |     1 -
 srcpkgs/cross-aarch64-linux-gnu/template      |     1 -
 .../files/use-pure-64bit-configs.patch        |     1 -
 srcpkgs/cross-aarch64-linux-musl/template     |     1 -
 .../files/ppc64-pure64.patch                  |     1 +
 .../files/use-pure-64bit-configs.patch        |     1 -
 srcpkgs/cross-powerpc64-linux-gnu/template    |     4 +-
 .../files/ppc64-pure64.patch                  |     1 +
 .../files/use-pure-64bit-configs.patch        |     1 -
 srcpkgs/cross-powerpc64-linux-musl/template   |     4 +-
 .../files/ppc64-pure64.patch                  |     1 +
 .../files/use-pure-64bit-configs.patch        |     1 -
 srcpkgs/cross-powerpc64le-linux-gnu/template  |     4 +-
 .../files/ppc64-pure64.patch                  |     1 +
 .../files/use-pure-64bit-configs.patch        |     1 -
 srcpkgs/cross-powerpc64le-linux-musl/template |     4 +-
 .../files/use-pure-64bit-configs.patch        |     1 -
 srcpkgs/cross-x86_64-linux-gnu/template       |     4 +-
 .../files/use-pure-64bit-configs.patch        |     1 -
 srcpkgs/cross-x86_64-linux-musl/template      |     4 +-
 srcpkgs/crun/template                         |     6 +-
 ...isable-test-font-cross-compile-check.patch |    11 +
 srcpkgs/cups-filters/template                 |     5 +-
 srcpkgs/dar/template                          |     4 +-
 srcpkgs/dejavu-fonts-ttf/template             |     8 +-
 srcpkgs/deluge/files/deluged/run              |     4 +-
 srcpkgs/deluge/template                       |     2 +-
 srcpkgs/diffoscope/template                   |     6 +-
 srcpkgs/diffutils/template                    |     1 -
 srcpkgs/dina-font/template                    |     6 +-
 srcpkgs/distrobuilder/template                |     4 +-
 srcpkgs/dkms/files/kernel.d/dkms.postinst     |     4 +-
 srcpkgs/dkms/template                         |     2 +-
 srcpkgs/doctl/template                        |     4 +-
 srcpkgs/dolphin-plugins/template              |     4 +-
 srcpkgs/dolphin/template                      |     4 +-
 srcpkgs/drawterm/patches/posix_generic.patch  |     4 +-
 srcpkgs/drawterm/template                     |     6 +-
 srcpkgs/dropbear/template                     |     5 +-
 srcpkgs/duf/template                          |     6 +-
 srcpkgs/econnman/template                     |    22 +
 srcpkgs/econnman/update                       |     1 +
 srcpkgs/ekushey-fonts-ttf/template            |     3 +-
 srcpkgs/electron10/template                   |    15 +-
 srcpkgs/elisa/template                        |     4 +-
 srcpkgs/elixir/template                       |     4 +-
 srcpkgs/enchant2/template                     |     4 +-
 .../patches/mips-name-clash.patch             |   158 -
 srcpkgs/envypn-font/template                  |     3 +-
 srcpkgs/erlang/template                       |     4 +-
 srcpkgs/ettercap/patches/CVE-2017-6430.patch  |    57 +
 srcpkgs/ettercap/patches/CVE-2017-8366.patch  |   201 +
 srcpkgs/ettercap/patches/libressl.patch       |    31 -
 srcpkgs/ettercap/template                     |     9 +-
 srcpkgs/eudev/template                        |     1 -
 srcpkgs/faad2/template                        |     7 +-
 srcpkgs/fbmenugen/template                    |     5 +-
 srcpkgs/fetchmail/template                    |     7 +-
 srcpkgs/ffsend/template                       |     4 +-
 srcpkgs/figlet-fonts/template                 |    13 +-
 srcpkgs/file/template                         |     8 -
 srcpkgs/filelight/template                    |     4 +-
 srcpkgs/findutils/template                    |     4 +-
 srcpkgs/firefox-esr-i18n/template             |   190 +-
 srcpkgs/firefox-esr/files/firefox-wayland     |     2 -
 srcpkgs/firefox-esr/files/mozconfig           |     7 +-
 .../patches/big-endian-image-decoders.patch   |    88 -
 .../disable-image-format-warning.patch        |    15 +
 srcpkgs/firefox-esr/patches/fix-cross.patch   |    16 -
 ...686-ppc-musl.patch => fix-i686-musl.patch} |     0
 .../patches/fix-image-format-warning.patch    |    39 -
 .../patches/fix-sandbox-membarrier.patch      |    52 +
 .../firefox-esr/patches/fix-seccomp-bpf.patch |    14 +
 srcpkgs/firefox-esr/patches/fix-toolkit.patch |    78 +
 srcpkgs/firefox-esr/patches/fix-tools.patch   |    29 +
 .../firefox-esr/patches/flac-no-ffvpx.patch   |    26 -
 srcpkgs/firefox-esr/patches/gettid-musl.patch |    11 +
 .../firefox-esr/patches/ppc32-fix-build.patch |    36 -
 ...nfigure.patch => remove-rustc-check.patch} |     8 +-
 .../firefox-esr/patches/rust-has-i128.patch   |    21 -
 .../firefox-esr/patches/sandbox-fork.patch    |    13 -
 srcpkgs/firefox-esr/patches/skia-sucks1.patch |   147 +-
 srcpkgs/firefox-esr/patches/skia-sucks3.patch |    28 +-
 srcpkgs/firefox-esr/patches/sndio.patch       |    81 +-
 srcpkgs/firefox-esr/template                  |   116 +-
 srcpkgs/firefox-i18n/template                 |   194 +-
 srcpkgs/firefox/template                      |     4 +-
 srcpkgs/fluidsynth/template                   |     4 +-
 srcpkgs/fmit/template                         |     4 +-
 srcpkgs/fontconfig/template                   |     3 +-
 srcpkgs/fontforge/patches/sys_select_h.patch  |    11 +
 srcpkgs/fontforge/template                    |     7 +-
 srcpkgs/fonts-croscore-ttf/template           |     5 +-
 srcpkgs/fonts-droid-ttf/template              |     7 +-
 srcpkgs/fonts-nanum-ttf/template              |     3 +-
 srcpkgs/fonts-roboto-ttf/template             |     7 +-
 srcpkgs/foot/template                         |     4 +-
 srcpkgs/fotoxx/template                       |     4 +-
 srcpkgs/freecell-solver/template              |     4 +-
 srcpkgs/freefont-ttf/template                 |     3 +-
 srcpkgs/fwup/template                         |     4 +-
 srcpkgs/fwupd/template                        |    47 +-
 srcpkgs/fzf/template                          |     4 +-
 srcpkgs/gcc/patches/ppc64-pure64.patch        |    57 +
 .../gcc/patches/use-pure-64bit-configs.patch  |   213 -
 srcpkgs/gcc/template                          |    38 +-
 srcpkgs/gcr/template                          |     4 +-
 srcpkgs/gifski/template                       |     4 +-
 srcpkgs/git-absorb/template                   |     4 +-
 srcpkgs/git-cola/template                     |     6 +-
 srcpkgs/git-extras/template                   |     6 +-
 srcpkgs/glslViewer/template                   |     4 +-
 srcpkgs/gnome-2048/template                   |     4 +-
 srcpkgs/gnome-contacts/template               |     4 +-
 srcpkgs/gnome-core/template                   |     8 +-
 srcpkgs/gnome-nibbles/template                |     4 +-
 srcpkgs/gnome-online-accounts/template        |     4 +-
 srcpkgs/gnome-panel/template                  |     4 +-
 srcpkgs/gnome-photos/patches/tracker3.patch   |   435 +-
 srcpkgs/gnome-photos/template                 |     6 +-
 srcpkgs/gnome-sound-recorder/template         |    10 +-
 srcpkgs/gnome-taquin/template                 |     4 +-
 srcpkgs/gnome/template                        |    34 +-
 srcpkgs/gnote/template                        |     4 +-
 srcpkgs/gohufont/template                     |     3 +-
 srcpkgs/golangci-lint/template                |     4 +-
 srcpkgs/golly/template                        |    30 +-
 srcpkgs/goodvibes/template                    |    14 +-
 srcpkgs/google-chrome/template                |     4 +-
 srcpkgs/google-fonts-ttf/template             |     9 +-
 srcpkgs/googler/template                      |     6 +-
 srcpkgs/gopls/template                        |     4 +-
 srcpkgs/gops/template                         |     4 +-
 srcpkgs/grantleetheme/template                |     4 +-
 srcpkgs/grep/template                         |     4 +-
 srcpkgs/grpc/template                         |     4 +-
 srcpkgs/grub-terminus/template                |     7 +-
 srcpkgs/gsfonts/template                      |     3 +-
 srcpkgs/gtk+3/template                        |     4 +-
 srcpkgs/gtk-layer-shell/template              |     4 +-
 srcpkgs/gucci/template                        |     5 +-
 srcpkgs/gvfs/template                         |     4 +-
 srcpkgs/gwenview/template                     |     4 +-
 srcpkgs/gyazo/template                        |     9 +-
 srcpkgs/gzip/template                         |     2 +-
 srcpkgs/haproxy/template                      |     4 +-
 srcpkgs/hcloud/template                       |     4 +-
 srcpkgs/herbstluftwm/template                 |     4 +-
 srcpkgs/hfsprogs/template                     |    10 +-
 srcpkgs/hugo/template                         |     4 +-
 srcpkgs/hunspell-pt_PT-preao/template         |    16 -
 srcpkgs/hunspell-pt_PT/template               |    16 -
 srcpkgs/hwloc/template                        |     4 +-
 srcpkgs/i3status-rust/template                |     6 +-
 srcpkgs/iana-etc/files/services               |     1 -
 srcpkgs/iana-etc/template                     |     3 +-
 srcpkgs/icewm/template                        |     4 +-
 srcpkgs/ideviceinstaller/template             |     7 +-
 srcpkgs/ifuse/template                        |    20 +-
 srcpkgs/ipafont-fonts-otf/template            |     5 +-
 srcpkgs/iproute2/template                     |     4 +-
 srcpkgs/iwd/patches/resolvconf-default.patch  |    22 -
 srcpkgs/iwd/template                          |     2 +-
 srcpkgs/j4-dmenu-desktop/template             |     4 +-
 srcpkgs/jenkins/template                      |     4 +-
 srcpkgs/jmol/template                         |     4 +-
 srcpkgs/jrnl/template                         |     4 +-
 srcpkgs/json-glib/template                    |     8 +-
 srcpkgs/k9s/template                          |     4 +-
 srcpkgs/kaccounts-integration/template        |     4 +-
 srcpkgs/kaccounts-providers/template          |     4 +-
 srcpkgs/kalarmcal/template                    |     4 +-
 srcpkgs/kate5/template                        |     4 +-
 srcpkgs/kcachegrind/template                  |     4 +-
 srcpkgs/kcalutils/template                    |     4 +-
 srcpkgs/kcron/template                        |     4 +-
 srcpkgs/kde5-baseapps/template                |     2 +-
 srcpkgs/kdeconnect/template                   |     4 +-
 srcpkgs/kdenlive/template                     |     4 +-
 srcpkgs/kdepim-apps-libs/template             |     4 +-
 srcpkgs/kdepim-runtime/template               |     4 +-
 srcpkgs/kdialog/template                      |     7 +-
 .../patches/20.08.3--fix-tests.patch          |    28 -
 srcpkgs/keditbookmarks/template               |     4 +-
 srcpkgs/kfind/template                        |     4 +-
 srcpkgs/khelpcenter/template                  |     4 +-
 srcpkgs/kidentitymanagement/template          |     4 +-
 srcpkgs/kig/template                          |     4 +-
 srcpkgs/kimap/template                        |     4 +-
 srcpkgs/kio-gdrive/template                   |     4 +-
 srcpkgs/kldap/template                        |     4 +-
 srcpkgs/kmag/template                         |     4 +-
 srcpkgs/kmail-account-wizard/template         |     4 +-
 srcpkgs/kmail/template                        |     4 +-
 srcpkgs/kmailtransport/template               |     4 +-
 srcpkgs/kmbox/template                        |     4 +-
 srcpkgs/kmime/template                        |     4 +-
 srcpkgs/kmix/template                         |     4 +-
 srcpkgs/knights/template                      |     4 +-
 srcpkgs/kolourpaint/template                  |     4 +-
 srcpkgs/kompare/template                      |     4 +-
 srcpkgs/konsole/template                      |     4 +-
 srcpkgs/kontactinterface/template             |     4 +-
 srcpkgs/kpat/template                         |     4 +-
 srcpkgs/kpimtextedit/template                 |     4 +-
 srcpkgs/kqtquickcharts/template               |     4 +-
 srcpkgs/krita/template                        |     4 +-
 srcpkgs/kruler/template                       |     4 +-
 srcpkgs/ksmtp/template                        |     4 +-
 srcpkgs/ksystemlog/template                   |     4 +-
 srcpkgs/kteatime/template                     |     4 +-
 srcpkgs/ktnef/template                        |     4 +-
 srcpkgs/kturtle/template                      |     4 +-
 srcpkgs/kwalletmanager/template               |     4 +-
 srcpkgs/lazygit/template                      |     6 +-
 srcpkgs/libaspell                             |     1 -
 srcpkgs/libassuan/template                    |     6 +-
 srcpkgs/libcap/template                       |     6 +-
 srcpkgs/libdrm/template                       |     4 +-
 srcpkgs/libdwarf/template                     |     5 +-
 srcpkgs/liberation-fonts-ttf/template         |     3 +-
 srcpkgs/libfm-qt/template                     |     6 +-
 srcpkgs/libgpod/template                      |    14 +-
 srcpkgs/libgravatar/template                  |     4 +-
 srcpkgs/libgusb/template                      |     6 +-
 srcpkgs/libhandy/update                       |     3 +-
 .../patches/CVE-2016-5104.patch               |    32 +
 srcpkgs/libimobiledevice/template             |    23 +-
 srcpkgs/libkcddb/template                     |     4 +-
 srcpkgs/libkdcraw5/template                   |     4 +-
 srcpkgs/libkdepim/template                    |     4 +-
 srcpkgs/libkexiv25/template                   |     4 +-
 srcpkgs/libkgapi/template                     |     4 +-
 srcpkgs/libkipi5/template                     |     4 +-
 srcpkgs/libkleo/template                      |     4 +-
 srcpkgs/libkomparediff2/template              |     4 +-
 srcpkgs/libksieve/template                    |     4 +-
 srcpkgs/liblouis/template                     |     7 +-
 srcpkgs/liblxqt/template                      |     6 +-
 srcpkgs/libmatroska/template                  |     4 +-
 srcpkgs/libmtp/template                       |    11 +-
 srcpkgs/libnpupnp/template                    |     4 +-
 srcpkgs/libopenal/patches/cross.patch         |    35 +
 srcpkgs/libopenal/template                    |    12 +-
 srcpkgs/libopenmpt/template                   |     4 +-
 srcpkgs/libplist-python3                      |     1 -
 srcpkgs/libplist/libplist-python.INSTALL.msg  |     1 -
 srcpkgs/libplist/template                     |    28 +-
 srcpkgs/libqb/template                        |     9 +-
 srcpkgs/libqtxdg/template                     |     8 +-
 .../patches/accept-ncursesw.patch             |    62 -
 .../patches/no-rpath-and-link.patch           |    65 -
 srcpkgs/libreadline8/template                 |    13 +-
 srcpkgs/libreoffice/template                  |    20 +-
 ...figure.ac-Add-support-for-Python-3.9.patch |    25 -
 srcpkgs/libsigrokdecode/template              |     8 +-
 srcpkgs/libsndfile/template                   |     6 +-
 srcpkgs/libsysstat/template                   |     6 +-
 srcpkgs/libusbmuxd/template                   |     7 +-
 srcpkgs/libvirt-python3/template              |     6 +-
 .../libvirt/patches/fix-virFileSetCOW.patch   |    27 +
 srcpkgs/libvirt/template                      |    64 +-
 srcpkgs/libwacom/template                     |     4 +-
 srcpkgs/libwnck/template                      |     4 +-
 srcpkgs/libykcs11                             |     2 +-
 srcpkgs/libykcs11-devel                       |     2 +-
 srcpkgs/libykpiv                              |     2 +-
 srcpkgs/libykpiv-devel                        |     2 +-
 srcpkgs/lilypond-doc/template                 |     4 +-
 srcpkgs/lilypond/template                     |    20 +-
 srcpkgs/linux4.14/files/ppc-dotconfig         |     4 +-
 srcpkgs/linux4.14/files/ppc64-dotconfig       |     4 +-
 srcpkgs/linux4.14/template                    |     4 +-
 srcpkgs/linux4.19/files/ppc-dotconfig         |    17 +-
 srcpkgs/linux4.19/files/ppc64-dotconfig       |    26 +-
 srcpkgs/linux4.19/files/ppc64le-dotconfig     |    19 +-
 srcpkgs/linux4.19/template                    |     4 +-
 srcpkgs/linux4.4/files/ppc-dotconfig          |     4 +-
 srcpkgs/linux4.4/files/ppc64-dotconfig        |     4 +-
 srcpkgs/linux4.9/files/ppc-dotconfig          |     3 +-
 srcpkgs/linux4.9/files/ppc64-dotconfig        |     4 +-
 srcpkgs/linux5.4/files/ppc-dotconfig          |    11 +-
 srcpkgs/linux5.4/files/ppc64-dotconfig        |    14 +-
 srcpkgs/linux5.4/files/ppc64le-dotconfig      |    14 +-
 srcpkgs/linux5.4/template                     |     4 +-
 srcpkgs/linux5.8/template                     |     4 +-
 srcpkgs/linux5.9-dbg                          |     1 -
 srcpkgs/linux5.9-headers                      |     1 -
 srcpkgs/linux5.9/files/DocBook/Makefile       |   282 -
 srcpkgs/linux5.9/files/arm64-dotconfig        | 11299 ----------------
 srcpkgs/linux5.9/files/i386-dotconfig         |  9839 --------------
 srcpkgs/linux5.9/files/mv-debug               |     7 -
 srcpkgs/linux5.9/files/ppc-dotconfig          |  7970 -----------
 srcpkgs/linux5.9/files/ppc64-dotconfig        |  9925 --------------
 srcpkgs/linux5.9/files/ppc64le-dotconfig      |  9660 -------------
 srcpkgs/linux5.9/files/x86_64-dotconfig       | 10027 --------------
 srcpkgs/linux5.9/patches/navi_arm64.patch     |   289 -
 srcpkgs/linux5.9/patches/ppc64-be-elfv2.patch |    86 -
 srcpkgs/linux5.9/template                     |   340 -
 srcpkgs/lximage-qt/template                   |     6 +-
 srcpkgs/lxqt-about/template                   |     6 +-
 srcpkgs/lxqt-admin/template                   |     6 +-
 srcpkgs/lxqt-archiver/template                |     4 +-
 srcpkgs/lxqt-build-tools/template             |     7 +-
 srcpkgs/lxqt-config/template                  |     6 +-
 srcpkgs/lxqt-globalkeys/template              |     6 +-
 srcpkgs/lxqt-notificationd/template           |     6 +-
 srcpkgs/lxqt-openssh-askpass/template         |     6 +-
 srcpkgs/lxqt-panel/template                   |     6 +-
 srcpkgs/lxqt-policykit/template               |     6 +-
 srcpkgs/lxqt-powermanagement/template         |     8 +-
 ...2d94b4c9de74b5bcf27fae2d10e6b2b11caf.patch |    30 +
 srcpkgs/lxqt-qtplugin/template                |     6 +-
 srcpkgs/lxqt-runner/template                  |     6 +-
 srcpkgs/lxqt-session/template                 |     6 +-
 srcpkgs/lxqt-sudo/template                    |     6 +-
 srcpkgs/lxqt-themes/template                  |     6 +-
 srcpkgs/lxqt/template                         |     6 +-
 srcpkgs/lz4/template                          |     1 -
 srcpkgs/m4/template                           |     7 -
 srcpkgs/mailcommon/template                   |     4 +-
 srcpkgs/mailimporter/template                 |     4 +-
 srcpkgs/man-pages/template                    |     6 +-
 srcpkgs/marble5/template                      |     4 +-
 srcpkgs/mbuffer/template                      |     6 +-
 srcpkgs/mdbook-toc/template                   |    15 -
 srcpkgs/messagelib/template                   |     4 +-
 .../patches/compositor-vulkan-fix-build.patch |    29 +
 srcpkgs/metacity/template                     |     9 +-
 srcpkgs/miniupnpd/files/miniupnpd/run         |     2 +-
 srcpkgs/miniupnpd/patches/foreground.patch    |    31 +
 srcpkgs/miniupnpd/template                    |    34 +-
 srcpkgs/mkfontscale/template                  |     3 +-
 srcpkgs/mksh/template                         |     4 +-
 srcpkgs/mlterm/template                       |     4 +-
 srcpkgs/monero-gui/template                   |     8 +-
 srcpkgs/monero/template                       |     4 +-
 srcpkgs/mongo-c-driver/template               |     4 +-
 srcpkgs/mozplugger/template                   |    25 +
 srcpkgs/msttcorefonts/template                |     9 +-
 srcpkgs/mtools/template                       |     4 +-
 srcpkgs/mtpaint/template                      |    13 +-
 srcpkgs/mutt/template                         |     4 +-
 srcpkgs/nasm-doc/template                     |     4 -
 srcpkgs/ncmpc/template                        |     5 +-
 srcpkgs/nerd-fonts/template                   |     5 +-
 srcpkgs/nextcloud-client/template             |     5 +-
 srcpkgs/nitrokey-app/template                 |     4 +-
 srcpkgs/node_exporter/template                |     4 +-
 srcpkgs/nss/patches/fix-bug1672703.patch      |   137 -
 srcpkgs/nss/template                          |     2 +-
 srcpkgs/nvidia340/files/kernel-4.11.patch     |    38 +
 srcpkgs/nvidia340/files/kernel-5.0.patch      |    27 +
 srcpkgs/nvidia340/files/kernel-5.5.patch      |     9 +
 srcpkgs/nvidia340/files/kernel-5.8.patch      |    92 -
 srcpkgs/nvidia340/files/kernel-5.9.patch      |   107 -
 srcpkgs/nvidia340/files/kernel-5.x.patch      |   781 --
 srcpkgs/nvidia340/files/usercopy.patch        |    33 +
 srcpkgs/nvidia340/template                    |     9 +-
 srcpkgs/obconf-qt/template                    |     6 +-
 srcpkgs/occt/patches/fix-osd-host.patch       |    13 -
 srcpkgs/occt/template                         |     2 +-
 srcpkgs/oksh/template                         |     4 +-
 .../patches/cmake.testing.working_dir.patch   |    36 -
 srcpkgs/okteta/template                       |     8 +-
 srcpkgs/okular/template                       |     4 +-
 srcpkgs/onedrive/template                     |     4 +-
 srcpkgs/openblas/template                     |     4 +-
 srcpkgs/openldap/update                       |     1 -
 srcpkgs/openradtool/template                  |     4 +-
 srcpkgs/openvswitch/template                  |     4 +-
 srcpkgs/opera/template                        |     4 +-
 srcpkgs/oragono/template                      |     4 +-
 srcpkgs/osinfo-db/template                    |     6 +-
 srcpkgs/pam-gnupg-git/template                |    10 +
 srcpkgs/pam-gnupg/template                    |     7 +-
 srcpkgs/pavucontrol-qt/template               |     4 +-
 srcpkgs/pax/template                          |     4 +-
 srcpkgs/pcmanfm-qt/template                   |     6 +-
 srcpkgs/pd/template                           |     4 +-
 srcpkgs/peaclock/template                     |    10 +-
 srcpkgs/perl-Math-FFT/template                |    10 +-
 srcpkgs/perl-YAML-PP/template                 |     7 +-
 srcpkgs/picom/template                        |     4 +-
 srcpkgs/pim-data-exporter/template            |     4 +-
 srcpkgs/pimcommon/template                    |     4 +-
 .../musl-static__thread-scanline_buffer.patch |    35 +
 srcpkgs/pixman/template                       |    39 +-
 srcpkgs/plocate/INSTALL                       |     7 -
 srcpkgs/plocate/files/plocate.cron-daily      |     5 -
 srcpkgs/plocate/files/pupdatedb               |     8 -
 srcpkgs/plocate/patches/musl.patch            |    10 +
 srcpkgs/plocate/template                      |    18 +-
 srcpkgs/portage/template                      |     6 +-
 srcpkgs/postfix/template                      |     4 +-
 srcpkgs/procs/template                        |     4 +-
 srcpkgs/puzzles/template                      |     9 +-
 srcpkgs/pygtk/patches/pango-1.44.6.patch      |    41 -
 srcpkgs/pygtk/template                        |     8 -
 srcpkgs/python-atomicwrites/template          |     6 +-
 srcpkgs/python-attrs/template                 |     6 +-
 srcpkgs/python-bcrypt/template                |     6 +-
 srcpkgs/python-cryptography/template          |     4 +-
 srcpkgs/python-cryptography_vectors/template  |     6 +-
 srcpkgs/python-hypothesis/template            |    32 +-
 srcpkgs/python-idna/template                  |     6 +-
 srcpkgs/python-lxml/template                  |     6 +-
 srcpkgs/python-parsing/template               |     6 +-
 srcpkgs/python-py/template                    |    19 -
 srcpkgs/python-pytz/template                  |     6 +-
 srcpkgs/python-zope.interface/template        |     7 +-
 srcpkgs/python3-PyICU/template                |     6 +-
 srcpkgs/python3-SecretStorage/template        |     8 +-
 srcpkgs/python3-blessed/template              |     6 +-
 srcpkgs/python3-boto3/template                |     4 +-
 srcpkgs/python3-cairo/template                |     6 +-
 srcpkgs/python3-certifi/template              |     6 +-
 srcpkgs/python3-codespell/template            |     6 +-
 srcpkgs/python3-cppy/template                 |    19 -
 srcpkgs/python3-cups/template                 |    13 +-
 srcpkgs/python3-dotenv/template               |     6 +-
 srcpkgs/python3-grpcio-tools/template         |     4 +-
 srcpkgs/python3-grpcio/template               |     4 +-
 srcpkgs/python3-h11/template                  |     6 +-
 srcpkgs/python3-hpack/template                |     6 +-
 srcpkgs/python3-hyper-h2/template             |     6 +-
 srcpkgs/python3-hyperframe/template           |     6 +-
 srcpkgs/python3-hypothesis                    |     1 +
 srcpkgs/python3-hypothesis/template           |    21 -
 srcpkgs/python3-hypothesis/update             |     1 -
 srcpkgs/python3-ipython/template              |     6 +-
 srcpkgs/python3-josepy/template               |     6 +-
 srcpkgs/python3-kiwisolver/template           |    22 +-
 srcpkgs/python3-more-itertools/template       |     6 +-
 srcpkgs/python3-numpy/template                |     8 +-
 srcpkgs/python3-pandas/template               |     4 +-
 srcpkgs/python3-paramiko/template             |     6 +-
 srcpkgs/python3-pexpect/template              |     6 +-
 srcpkgs/python3-pipenv/template               |     6 +-
 srcpkgs/python3-pynacl/template               |    10 +-
 srcpkgs/python3-pyqtgraph/template            |     9 +-
 srcpkgs/python3-pytest/template               |     6 +-
 srcpkgs/python3-scikit-learn/template         |     6 +-
 srcpkgs/python3-scipy/template                |     6 +-
 srcpkgs/python3-scour/template                |     8 +-
 srcpkgs/python3-sip-PyQt5/template            |     6 +-
 srcpkgs/python3-toml/template                 |     4 +-
 srcpkgs/python3-tornado/template              |     4 +-
 srcpkgs/python3-traitlets/template            |     6 +-
 srcpkgs/python3-virtualenv/template           |     6 +-
 srcpkgs/python3-youtube-search/template       |     6 +-
 srcpkgs/python3-zope.event/template           |     6 +-
 srcpkgs/qView/template                        |    13 -
 srcpkgs/qemu/template                         |    27 +-
 srcpkgs/qpdf/template                         |     4 +-
 srcpkgs/qterminal/template                    |     6 +-
 srcpkgs/qtermwidget/template                  |     6 +-
 srcpkgs/qtutilities/template                  |     4 +-
 srcpkgs/quota/template                        |    11 +-
 srcpkgs/r128gain/template                     |    14 +
 srcpkgs/redis/template                        |     4 +-
 srcpkgs/restic/template                       |     4 +-
 srcpkgs/rex/template                          |     8 +-
 srcpkgs/rinutils/template                     |    14 +-
 srcpkgs/rr/template                           |     4 +-
 srcpkgs/rust-cargo-audit/template             |     8 +-
 srcpkgs/sbcl/patches/fix-avx2.patch           |    25 +
 .../only-use-memcpy-version-on-glibc.patch    |    27 +
 srcpkgs/sbcl/template                         |    12 +-
 srcpkgs/schilytools/template                  |     4 +-
 srcpkgs/seafile-client-qt/template            |     4 +-
 srcpkgs/seafile-libclient/template            |     6 +-
 srcpkgs/shfmt/template                        |     7 +-
 srcpkgs/signon-kwallet-extension/template     |     4 +-
 srcpkgs/simutron/patches/firmware.patch       |    17 +
 srcpkgs/simutron/template                     |    32 +
 srcpkgs/skaffold/template                     |     4 +-
 srcpkgs/skype/template                        |     4 +-
 srcpkgs/slack-desktop/template                |     4 +-
 srcpkgs/sleuthkit/template                    |     4 +-
 srcpkgs/slurp/template                        |     6 +-
 srcpkgs/sonic-visualiser/template             |     2 +-
 srcpkgs/sound-juicer/template                 |    12 +-
 srcpkgs/soundfont-fluid/template              |     3 +-
 srcpkgs/spectacle/template                    |     4 +-
 srcpkgs/spt/template                          |     7 +-
 srcpkgs/sqlmap/template                       |     4 +-
 srcpkgs/squashfs-tools-ng/template            |     4 +-
 srcpkgs/steam-fonts/template                  |     8 +-
 srcpkgs/stlarch-font/template                 |     3 +-
 srcpkgs/straw-viewer/template                 |     6 +-
 srcpkgs/streamlink/template                   |     6 +-
 srcpkgs/stress-ng/template                    |     4 +-
 srcpkgs/sublime-merge-bin/template            |     4 +-
 srcpkgs/sushi/template                        |     4 +-
 srcpkgs/svgpart/template                      |     4 +-
 .../swell-foop/patches/fix-vala-array.patch   |    11 -
 srcpkgs/syncthing/template                    |     4 +-
 srcpkgs/template-glib/template                |     6 +-
 srcpkgs/terminus-font/template                |     3 +-
 srcpkgs/termsyn-font/template                 |     3 +-
 srcpkgs/tewi-font/template                    |     3 +-
 srcpkgs/tgt/template                          |     4 +-
 srcpkgs/tmux/patches/a868bac.patch            |    30 +
 srcpkgs/tmux/template                         |     6 +-
 srcpkgs/topgrade/template                     |     4 +-
 srcpkgs/toybox/template                       |     4 +-
 srcpkgs/tracker/update                        |     1 -
 srcpkgs/ttf-ubuntu-font-family/template       |     5 +-
 srcpkgs/tzdata/template                       |    16 +-
 srcpkgs/tzutils/template                      |     4 +-
 srcpkgs/ufw-extras/template                   |     5 +-
 srcpkgs/uget-integrator/template              |    24 -
 srcpkgs/umbrello/template                     |     4 +-
 srcpkgs/unicorn/template                      |    19 +-
 srcpkgs/up/template                           |     4 +-
 srcpkgs/upower/template                       |     9 +-
 srcpkgs/usbmuxd/template                      |    17 +-
 srcpkgs/vim-gnupg/template                    |     3 +-
 srcpkgs/vim/template                          |     6 +-
 srcpkgs/vivaldi/template                      |     6 +-
 srcpkgs/vkQuake/template                      |     4 +-
 srcpkgs/vpnd/files/vpnd/run                   |     2 -
 srcpkgs/vpnd/template                         |     6 +-
 srcpkgs/wasmtime/template                     |     8 +-
 srcpkgs/webkit2gtk/template                   |     4 +-
 srcpkgs/wfuzz/template                        |     4 +-
 srcpkgs/when/template                         |     5 +-
 srcpkgs/wine/template                         |     4 +-
 srcpkgs/wlsunset/template                     |    17 -
 srcpkgs/xbps-triggers/files/dkms              |     6 +-
 srcpkgs/xbps-triggers/template                |     2 +-
 srcpkgs/xf86-video-vesa/template              |     6 +-
 srcpkgs/xfce4-cpufreq-plugin/template         |     8 +-
 srcpkgs/xfce4-dict/template                   |     6 +-
 srcpkgs/xfce4-screensaver/template            |     4 +-
 srcpkgs/xfce4-weather-plugin/template         |     4 +-
 srcpkgs/xfdesktop/template                    |     4 +-
 srcpkgs/xfwm4-themes/template                 |     3 +-
 srcpkgs/xfwm4/template                        |     4 +-
 srcpkgs/xlbiff/patches/intl.patch             |    20 +
 srcpkgs/xlbiff/template                       |    26 +-
 srcpkgs/yakuake/template                      |     4 +-
 srcpkgs/yggdrasil/files/yggdrasil/log/run     |     1 -
 srcpkgs/yggdrasil/files/yggdrasil/run         |    12 +-
 srcpkgs/yggdrasil/template                    |     6 +-
 srcpkgs/ykpivmgr                              |     1 -
 srcpkgs/ykpivmgr/patches/ssl_obsolete.patch   |    22 +
 .../{yubico-piv-tool => ykpivmgr}/template    |    46 +-
 srcpkgs/{yubico-piv-tool => ykpivmgr}/update  |     0
 srcpkgs/youtube-dl/template                   |    12 +-
 srcpkgs/zim/patches/01-py39.patch             |   234 +
 srcpkgs/zim/patches/02-py39.patch             |    22 +
 srcpkgs/zim/template                          |     6 +-
 srcpkgs/zoxide/template                       |     4 +-
 640 files changed, 3735 insertions(+), 64480 deletions(-)
 create mode 100644 srcpkgs/abireport/patches/fix-compilation-with-newer-go.patch
 delete mode 100644 srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch
 delete mode 100644 srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
 delete mode 100644 srcpkgs/ballerburg/template
 create mode 100644 srcpkgs/bs1770gain/template
 delete mode 100644 srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch
 delete mode 100644 srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
 delete mode 100644 srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
 delete mode 120000 srcpkgs/corecollector-devel
 delete mode 100644 srcpkgs/corecollector/template
 create mode 100644 srcpkgs/cropgui/patches/python3-support.patch
 delete mode 120000 srcpkgs/cross-aarch64-linux-gnu/files/use-pure-64bit-configs.patch
 delete mode 120000 srcpkgs/cross-aarch64-linux-musl/files/use-pure-64bit-configs.patch
 create mode 120000 srcpkgs/cross-powerpc64-linux-gnu/files/ppc64-pure64.patch
 delete mode 120000 srcpkgs/cross-powerpc64-linux-gnu/files/use-pure-64bit-configs.patch
 create mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/ppc64-pure64.patch
 delete mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/use-pure-64bit-configs.patch
 create mode 120000 srcpkgs/cross-powerpc64le-linux-gnu/files/ppc64-pure64.patch
 delete mode 120000 srcpkgs/cross-powerpc64le-linux-gnu/files/use-pure-64bit-configs.patch
 create mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-pure64.patch
 delete mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/use-pure-64bit-configs.patch
 delete mode 120000 srcpkgs/cross-x86_64-linux-gnu/files/use-pure-64bit-configs.patch
 delete mode 120000 srcpkgs/cross-x86_64-linux-musl/files/use-pure-64bit-configs.patch
 create mode 100644 srcpkgs/cups-filters/patches/disable-test-font-cross-compile-check.patch
 create mode 100644 srcpkgs/econnman/template
 create mode 100644 srcpkgs/econnman/update
 delete mode 100644 srcpkgs/enlightenment/patches/mips-name-clash.patch
 create mode 100644 srcpkgs/ettercap/patches/CVE-2017-6430.patch
 create mode 100644 srcpkgs/ettercap/patches/CVE-2017-8366.patch
 delete mode 100644 srcpkgs/ettercap/patches/libressl.patch
 delete mode 100644 srcpkgs/firefox-esr/files/firefox-wayland
 delete mode 100644 srcpkgs/firefox-esr/patches/big-endian-image-decoders.patch
 create mode 100644 srcpkgs/firefox-esr/patches/disable-image-format-warning.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-cross.patch
 rename srcpkgs/firefox-esr/patches/{fix-i686-ppc-musl.patch => fix-i686-musl.patch} (100%)
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-image-format-warning.patch
 create mode 100644 srcpkgs/firefox-esr/patches/fix-sandbox-membarrier.patch
 create mode 100644 srcpkgs/firefox-esr/patches/fix-seccomp-bpf.patch
 create mode 100644 srcpkgs/firefox-esr/patches/fix-toolkit.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch
 create mode 100644 srcpkgs/firefox-esr/patches/gettid-musl.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/ppc32-fix-build.patch
 rename srcpkgs/firefox-esr/patches/{rust-configure.patch => remove-rustc-check.patch} (85%)
 delete mode 100644 srcpkgs/firefox-esr/patches/rust-has-i128.patch
 delete mode 100644 srcpkgs/firefox-esr/patches/sandbox-fork.patch
 create mode 100644 srcpkgs/fontforge/patches/sys_select_h.patch
 create mode 100644 srcpkgs/gcc/patches/ppc64-pure64.patch
 delete mode 100644 srcpkgs/gcc/patches/use-pure-64bit-configs.patch
 delete mode 100644 srcpkgs/hunspell-pt_PT-preao/template
 delete mode 100644 srcpkgs/hunspell-pt_PT/template
 delete mode 100644 srcpkgs/iwd/patches/resolvconf-default.patch
 delete mode 100644 srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
 delete mode 120000 srcpkgs/libaspell
 create mode 100644 srcpkgs/libimobiledevice/patches/CVE-2016-5104.patch
 create mode 100644 srcpkgs/libopenal/patches/cross.patch
 delete mode 120000 srcpkgs/libplist-python3
 delete mode 100644 srcpkgs/libplist/libplist-python.INSTALL.msg
 delete mode 100644 srcpkgs/libreadline8/patches/accept-ncursesw.patch
 delete mode 100644 srcpkgs/libreadline8/patches/no-rpath-and-link.patch
 delete mode 100644 srcpkgs/libsigrokdecode/patches/0001-configure.ac-Add-support-for-Python-3.9.patch
 create mode 100644 srcpkgs/libvirt/patches/fix-virFileSetCOW.patch
 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/ppc64-be-elfv2.patch
 delete mode 100644 srcpkgs/linux5.9/template
 create mode 100644 srcpkgs/lxqt-qtplugin/patches/8cc32d94b4c9de74b5bcf27fae2d10e6b2b11caf.patch
 delete mode 100644 srcpkgs/mdbook-toc/template
 create mode 100644 srcpkgs/metacity/patches/compositor-vulkan-fix-build.patch
 create mode 100644 srcpkgs/miniupnpd/patches/foreground.patch
 create mode 100644 srcpkgs/mozplugger/template
 delete mode 100644 srcpkgs/nss/patches/fix-bug1672703.patch
 create mode 100644 srcpkgs/nvidia340/files/kernel-4.11.patch
 create mode 100644 srcpkgs/nvidia340/files/kernel-5.0.patch
 create mode 100644 srcpkgs/nvidia340/files/kernel-5.5.patch
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.8.patch
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.9.patch
 delete mode 100644 srcpkgs/nvidia340/files/kernel-5.x.patch
 create mode 100644 srcpkgs/nvidia340/files/usercopy.patch
 delete mode 100644 srcpkgs/occt/patches/fix-osd-host.patch
 delete mode 100644 srcpkgs/okteta/patches/cmake.testing.working_dir.patch
 create mode 100644 srcpkgs/pam-gnupg-git/template
 create mode 100644 srcpkgs/pixman/patches/musl-static__thread-scanline_buffer.patch
 delete mode 100644 srcpkgs/plocate/INSTALL
 delete mode 100644 srcpkgs/plocate/files/plocate.cron-daily
 delete mode 100644 srcpkgs/plocate/files/pupdatedb
 create mode 100644 srcpkgs/plocate/patches/musl.patch
 delete mode 100644 srcpkgs/pygtk/patches/pango-1.44.6.patch
 delete mode 100644 srcpkgs/python-py/template
 delete mode 100644 srcpkgs/python3-cppy/template
 create mode 120000 srcpkgs/python3-hypothesis
 delete mode 100644 srcpkgs/python3-hypothesis/template
 delete mode 100644 srcpkgs/python3-hypothesis/update
 delete mode 100644 srcpkgs/qView/template
 create mode 100644 srcpkgs/r128gain/template
 create mode 100644 srcpkgs/sbcl/patches/fix-avx2.patch
 create mode 100644 srcpkgs/sbcl/patches/only-use-memcpy-version-on-glibc.patch
 create mode 100644 srcpkgs/simutron/patches/firmware.patch
 create mode 100644 srcpkgs/simutron/template
 delete mode 100644 srcpkgs/swell-foop/patches/fix-vala-array.patch
 create mode 100644 srcpkgs/tmux/patches/a868bac.patch
 delete mode 100644 srcpkgs/uget-integrator/template
 delete mode 100644 srcpkgs/vpnd/files/vpnd/run
 delete mode 100644 srcpkgs/wlsunset/template
 create mode 100644 srcpkgs/xlbiff/patches/intl.patch
 delete mode 120000 srcpkgs/yggdrasil/files/yggdrasil/log/run
 delete mode 120000 srcpkgs/ykpivmgr
 create mode 100644 srcpkgs/ykpivmgr/patches/ssl_obsolete.patch
 rename srcpkgs/{yubico-piv-tool => ykpivmgr}/template (58%)
 rename srcpkgs/{yubico-piv-tool => ykpivmgr}/update (100%)
 create mode 100644 srcpkgs/zim/patches/01-py39.patch
 create mode 100644 srcpkgs/zim/patches/02-py39.patch

diff --git a/.mailmap b/.mailmap
index 8a874ff3a39..123c16459b9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -52,4 +52,3 @@ John <me@johnnynator.dev> John Zimmermann <johnz@posteo.net>
 Daniel Kolesa <daniel@octaforge.org> q66 <daniel@octaforge.org>
 teldra <teldra@rotce.de> Teldra <teldra@rotce.de>
 teldra <teldra@rotce.de> xor <aur@rotce.de>
-Andrew J. Hesford <ajh@sideband.org> Andrew J. Hesford <ahesford@gleason.com>
diff --git a/Manual.md b/Manual.md
index e1a99ecbcc0..5b1266ba715 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1267,7 +1267,7 @@ The following variables can be used for this purpose:
 
 - `system_groups` This specifies the names of the new *system groups* to be created, separated
 by blanks. Optionally the **gid** can be specified by delimiting it with a
-colon, i.e `system_groups="_mygroup:78"` or `system_groups="_foo _blah:8000"`.
+colon, i.e `system_groups="mygroup:78"` or `system_groups="foo blah:8000"`.
 
 - `system_accounts` This specifies the names of the new **system users/groups** to be created,
 separated by blanks, i.e `system_accounts="_foo _blah:22"`. Optionally the **uid** and **gid**
@@ -1284,7 +1284,7 @@ The **system user** is created by using a dynamically allocated **uid/gid** in y
 and it's created as a `system account`, unless the **uid** is set. A new group will be created for the
 specified `system account` and used exclusively for this purpose.
 
-System accounts and groups must be prefixed with an underscore to prevent clashing with names of user
+System accounts must be prefixed with an underscore to prevent clashing with names of user
 accounts.
 
 > NOTE: The underscore policy does not apply to old packages, due to the inevitable breakage of
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index fbbb6a8d950..ef0715ef2e4 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -6,21 +6,7 @@ do_configure() {
 	[ ! -d ${cmake_builddir:=build} ] && mkdir -p ${cmake_builddir}
 	cd ${cmake_builddir}
 
-	if [ -z "$CHROOT_READY" ]; then
-		cat >bootstrap.cmake <<_EOF
-SET(CMAKE_SYSTEM_NAME Linux)
-SET(CMAKE_SYSTEM_VERSION 1)
-
-SET(CMAKE_C_COMPILER   ${CC})
-SET(CMAKE_CXX_COMPILER ${CXX})
-
-SET(CMAKE_FIND_ROOT_PATH  ${XBPS_MASTERDIR})
-
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-_EOF
-		configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
-	elif [ "$CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		case "$XBPS_TARGET_MACHINE" in
 			x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
 			i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh
index 82e91ef2d13..a2ba1a005a9 100644
--- a/common/build-style/gnu-makefile.sh
+++ b/common/build-style/gnu-makefile.sh
@@ -7,7 +7,7 @@ do_build() {
 	if [ -z "$make_use_env" ]; then
 		${make_cmd} \
 			CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-			CPP="$CPP" AS="$AS" OBJCOPY="$OBJCOPY" OBJDUMP="$OBJDUMP" \
+			CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
 			CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
 			${makejobs} ${make_build_args} ${make_build_target}
 	else
diff --git a/common/shlibs b/common/shlibs
index 3c2672e8743..eb83b5feeaf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -202,7 +202,6 @@ libpam.so.0 pam-libs-1.1.6_3
 libpamc.so.0 pam-libs-1.1.6_3
 libpam_misc.so.0 pam-libs-1.1.6_3
 libcap.so.2 libcap-2.16_1
-libpsx.so.2 libcap-2.45_1
 liblzma.so.5 liblzma-5.0.0_1
 libuuid.so.1 libuuid-2.18_1
 libblkid.so.1 libblkid-2.18_1
@@ -555,8 +554,8 @@ libicudata.so.67 icu-libs-67.1_1
 libicutu.so.67 icu-libs-67.1_1
 libicuuc.so.67 icu-libs-67.1_1
 libicutest.so.67 icu-libs-67.1_1
-libaspell.so.15 libaspell-0.60.8_2
-libpspell.so.15 libaspell-0.60.8_2
+libaspell.so.15 aspell-0.60_1
+libpspell.so.15 aspell-0.60_1
 libenchant.so.1 enchant-1.4.2_1
 libenchant-2.so.2 enchant2-2.2.3_1
 libgconf-2.so.4 GConf-2.32.0_1
@@ -1058,8 +1057,8 @@ 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
-libplist-2.0.so.3 libplist-2.2.0_1
-libplist++-2.0.so.3 libplist++-2.2.0_1
+libplist.so.3 libplist-1.12_1
+libplist++.so.3 libplist++-1.12_1
 libnsbmp.so.0 libnsbmp-0.0.3_1
 libnsgif.so.0 libnsgif-0.0.3_1
 libparserutils.so.0 libparserutils-0.1.1_1
@@ -1203,7 +1202,6 @@ librygel-db-2.6.so.2 librygel-0.28.0_1
 libharfbuzz.so.0 libharfbuzz-0.9.4_1
 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
@@ -2035,13 +2033,13 @@ libsysstat-qt5.so.0 libsysstat-0.3.2_1
 libpolkit-qt5-agent-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
-libfm-qt.so.8 libfm-qt-0.16.0_1
+libfm-qt.so.7 libfm-qt-0.15.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
 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
+libusbmuxd.so.6 libusbmuxd-1.0.10_1
+libimobiledevice.so.6 libimobiledevice-1.2.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
@@ -2354,7 +2352,7 @@ libp8-platform.so.2 p8-platform-2.1.0.1_1
 libOIS.so.1.5.0 ois-1.5_1
 libSILLY.so.1 silly-0.1.0_1
 libkeybinder-3.0.so.0 libkeybinder3-0.3.0_1
-libbrlapi.so.0.8 brltty-6.1_1
+libbrlapi.so.0.7 brltty-6.0_1
 liblouis.so.20 liblouis-3.11.0_1
 libCEGUIBase-0.7.9.so cegui07-0.7.9_1
 libCEGUIFalagardWRBase-0.7.9.so cegui07-0.7.9_1
@@ -2939,14 +2937,14 @@ liblog4cplus-2.0.so.3 log4cplus-2.0.0_1
 liblog4cplusU-2.0.so.3 log4cplus-2.0.3_1
 libpng12.so.0 libpng12-1.2.56_2
 libpng.so.3 libpng12-1.2.56_2
-libcapnpc-0.8.0.so capnproto-0.8.0_1
-libcapnp-json-0.8.0.so capnproto-0.8.0_1
-libcapnp-rpc-0.8.0.so capnproto-0.8.0_1
-libcapnp-0.8.0.so capnproto-0.8.0_1
-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
+libcapnpc-0.7.0.so capnproto-0.7.0_1
+libcapnp-json-0.7.0.so capnproto-0.7.0_1
+libcapnp-rpc-0.7.0.so capnproto-0.7.0_1
+libcapnp-0.7.0.so capnproto-0.7.0_1
+libkj-http-0.7.0.so capnproto-0.7.0_1
+libkj-async-0.7.0.so capnproto-0.7.0_1
+libkj-test-0.7.0.so capnproto-0.7.0_1
+libkj-0.7.0.so capnproto-0.7.0_1
 libkea-asiodns.so.1 libkea-1.7.0_1
 libkea-asiolink.so.19 libkea-1.9.0_1
 libkea-cc.so.8 libkea-1.6.0_1
@@ -3994,3 +3992,5 @@ libSeExpr2Editor.so.3 seexpr-krita-3.4.4.0_1
 libSeExpr2.so.3 seexpr-krita-3.4.4.0_1
 liburing.so.1 liburing-0.7_1
 libbson-1.0.so.0 libbson-1.17.0_1
+libsimavr.so.1 simavr-1.6_2
+libsimavrparts.so.1 simavr-1.6_2
diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index c1e097d2ae6..afb90f6dda4 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=0.16.0
+version=0.15.0
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools-devel"
@@ -10,7 +10,7 @@ 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=781f092611cd330bd365df68b3b8793cfef8ae13b59f10494e4d0813832a0a2f
+checksum=e9addeeb78930f5654c4e155af8b46efa58dd2daecc02cfc7e0a9835f1bc88ad
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-x11extras-devel qt5-svg-devel"
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index cb73a6c9f16..c128ccd8cd7 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,9 +1,9 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 _majorver=7.0.10
-_patchver=35
+_patchver=34
 version="${_majorver}.${_patchver}"
-revision=1
+revision=2
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
 build_style=gnu-configure
 configure_args="--without-autotrace --with-wmf=yes
@@ -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=fca8e29822ac97b5de755d8809ffccc6585df4c4dde61f93d13ce2bd269982b7
+checksum=0202a99644785f0bd9de611bb3141fbf579d707eea2dd8706165c9be8160966d
 
 subpackages="libmagick libmagick-devel"
 
diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 1260ed60e6e..ed9b30ace48 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,9 +1,9 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.11
-_patchver=35
+_patchver=34
 version="${_majorver}.${_patchver}"
-revision=1
+revision=2
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
 build_style=gnu-configure
 configure_args="--without-autotrace --with-wmf=yes
@@ -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=d96d4d5bf1722450c36808eb221c55304fe86c640d0eb62b9f54ade5acfad6e1
+checksum=6ad724edd690b895740cfc2a3e4d966f68987d52fbb630a14c7bc01c22e4368e
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
diff --git a/srcpkgs/MultiMarkdown/template b/srcpkgs/MultiMarkdown/template
index 96d153d8729..c6eff69746f 100644
--- a/srcpkgs/MultiMarkdown/template
+++ b/srcpkgs/MultiMarkdown/template
@@ -1,6 +1,6 @@
 # Template file for 'MultiMarkdown'
 pkgname=MultiMarkdown
-version=6.6.0
+version=6.5.2
 revision=1
 wrksrc="$pkgname-6-$version"
 build_style=cmake
@@ -11,12 +11,12 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="http://fletcherpenney.net/multimarkdown/"
 distfiles="https://github.com/fletcher/MultiMarkdown-6/archive/${version}.tar.gz"
-checksum=6496b43c933d2f93ff6be80f5029d37e9576a5d5eacb90900e6b28c90405037f
+checksum=97e9bb25e8eb151f178fd34212852f5d40d8fd01b317e718fded11603fafb773
 
 post_install() {
 	# TODO: markdown alternatives
 	mv ${DESTDIR}/usr/bin/markdown ${DESTDIR}/usr/bin/multimarkdown-markdown
 	# Avoid conflict with mtools
 	mv ${DESTDIR}/usr/bin/mmd  ${DESTDIR}/usr/bin/multimarkdown-mmd
-	vlicense LICENSE
+	vlicense LICENSE.txt LICENSE
 }
diff --git a/srcpkgs/ProcDump-for-Linux/template b/srcpkgs/ProcDump-for-Linux/template
index 71889167d18..8da9e567ed7 100644
--- a/srcpkgs/ProcDump-for-Linux/template
+++ b/srcpkgs/ProcDump-for-Linux/template
@@ -1,16 +1,16 @@
 # Template file for 'ProcDump-for-Linux'
 pkgname=ProcDump-for-Linux
-version=1.1.1
+version=1.1
 revision=1
 build_style=gnu-makefile
 makedepends="zlib-devel"
 depends="gdb"
 short_desc="ProcDump-for-Linux provides a way to create core dumps"
-maintainer="<ndowens@artixlinux.org>"
+maintainer="<ndowens04@gmail.com>"
 license="MIT"
 homepage="https://github.com/Microsoft/ProcDump-for-Linux"
 distfiles="https://github.com/Microsoft/${pkgname}/archive/${version}.tar.gz"
-checksum=712be77d97f802ca7ad7eaaa521f7742c15db93af0c968c8b54e48e3ab341baa
+checksum=f054dc4b3a59799ee9e53bf7ec0e1d9170ecde1037bd8fa8c3c3d7c9ba1a39c3
 disable_parallel_build=yes
 
 CFLAGS="-fcommon"
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index 1631d51ccba..59d7363dac2 100644
--- a/srcpkgs/Rocket.Chat-Desktop/template
+++ b/srcpkgs/Rocket.Chat-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Rocket.Chat-Desktop'
 pkgname=Rocket.Chat-Desktop
-version=3.0.5
+version=3.0.3
 revision=1
 _electron_ver=10
 wrksrc="Rocket.Chat.Electron-${version}"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://rocket.chat/"
 distfiles="https://github.com/RocketChat/Rocket.Chat.Electron/archive/${version}.tar.gz"
-checksum=c1157c4b67afdb4eda95a3cf946808b1262ef72a6f182e93fd05902a805b2a56
+checksum=c8c4f4d29ffe7cee825e7967bdabe1abdadc7153f169c36ee971b491a29628b1
 
 export USE_SYSTEM_APP_BUILDER=true
 
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 9520e609e00..01fae396e3d 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=1.37.2
+version=1.34.5
 revision=1
 # Due to electron
 # 32-bit is not supported https://github.com/signalapp/Signal-Desktop/issues/1661
@@ -12,7 +12,7 @@ maintainer="Julio Galvan <juliogalvan@protonmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=26da47d05fd3a78609054224159a737ed3efb722719dee3797893006bdc61ac7
+checksum=7ece0d698ad9550802f02ad8718f3d6a70941dc453dfdd73556dead7802410d2
 nostrip_files="signal-desktop"
 
 pre_build() {
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 12caff7b6f1..acf3a904833 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,6 +1,6 @@
 # Template file for 'Thunar'
 pkgname=Thunar
-version=1.8.16
+version=1.8.15
 revision=1
 wrksrc=thunar-${version}
 build_style=gnu-configure
@@ -16,7 +16,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=221338b1cbf14cbee2b9091f9b4e4f47cf6bc9513bbb113762da7ca4f8173c4c
+checksum=7624560cf21f13869804947042610aab22075146b711593f11ceb9e494277c93
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd
diff --git a/srcpkgs/abireport/patches/fix-compilation-with-newer-go.patch b/srcpkgs/abireport/patches/fix-compilation-with-newer-go.patch
new file mode 100644
index 00000000000..107f17a565a
--- /dev/null
+++ b/srcpkgs/abireport/patches/fix-compilation-with-newer-go.patch
@@ -0,0 +1,47 @@
+--- src/abireport/main.go
++++ src/abireport/main.go
+@@ -17,7 +17,7 @@
+ package main
+ 
+ import (
+-	"abireport/cmd"
++	"github.com/clearlinux/abireport/src/abireport/cmd"
+ 	"os"
+ )
+
+--- src/abireport/cmd/root.go
++++ src/abireport/cmd/root.go
+@@ -18,7 +18,7 @@ package cmd
+ 
+ import (
+ 	"github.com/spf13/cobra"
+-	"libabi"
++	"github.com/clearlinux/abireport/src/libabi"
+ )
+ 
+ var (
+--- src/abireport/cmd/scan_packages.go
++++ src/abireport/cmd/scan_packages.go
+@@ -17,10 +17,10 @@
+ package cmd
+ 
+ import (
+-	"explode"
++	"github.com/clearlinux/abireport/src/explode"
+ 	"fmt"
+ 	"github.com/spf13/cobra"
+-	"libabi"
++	"github.com/clearlinux/abireport/src/libabi"
+ 	"os"
+ 	"path/filepath"
+ )
+--- src/abireport/cmd/scan_tree.go
++++ src/abireport/cmd/scan_tree.go
+@@ -19,7 +19,7 @@ package cmd
+ import (
+ 	"fmt"
+ 	"github.com/spf13/cobra"
+-	"libabi"
++	"github.com/clearlinux/abireport/src/libabi"
+ 	"os"
+ )
diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index 16ab6032c25..b23ea4d8565 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,16 +1,16 @@
 # Template file for 'abireport'
 pkgname=abireport
-version=1.0.11
+version=1.0.7
 revision=1
 build_style=go
 go_import_path=github.com/clearlinux/abireport
-go_package="${go_import_path}/abi-report"
+go_package="${go_import_path}/src/abireport"
 short_desc="Tool to create ABI reports from ELF binaries"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/clearlinux/abireport"
-distfiles="https://github.com/clearlinux/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=2cf4c6cbb14e9d8839d11158142f44589779483c29433d8c422ed9cfa818e7d1
+distfiles="https://github.com/clearlinux/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=c46c46bff3dc873cb84a66c639c38b2df14f095d95a4bb77e3b96904b8219399
 
 post_install() {
 	vman man/abireport.1
diff --git a/srcpkgs/afl/template b/srcpkgs/afl/template
index 8ed1a48e051..17944716d61 100644
--- a/srcpkgs/afl/template
+++ b/srcpkgs/afl/template
@@ -24,10 +24,3 @@ do_build() {
 	LDFLAGS="${LDFLAGS} -pie" \
 	make PREFIX=/usr CC=clang CXX=clang++ -C llvm_mode
 }
-
-post_install() {
-	# Test cases contain binary .../testcases/others/elf/small_exec.elf
-	# so move them to /usr/lib/afl
-	mv ${DESTDIR}/usr/{share,lib}/afl/testcases
-}
-
diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index 07ee492fcd1..43e7a878c53 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.08.3
+version=20.08.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=336335f7d114e5ba5f506ed4c44dc27e932ad4e8fcf65cc6789644138bdd3ca3
+checksum=20173d00dc764f6a1e8e0b433d96b982ceadcb17e9bd067caf2967fd5440eb51
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 678b24adcbc..435abbd279f 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.08.3
+version=20.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons"
@@ -10,7 +10,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=9a38969b4e99ef7190c5c48740efdb3048337914086d47134e98c0ea02e9c9a2
+checksum=e4a2696e0e0cf69926d34f160a4581131a1da8244355787564b75dec06db1b30
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"
diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 4fa86ac539c..76ea89a953a 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.08.3
+version=20.08.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=35d63950ee26456317322238b71d9be76f4f0df0749cd532e1454fbf7b06de3e
+checksum=639d72ae3d32f681ddb046a87d625871b485785602cf35b817e89004def4dc5e
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index f064435e9c4..3f20f3f2419 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.08.3
+version=20.08.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=87be1fa5799b25529090dff623f15c9d1e97ab153f359fa338b212e3c730fa8a
+checksum=5699a1d44a9812c9530bc61af5822ff34a573b168d72230cd8261c05065c06e3
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"
diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index 35b684f3398..efa0282a88b 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.08.3
+version=20.08.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=667c131455cbea434c4d1da9114d5e2c234d5a8b601c4f636dfe304ccfc820fd
+checksum=4897ca92d6b68f75254e1c419438275a94fa678c9f062dcd91c0267129886ca7
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index e7dc8b96ebc..52ab558881e 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.08.3
+version=20.08.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=f0289a93dc4686b2de23e30faa9f9ec881bac891e582a8723ad9dce5e59ef747
+checksum=618400950fa44f0c578ab51c3b311a47e0b2df47203f754e50bcc363201a9fc7
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 6ffc554fbc0..5b0d781adb2 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=20.08.3
+version=20.08.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=144aea34fbc728a4f4d015194593efad0350375cb7dc565db5827b5688558ac3
+checksum=d3a4b3b3f543734ad5428ca0e573b8dbf9e05f42d51e1aab39b5b5266c16be7d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel qt5-devel kconfig kcoreaddons"
diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template
index 39e7000dcfd..71fc79c0da4 100644
--- a/srcpkgs/alembic/template
+++ b/srcpkgs/alembic/template
@@ -1,6 +1,6 @@
 # Template file for 'alembic'
 pkgname=alembic
-version=1.7.16
+version=1.7.13
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://alembic.io"
 distfiles="https://github.com/alembic/alembic/archive/${version}.tar.gz"
-checksum=2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c
+checksum=14a44a1d28d1a0736655e53fc529dd4d3993bf4d03535f66de9e634c9b47d441
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch b/srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch
deleted file mode 100644
index e1aec812a58..00000000000
--- a/srcpkgs/alot/patches/fix-mailcap-rendering-no-content-type.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0339a33818adc6fc33e83336f9eea289d5e7e893 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?M=C4=81rti=C5=86=C5=A1=20Ma=C4=8Ds?= <martins.macs@bi.lv>
-Date: Tue, 19 May 2020 13:48:17 +0300
-Subject: [PATCH] Fix mailcap rendering for e-mails without `Content-Type`
- header
-
-`get_params()` returns `None` when the header is missing. Use `failobj`
-argument to mitigate that.
-
-Fixes #1512
----
- alot/db/utils.py            |  2 +-
- tests/db/test_utils.py      | 10 ++++++++++
- tests/static/mail/basic.eml |  5 +++++
- 3 files changed, 16 insertions(+), 1 deletion(-)
- create mode 100644 tests/static/mail/basic.eml
-
-diff --git a/alot/db/utils.py b/alot/db/utils.py
-index 27c85942..e55768b1 100644
---- a/alot/db/utils.py
-+++ b/alot/db/utils.py
-@@ -365,7 +365,7 @@ def render_part(part, field_key='copiousoutput'):
-             stdin = raw_payload
- 
-         # read parameter, create handler command
--        parms = tuple('='.join(p) for p in part.get_params())
-+        parms = tuple('='.join(p) for p in part.get_params(failobj=[]))
- 
-         # create and call external command
-         cmd = mailcap.subst(entry['view'], ctype,
-diff --git a/tests/db/test_utils.py b/tests/db/test_utils.py
-index 36ce77cf..40c2fb91 100644
---- a/tests/db/test_utils.py
-+++ b/tests/db/test_utils.py
-@@ -762,6 +762,16 @@ class TestExtractBodyPart(unittest.TestCase):
- 
-         self.assertEqual(actual, expected)
- 
-+    @mock.patch('alot.db.utils.settings.mailcap_find_match',
-+                mock.Mock(return_value=(None, {'view': 'cat'})))
-+    def test_plaintext_mailcap_wo_content_type(self):
-+        with open('tests/static/mail/basic.eml') as fp:
-+            mail = email.message_from_file(fp,
-+                    _class=email.message.EmailMessage)
-+        body_part = utils.get_body_part(mail)
-+        actual = utils.extract_body_part(body_part)
-+        expected = 'test body\n'
-+        self.assertEqual(actual, expected)
- 
- class TestRemoveCte(unittest.TestCase):
- 
-diff --git a/tests/static/mail/basic.eml b/tests/static/mail/basic.eml
-new file mode 100644
-index 00000000..95f15693
---- /dev/null
-+++ b/tests/static/mail/basic.eml
-@@ -0,0 +1,5 @@
-+From: me@localhost
-+To: you@localhost
-+Subject: test subject
-+
-+test body
--- 
-2.29.2
-
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index 314bbe011aa..4d590485452 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,7 +1,7 @@
 # Template file for 'alot'
 pkgname=alot
 version=0.9.1
-revision=4
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"
 depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
diff --git a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch b/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
deleted file mode 100644
index a89f8587bb1..00000000000
--- a/srcpkgs/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Thu, 22 Oct 2020 20:57:32 +0200
-Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
- declared even for \!DL_ORIGIN_AVAILABLE
-
-Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
-BugLink: https://github.com/alsa-project/alsa-lib/issues/91
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/dlmisc.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/dlmisc.c b/src/dlmisc.c
-index c9517c55..f20eb593 100644
---- a/src/dlmisc.c
-+++ b/src/dlmisc.c
-@@ -42,11 +42,9 @@
- #ifndef PIC
- struct snd_dlsym_link *snd_dlsym_start = NULL;
- #endif
--#ifdef DL_ORIGIN_AVAILABLE
- static int snd_plugin_dir_set = 0;
- static char *snd_plugin_dir = NULL;
- #endif
--#endif
- 
- #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
- static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
--- 
-2.29.0
-
diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index 4183e0569dd..7b9c46f0695 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'alsa-lib'
 pkgname=alsa-lib
-version=1.2.4
+version=1.2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config libtool"
@@ -9,7 +9,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="LGPL-2.1-or-later"
 homepage="http://www.alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/lib/${pkgname}-${version}.tar.bz2"
-checksum=f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7
+checksum=e81fc5b7afcaee8c9fd7f64a1e3043e88d62e9ad2c4cff55f578df6b0a9abe15
 patch_args="-Np1"
 
 alsa-lib-devel_package() {
diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template
index 562a6896aa7..717a3af6a41 100644
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'alsa-utils'
 pkgname=alsa-utils
-version=1.2.4
+version=1.2.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf
@@ -14,7 +14,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only"
 homepage="http://www.alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/utils/${pkgname}-${version}.tar.bz2"
-checksum=98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426
+checksum=ff19ae48c22938de7a491bdb39db74a2eee2546013f39bf1a86185e426f921aa
 
 post_install() {
 	# Install required udev rules file.
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index bba573c5e2a..23b4869d16b 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2020.Q4.3
+version=2020.Q3.6
 revision=1
-_llpc_commit=3b3506161572475b0c163a5d44444fd98922b7d8
-_xgl_commit=87430a6fa88da11473eed49603def2fa47b51fa0
-_pal_commit=4ae736bdbc5d5dee59851ac564c5e21d807b44b0
-_llvm_project_commit=11778b213e0e979cbe185901b365f0b2e9a66522
+_llpc_commit=6ff17fa6136e4bba8b6ae496e90e40c6e7750820
+_xgl_commit=07bb2eb097cd90983902118388cabd49f3530e8b
+_pal_commit=6fa4f8ac88b95688241d266ff9d8f02da6ec3c22
+_llvm_project_commit=1a8b53e02a92dbc7d40087c483d03c45c6c63f2e
 _spvgen_commit=fb798cb760a436e9496dbaab8827e4d183b74744
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -15,8 +15,7 @@ build_wrksrc="xgl"
 build_style=cmake
 configure_args="-DBUILD_WAYLAND_SUPPORT=ON
  -DXGL_METROHASH_PATH=../../metrohash
- -DXGL_CWPACK_PATH=../../cwpack
- -DLLVM_PARALLEL_LINK_JOBS=2"
+ -DXGL_CWPACK_PATH=../../cwpack"
 hostmakedepends="pkg-config python3 perl"
 makedepends="libxml2-devel xorg-server-devel libXrandr-devel libffi-devel"
 depends="vulkan-loader"
@@ -32,11 +31,11 @@ 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="83d963cdffbd3b816379abd26105c75bf55788e68a2836be0a086c9604750b94
- 2fa3a50a61ae39a9b08c92bb2b035f03d21d6d137dffdd5318e56fc48dccd91f
- da14aa4de81be1bfe366f94d9cd7d4f025b45a67215cefa08a47cc1e3bf357eb
- f871c688dbf124772e00d965ca7f3ba3a69f5e9a0fda2a3454ce0087e6b69e2e
- 3947879b78906177e5028fc08c62a13c9517ddeb87790be03fb7b0799063339a
+checksum="e318b94f6d0951855c23d0b1dd14f8984ae09e722ed654f2a1cf456d1dd3f8d5
+ 19843d5cf2dcadbe61c4276dba08b58ef7ccea5455faab7109d3ee37ad452fbe
+ ab94dc387f86eb8f4a9dd3498b145bfd4ccf1dbc994fe8b96f83c4542bca4a5e
+ e16d8c15e158d6b435c617c72bd3f31b6c980dc1b0d1821792b9b65a8e308fa4
+ 30ed1b4d168f83bc7d24ee5e27726f4358293ab39705aa93aafc3c548abc38a4
  371b137edf4d5ec4f4483ec10ac1419fffa73b6abb1931dd637a59c1b6247e65
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
@@ -63,6 +62,16 @@ pre_configure() {
 	configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
 }
 
+pre_build() {
+	# lower burden on build servers, llvm eats too much memory
+	if [ "$XBPS_MAKEJOBS" -gt 2 ]; then
+		echo $XBPS_MAKEJOBS
+		export makejobs="-j$(( $XBPS_MAKEJOBS / 2 ))"
+		echo $XBPS_MAKEJOBS
+	fi
+
+}
+
 do_install() {
 	case $XBPS_TARGET_MACHINE in
 		i686*|mips*|arm*|ppc|ppc-musl)
diff --git a/srcpkgs/amiri-font/template b/srcpkgs/amiri-font/template
index 396c9865c5c..039962190ae 100644
--- a/srcpkgs/amiri-font/template
+++ b/srcpkgs/amiri-font/template
@@ -1,7 +1,8 @@
 # Template file for 'amiri-font'
 pkgname=amiri-font
 version=0.113
-revision=2
+revision=1
+archs=noarch
 wrksrc="Amiri-${version}"
 hostmakedepends="unzip"
 depends="font-util"
diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index b63712329a7..b604b5973e6 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,6 +1,6 @@
 # Template file for 'archiver'
 pkgname=archiver
-version=3.5.0
+version=3.3.0
 revision=1
 build_style=go
 go_import_path=github.com/mholt/archiver
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mholt/archiver"
 distfiles="https://github.com/mholt/archiver/archive/v${version}.tar.gz"
-checksum=8f2e3ad68553f6b58bf99e8635ff0953f62ff0a7804da7658954ffaa7d0aaa0a
+checksum=c8e88340e80b428c1a1c9734084395b473c9458fcea8b8b5126a9db96ae45844
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 33f3ff2b27e..d8da179ba38 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=20.08.3
+version=20.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake
@@ -11,7 +11,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=fedfb2fb9b9d5d7741e7166d2e13049d48a90501f22d046f9ae01469c5957c0e
+checksum=ec061ac07687b5a3541af293e3bc2aa7bedcfe0ef38ba6e57e2704068a726ffc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3 kcoreaddons kparts"
diff --git a/srcpkgs/artwiz-fonts/template b/srcpkgs/artwiz-fonts/template
index 37a29b49108..ceea828ee9c 100644
--- a/srcpkgs/artwiz-fonts/template
+++ b/srcpkgs/artwiz-fonts/template
@@ -1,7 +1,8 @@
 # Template file for 'artwiz-fonts'
 pkgname=artwiz-fonts
 version=1.3
-revision=5
+revision=4
+archs=noarch
 create_wrksrc=yes
 depends="font-util mkfontdir"
 short_desc="Small futuristic ASCII fonts for X"
diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index 1e70bf7f85d..ccc14a28a37 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -1,7 +1,7 @@
 # Template file for 'asciidoc'
 pkgname=asciidoc
-version=9.0.4
-revision=1
+version=9.0.2
+revision=2
 wrksrc=${pkgname}-py3-${version}
 build_style=gnu-configure
 hostmakedepends="automake docbook-xsl libxslt python3"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://asciidoc.org/"
 distfiles="https://github.com/asciidoc/asciidoc-py3/archive/${version}.tar.gz"
-checksum=9e269f336a71e8685d03a00c71b55ca029eed9f7baf1afe67c447be32206b176
+checksum=ea73425151f56f278433e442f8b5085599765fa120574db65e6d053eb52927e2
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/asio/template b/srcpkgs/asio/template
index c1d970e8777..4fc3eacc544 100644
--- a/srcpkgs/asio/template
+++ b/srcpkgs/asio/template
@@ -1,14 +1,16 @@
 # Template file for 'asio'
 pkgname=asio
-version=1.18.0
+version=1.16.1
 revision=1
 build_style=gnu-configure
+makedepends="boost-devel"
+depends="boost-devel"
 short_desc="Cross-platform C++ library for ASynchronous network I/O"
 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
+checksum=e271db76dbbcda9835ed1c9c94deb2ba3f4589c3ebcaa71d99ac694b8d62638c
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index 414e0adedfd..b3ccbeeaef8 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -1,7 +1,7 @@
 # Template file for 'aspell'
 pkgname=aspell
 version=0.60.8
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-compile-in-filters"
 hostmakedepends="automake libtool gettext-devel perl"
@@ -22,14 +22,6 @@ pre_configure() {
 	autoreconf -fi
 }
 
-libaspell_package() {
-	short_desc+=" - library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/aspell-*"
-	}
-}
-
 aspell-devel_package() {
 	depends="ncurses-devel libstdc++-devel aspell>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/ballerburg/template b/srcpkgs/ballerburg/template
deleted file mode 100644
index beb0cb5fd87..00000000000
--- a/srcpkgs/ballerburg/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'ballerburg'
-pkgname=ballerburg
-version=1.2.0
-revision=1
-build_style=cmake
-hostmakedepends="which cmake SDL-devel"
-makedepends="SDL-devel"
-short_desc="Classical castle combat game"
-maintainer="pulux <pulux@pf4sh.de>"
-license="GPL-3.0-or-later"
-homepage="http://baller.tuxfamily.org/"
-distfiles="http://download.tuxfamily.org/baller/$pkgname-$version.tar.gz"
-checksum=0625f4b213c1180f2cb2179ef2bc6ce35c7e99db2b27306a8690c389ceac6300
diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index ca110a21d66..5ae56f70af8 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.08.3
+version=20.08.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=2fcfb885a5b25e9144fd7e6b9964dc7a394ab009a1f0c361bf7730be756e3132
+checksum=e1d14b8dba911ebc1cee76dbcd44fa200418ba959d86ce567093b5fc3b700a07
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index a791e8fece4..f58c9d38fe9 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.17.0
-revision=2
+revision=1
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"
@@ -33,7 +33,7 @@ bcc-tools_package() {
 		rm -rf ${PKGDESTDIR}/usr/bin/old
 		mv ${PKGDESTDIR}/usr/bin/lib/* ${PKGDESTDIR}/usr/bin
 		rm -rf ${PKGDESTDIR}/usr/bin/lib
-		rm -f ${PKGDESTDIR}/usr/bin/*.c
+		rm -rf ${PKGDESTDIR}/usr/bin/deadlock_detector.c
 		vmove usr/share/bcc/introspection
 		vbin ${PKGDESTDIR}/usr/share/bcc/introspection/bps
 		rm -rf ${PKGDESTDIR}/usr/share/bcc/introspection
diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index a8d3aae138c..20f9966ff8d 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,6 +1,6 @@
 # Template file for 'bctoolbox'
 pkgname=bctoolbox
-version=4.4.6
+version=4.4.0
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=OFF
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://gitlab.linphone.org/BC/public/bctoolbox"
 distfiles="https://gitlab.linphone.org/BC/public/bctoolbox/-/archive/${version}/bctoolbox-${version}.tar.gz"
-checksum=2e26112b4d07fd55530f3c5948ed002e9a5610fe3bbbc218d93d1f2d6fa0d05b
+checksum=fe64efb05de1bbd207e4abe5560ea44f5242eaf0911163b3b8fc0bec07488bb5
 
 bctoolbox-devel_package() {
 	depends="bctoolbox-${version}_${revision}"
diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index a32b9145c35..d9277fecb07 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
-version=2.28
-revision=1
+version=2.27.1
+revision=2
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"
@@ -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=dd4349a43486ec300a0f777f7c53b2fff608fb82dbba720c144b85538811405c
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	CPPFLAGS="-Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t"
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e..14ec3395c35 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,14 +1,14 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=3.38.0
-revision=2
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
-makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
+makedepends="clutter-gtk-devel evolution-devel tracker-devel webkit2gtk-devel
  zeitgeist-devel libhandy-devel"
-depends="desktop-file-utils tracker3 zeitgeist"
+depends="desktop-file-utils tracker zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/bindfs/template b/srcpkgs/bindfs/template
index 3c224b16745..27dc3782084 100644
--- a/srcpkgs/bindfs/template
+++ b/srcpkgs/bindfs/template
@@ -1,6 +1,6 @@
 # Template file for 'bindfs'
 pkgname=bindfs
-version=1.14.8
+version=1.14.3
 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="https://bindfs.org"
 distfiles="https://bindfs.org/downloads/bindfs-${version}.tar.gz"
-checksum=e5ca5aff55204b993a025a77c3f8c0e2ee901ba8059d71bea11de2cc685ec497
+checksum=7c87d4b80936282e78dc3840c64d3afaf1f0d7a486b29efc43699b9b178a9a25
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index e6f916ed68d..06a279cff2c 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -14,20 +14,12 @@ if [ "$CHROOT_READY" ]; then
 	hostmakedepends="flex perl texinfo"
 	checkdepends="bc"
 	depends="binutils-doc"
+else
+	unset XBPS_CHECK_PKGS
+	XBPS_TRIPLET=x86_64-unknown-linux-gnu
 fi
 makedepends+=" zlib-devel"
 
-_get_triplet() {
-	if [ -z "$XBPS_TRIPLET" ]; then
-		echo $(
-			source "${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh"
-			echo "$XBPS_TRIPLET"
-		)
-	else
-		echo "$XBPS_TRIPLET"
-	fi
-}
-
 do_configure() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		CONFIGFLAG="--enable-64-bit-bfd --enable-multilib"
@@ -45,13 +37,12 @@ do_configure() {
 	elif [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
 		CONFIGFLAG+=" --enable-64-bit-bfd --enable-targets=x86_64-linux-gnu,x86_64-pep"
 	fi
-	./configure --build=$(_get_triplet) --prefix=/usr --enable-threads \
+	./configure --build=$XBPS_TRIPLET --prefix=/usr --enable-threads \
 		--enable-plugins --enable-secureplt --with-mmap \
 		--disable-shared --enable-gold --disable-werror \
 		--enable-deterministic-archives --enable-ld=default \
 		--disable-nls $CONFIGFLAG
 }
-
 do_build() {
 	make ${makejobs}
 
@@ -71,16 +62,12 @@ do_build() {
 	make -C opcodes-pic clean
 	make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
 }
-
-# if you enable this later, keep it off for [ -z "$CHROOT_READY" ]
 do_check() {
 	# Seems like upstream forgot to include their new
-	# test-driver executable in their tarball...
+ 	# test-driver executable in their tarball...
 	:
 }
-
 do_install() {
-	local _triplet=$(_get_triplet)
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		mkdir -p ${DESTDIR}/usr/lib
 		cd ${DESTDIR}/usr
@@ -118,7 +105,7 @@ do_install() {
 	done
 	# Create triplet symlinks
 	for f in ${DESTDIR}/usr/bin/*; do
-		ln -s ${f##*/} ${DESTDIR}/usr/bin/${XBPS_CROSS_TRIPLET:-${_triplet}}-${f##*/}
+		ln -s ${f##*/} ${DESTDIR}/usr/bin/${XBPS_CROSS_TRIPLET:-${XBPS_TRIPLET}}-${f##*/}
 	done
 }
 
diff --git a/srcpkgs/birdtray/template b/srcpkgs/birdtray/template
index b77f328c4de..2373664b763 100644
--- a/srcpkgs/birdtray/template
+++ b/srcpkgs/birdtray/template
@@ -1,6 +1,6 @@
 # Template file for 'birdtray'
 pkgname=birdtray
-version=1.9.0
+version=1.8.1
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -9,5 +9,5 @@ short_desc="Run Thunderbird with a system tray icon"
 maintainer="cptpcrd <cptpcrd.git@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gyunaev/birdtray"
-distfiles="https://github.com/gyunaev/birdtray/archive/v${version}.tar.gz"
-checksum=672256bfadbde2841dcd6bad00662aeba825a4f041fa9a1980763f9eb29294d0
+distfiles="https://github.com/gyunaev/birdtray/archive/${version}.tar.gz"
+checksum="ab90a53ef85ec6cf5ec9ac5f7ddb54ea503ed0921c34f88cd09c33da5e609ec3"
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index 62c17b4e891..3458bd484b3 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -1,6 +1,6 @@
 # Template file for 'bluefish'
 pkgname=bluefish
-version=2.2.12
+version=2.2.11
 revision=1
 build_style=gnu-configure
 configure_args="--enable-spell-check --disable-update-databases
@@ -11,20 +11,29 @@ hostmakedepends="pkg-config intltool gdk-pixbuf-devel libxml2-devel
 makedepends="libxml2-devel gtk+3-devel enchant2-devel gucharmap-devel
  $(vopt_if python python-devel)"
 depends="hicolor-icon-theme desktop-file-utils xmlcatmgr
- $(vopt_if python python3)"
+ $(vopt_if python python)"
 short_desc="Powerful HTML editor for experienced web designers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="http://bluefish.openoffice.nl/"
 distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
-checksum=0df9905ba2c601cd767fa53e147969e9c90bc0cc4c005c4011c150b248979e6a
-python_version=3
+checksum=454c877fc1dbddfcc65cc7ddaa3c5ceb17bc46e216baf7878f09dbf1dabdc2ff
+python_version=2 #unverified
 lib32disabled=yes
 xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"
 
-build_options="python"
-build_options_default="python"
-
 pre_configure() {
+	sed -e 's|\[enchant\]|\[enchant-2\]|g' \
+		-e 's|\[enchant >|\[enchant-2 >|g' \
+		-e 's|enchant/enchant.h|enchant-2/enchant.h|g' \
+		-e 's|BF_dependencies enchant|BF_dependencies enchant-2|g' \
+		-i configure.ac
+
 	autoreconf -fi
 }
+
+# XXX python option broken with cross compilation
+build_options="python"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="python"
+fi
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 5e68c333e5b..9ef843bf9f8 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20201101
+version=20200902
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,13 +8,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.crufty.net/help/sjg/bmake.html"
 distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=892a483dee9e855c0b31ca84848a503d8d02e435880341ecbcccd44028cc259b
+checksum=082c0442f03f2dbef8c3171000398c1936047aa0d5a2e1efc2c8474d69403bec
 python_version=3
 
 do_configure() {
 	cd bmake
-	vsed -i 's/op_test() {/& return 0;/' boot-strap
-	vsed -i '1s,:,#!/bin/sh,g' install-sh
+	sed -i 's/op_test() {/& return 0;/' boot-strap
+	sed -i '1s,:,#!/bin/sh,g' install-sh
 	if [ "$CROSS_BUILD" ]; then
 		mkdir -p bmake-host
 		cd bmake-host
@@ -37,7 +37,7 @@ do_build() {
 do_install() {
 	cd bmake/bmake-build
 	if [ "$CROSS_BUILD" ]; then
-		vsed -i "s,^BMAKE=$,BMAKE=${wrksrc}/bmake/bmake-host/bmake," ../boot-strap
+		sed -i "s,^BMAKE=$,BMAKE=${wrksrc}/bmake/bmake-host/bmake," ../boot-strap
 	fi
 	../boot-strap --prefix=/usr --install-destdir=${DESTDIR} op=install
 	rm -rf ${DESTDIR}/usr/share/man/cat1
diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index 5785f227ee7..83c1a0ed2d6 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,7 +1,7 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
-version=1.5.10
-revision=1
+version=1.5.8
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="borg python3-setuptools python3-ruamel.yaml python3-pykwalify
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://torsion.org/borgmatic/"
 distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz"
-checksum=31459e5573c34b7b9e53ad54012be6d367e2f23c0612fd5a315593ebf23074c5
+checksum=707ed1bdffd6b8bec2d74dca36cc2665081c8db8590241bf6a72a3378928dd65
 
 do_check() {
 	# runs not yet installed self
diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index e7bee1e5466..59ba9b54664 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.50
+version=1.0.47
 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=ba4647c5db37ef87dbe730762306ae1c00e57e4249d18d65fa4ac0d3a9559123
+checksum=522890261adfc5fe3c6109d0c1f3f139a8456c94dbe0bde4ff9197aad27a9f45
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff0..f507ca3d162 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
-version=6.1
-revision=1
+version=6.0
+revision=6
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
@@ -12,8 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://mielke.cc/brltty/"
 distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz"
-checksum=4a28e3f1879aee9082f9ce4100fd4053be47add7f8ab0f2af6d6a20590934b62
-python_version=3
+checksum=cfa80c2d171a4d92d7a327b1942e6fc463669b1c3bb658bfb3323b723f9096f7
+python_version=2 #unverified
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args="${configure_args} --with-ports-package=glibc";;
diff --git a/srcpkgs/brother-brscan3/template b/srcpkgs/brother-brscan3/template
index 92e5759446b..f471aeb7c6f 100644
--- a/srcpkgs/brother-brscan3/template
+++ b/srcpkgs/brother-brscan3/template
@@ -27,7 +27,7 @@ fi
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/brscan3-${version}-${debpkgid}.deb
 	cd ${wrksrc}
-	bsdtar xzpvf data.tar.gz
+	tar xzpvf data.tar.gz
 }
 
 do_install() {
diff --git a/srcpkgs/brother-brscan4/template b/srcpkgs/brother-brscan4/template
index 5b377231b9e..36f952afc98 100644
--- a/srcpkgs/brother-brscan4/template
+++ b/srcpkgs/brother-brscan4/template
@@ -1,9 +1,8 @@
 # Template file for 'brother-brscan4'
 pkgname=brother-brscan4
-version=0.4.9
+version=0.4.5
 revision=1
 archs="i686 x86_64"
-hostmakedepends="rpmextract"
 depends="sane"
 short_desc="SANE scanner driver for brscan4-compatible printers"
 maintainer="Martijn van Buul <martijn.van.buul@gmail.com>"
@@ -12,28 +11,27 @@ homepage="http://support.brother.com/"
 repository="nonfree"
 nopie=yes
 _mylibrary="libsane-brother4.so.1.0.7"
-conf_files="/etc/opt/brother/scanner/brscan4/Brsane4.ini
- /etc/opt/brother/scanner/brscan4/brsanenetdevice4.cfg
- /etc/opt/brother/scanner/brscan4/models4/*.ini"
+conf_files="/etc/opt/brother/scanner/brscan4/Brsane4.ini /etc/opt/brother/scanner/brscan4/brsanenetdevice4.cfg /etc/opt/brother/scanner/brscan4/models4/*.ini"
 
 # license
 distfiles="http://www.brother.com/agreement/English_sane/agree.html>LICENSE.html"
 checksum="3434bca1936d6a5fd6afd810cde7e1876dd4d1496722b09af180278480f464f2"
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	_rpmpkgid="1.x86_64"
-	distfiles+=" http://download.brother.com/welcome/dlf006648/brscan4-${version}-${_rpmpkgid}.rpm"
-	checksum+=" 0d0af0f3f299a94d32b275f4714c72407ee679dd9e27eac050d6728cd728ac89"
-	_rpmlibdir="usr/lib64"
+	_debpkgid="1.amd64"
+	distfiles+=" http://download.brother.com/welcome/dlf006645/brscan4-${version}-${_debpkgid}.deb"
+	checksum+=" 9ad23cb4a9e82ef8ea19fbadf40058232aada3150f816ddda61048d650d1eee7"
+	_deblibdir="usr/lib64"
 else
-	_rpmpkgid="1.i386"
-	distfiles+=" http://download.brother.com/welcome/dlf006647/brscan4-${version}-${_rpmpkgid}.rpm"
-	checksum+=" 73bcbcc661a05000375266369fc6e22a980cc956ac7f92926ff42516f92845f8"
-	_rpmlibdir="usr/lib"
+	_debpkgid="1.i386"
+	distfiles+=" http://download.brother.com/welcome/dlf006646/brscan4-${version}-${_debpkgid}.deb"
+	checksum+=" 44f9b2e8068b4b8817e62c00a1c62e710e9c0931984a18c28799e3ec1eaff32d"
+	_deblibdir="usr/lib"
 fi
 
 do_extract() {
-	rpmextract ${XBPS_SRCDISTDIR}/${pkgname}-${version}/brscan4-${version}-${_rpmpkgid}.rpm
+	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/brscan4-${version}-${_debpkgid}.deb
+	tar xzpf data.tar.gz
 }
 
 do_install() {
@@ -41,7 +39,7 @@ do_install() {
 	# unwieldly locations. Some of this cannot be avoided.
 
 	# deb package installs 64-bit libraries in /usr/lib64; fix this
-	vinstall ./${_rpmlibdir}/sane/${_mylibrary} 755 usr/lib/sane
+	vinstall ./${_deblibdir}/sane/${_mylibrary} 755 usr/lib/sane
 	ln -sf /usr/lib/sane/${_mylibrary} ${DESTDIR}/usr/lib/sane/$(echo ${_mylibrary} | sed -e 's/\.[0-9]\.[0-9]$//')
 	ln -sf /usr/lib/sane/${_mylibrary} ${DESTDIR}/usr/lib/sane/$(echo ${_mylibrary} | sed -e 's/\.[0-9]\.[0-9]\.[0-9]$//')
 
diff --git a/srcpkgs/bs1770gain/template b/srcpkgs/bs1770gain/template
new file mode 100644
index 00000000000..31bec6e6724
--- /dev/null
+++ b/srcpkgs/bs1770gain/template
@@ -0,0 +1,14 @@
+# Template file for 'bs1770gain'
+pkgname=bs1770gain
+version=0.6.5
+revision=1
+# bgx.c:29:10: fatal error: gnu/libc-version.h: No such file or directory
+archs="~*-musl"
+build_style=gnu-configure
+makedepends="ffmpeg-devel sox-devel"
+short_desc="Loudness scanner compliant with ITU-R BS.1770"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://bs1770gain.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=66ba4291b465876bc95a5449b923ffbad74feb093156f12e134581b712a4db96
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 6855dbbc0b4..095c4bc618e 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,6 +1,6 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.9
+version=5.7
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-3.0-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=b89358a665ad753ecbdff11d2be77d230d2b197bb3c7e0eb739fb979c087a791
+checksum=5c2f048b8c814852614b0b262ab2d468ea02774ef01124ebc0ab708df262de5c
 
 pre_build() {
 	if [ $CROSS_BUILD ]; then
diff --git a/srcpkgs/c-blosc/template b/srcpkgs/c-blosc/template
index a488bfbf05d..ea51280be42 100644
--- a/srcpkgs/c-blosc/template
+++ b/srcpkgs/c-blosc/template
@@ -1,6 +1,6 @@
 # Template file for 'c-blosc'
 pkgname=c-blosc
-version=1.20.1
+version=1.17.1
 revision=1
 build_style=cmake
 configure_args="-DPREFER_EXTERNAL_ZLIB=1 -DPREFER_EXTERNAL_LZ4=1
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://www.blosc.org"
 distfiles="https://github.com/Blosc/c-blosc/archive/v${version}.tar.gz"
-checksum=42c4d3fcce52af9f8e2078f8f57681bfc711706a3330cb72b9b39e05ae18a413
+checksum=19a6948b579c27e8ac440b4f077f99fc90e7292b1d9cb896bec0fd781d68fba2
 
 post_install() {
 	vlicense LICENSES/BLOSC.txt
diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 174673ab7a1..e2f4035f318 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=20.08.3
+version=20.08.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=6d17138c8caca9ffa0a4f90f3841b10e2a5d7cbc005a408876c49c428e358027
+checksum=83bcdd36689f762363a95b688b9377a3335b4fd58ad1d5efad36ad2b0cf7cc10
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch b/srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch
deleted file mode 100644
index 6567029cd48..00000000000
--- a/srcpkgs/calibre/patches/0001-polyglot-don-t-try-to-import-plistlib.Data.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 238680060c9ab66f87b2d4f4bddc033083b2af4d Mon Sep 17 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, 2 Nov 2020 07:17:07 +0700
-Subject: [PATCH] polyglot: don't try to import plistlib.Data
-
-plistlib.Data is deprecated from Python 3.4 and fully removed in Python
-3.9.
-
-Skimming over the code, it's look like nothing uses this data structure.
-
-Let's remove it.
----
- src/polyglot/plistlib.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/polyglot/plistlib.py src/polyglot/plistlib.py
-index e1a5b8b16a..c55811e909 100644
---- src/polyglot/plistlib.py
-+++ src/polyglot/plistlib.py
-@@ -2,5 +2,5 @@
- # vim:fileencoding=utf-8
- # License: GPL v3 Copyright: 2019, Kovid Goyal <kovid at kovidgoyal.net>
- 
--from plistlib import loads, dumps, Data  # noqa
-+from plistlib import loads, dumps  # noqa
- loads_binary_or_xml = loads
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 77de483b865..996a5f120b0 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.4.2
+version=5.3.0
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -26,7 +26,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=e6bc37cbcfecf06d5d6d8cab132e6e4896a1bbade4e5385f26975111f1c0f517
+checksum=2ffc3b6cb5041ab890b684477e9e7a1b07a6f03d107f3eac3836c41fbe00b2e8
 lib32disabled=yes
 nocross=yes
 
diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template
index f052bb14fd2..8715c4773b3 100644
--- a/srcpkgs/cantarell-fonts/template
+++ b/srcpkgs/cantarell-fonts/template
@@ -1,7 +1,8 @@
 # Template file for 'cantarell-fonts'
 pkgname=cantarell-fonts
 version=0.201
-revision=2
+revision=1
+archs=noarch
 build_style=meson
 configure_args="-Dfontsdir=/usr/share/fonts/cantarell -Duseprebuilt=true -Dbuildappstream=true"
 hostmakedepends="gettext pkg-config meson appstream-glib"
diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template
index 6c8e7a93042..c58dc6830e4 100644
--- a/srcpkgs/capnproto/template
+++ b/srcpkgs/capnproto/template
@@ -1,7 +1,7 @@
 # Template file for 'capnproto'
 pkgname=capnproto
-version=0.8.0
-revision=1
+version=0.7.0
+revision=2
 wrksrc="${pkgname}-c++-${version}"
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -10,7 +10,7 @@ maintainer="eater <hello@eaterofco.de>"
 license="MIT"
 homepage="https://capnproto.org"
 distfiles="${homepage}/capnproto-c++-${version}.tar.gz"
-checksum=d1f40e47574c65700f0ec98bf66729378efabe3c72bc0cda795037498541c10d
+checksum=c9a4c0bd88123064d483ab46ecee777f14d933359e23bff6fb4f4dbd28b4cd41
 
 CXXFLAGS="-std=c++14"
 
diff --git a/srcpkgs/castero/template b/srcpkgs/castero/template
index d0a29a1c672..1574318916a 100644
--- a/srcpkgs/castero/template
+++ b/srcpkgs/castero/template
@@ -1,7 +1,7 @@
 # Template file for 'castero'
 pkgname=castero
-version=0.8.2
-revision=1
+version=0.8.0
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-BeautifulSoup4 python3-cjkwrap
@@ -11,7 +11,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="MIT"
 homepage="https://github.com/xgi/castero"
 distfiles="https://github.com/xgi/castero/archive/v${version}.tar.gz"
-checksum=2dd0f33965e8d5908b3ad04660d810add538b579e9aa75c7237855a8193daf8e
+checksum=31b302c436fd732d0af3767ed55c0f7e7698a463da86eba333053c6bd59f51d1
 
 # Remove requirement of python3-vlc
 # as we can use python3-mpv instead,
diff --git a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch b/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
deleted file mode 100644
index 1a1456c86d9..00000000000
--- a/srcpkgs/ccache/patches/build-and-install-man-page-by-default.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-upstream: yes
-
-From 294ff2face26448afa68e3ef7b68bf4898d6dc77 Mon Sep 17 00:00:00 2001
-From: Erik Flodin <erik@ejohansson.se>
-Date: Fri, 30 Oct 2020 10:23:08 +0100
-Subject: [PATCH] Build and install man page by default (#705)
-
-Fixes #684.
----
- doc/CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index fb0f316..b5c9f24 100644
---- doc/CMakeLists.txt
-+++ doc/CMakeLists.txt
-@@ -58,7 +58,11 @@ else()
-       COMMAND ${A2X_EXE} --doctype manpage --format manpage MANUAL.xml
-       MAIN_DEPENDENCY MANUAL.xml
-     )
--    add_custom_target(doc-man-page DEPENDS ccache.1)
-+    add_custom_target(doc-man-page ALL DEPENDS ccache.1)
-+    install(
-+      FILES "${CMAKE_CURRENT_BINARY_DIR}/ccache.1"
-+      DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-+    )
-     set(doc_files "${doc_files}" ccache.1)
-   endif()
- 
--- 
-2.29.2
-
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 7cf3ca186b7..e8d8b35e76b 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,12 @@
 # Template file for 'ccache'
 pkgname=ccache
 version=4.0
-revision=2
+revision=1
 bootstrap=yes
 build_style=cmake
-configure_args="-DENABLE_TESTING=OFF"
+hostmakedepends="cmake-bootstrap"
 makedepends="libzstd-devel zlib-devel"
+checkdepends="perl"
 short_desc="Fast C/C++ Compiler Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -14,27 +15,11 @@ changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
 checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
 
-if [ -z "$CHROOT_READY" ]; then
-	hostmakedepends="cmake-bootstrap"
-else
-	hostmakedepends="asciidoc perl"
-fi
-
-if [ -n "$CHROOT_READY" ] && [ -n "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DENABLE_TESTING=ON"
-fi
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
-post_build() {
-	if [ "$CHROOT_READY" ]; then
-		mv build/doc/Ccache.1 build/doc/ccache.1
-	fi
-}
-
 post_install() {
 	vmkdir usr/lib/ccache/bin
 	# clang
diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index 1eb6d9bafc7..bebfa0f4c61 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,16 +1,16 @@
 # Template file for 'ccls'
 pkgname=ccls
-version=0.20201025
+version=0.20190823.6
 revision=1
 build_style=cmake
 hostmakedepends="clang-tools-extra"
 makedepends="clang llvm ncurses-devel rapidjson zlib-devel"
 short_desc="C/C++/ObjC language server"
-maintainer="Nathan Owens <ndowens@artixlinux.org>"
+maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/MaskRay/ccls"
 distfiles="https://github.com/MaskRay/ccls/archive/${version}.tar.gz"
-checksum=1470797b2c1a466e2d8a069efd807aac6fefdef8a556e1edf2d44f370c949221
+checksum=83dd45120e9674319f91e4379013831e124c0858e050bbc3521e3f8aebe5c95b
 nocross="Clang cannot be installed as makedep"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
diff --git a/srcpkgs/cherry-font/template b/srcpkgs/cherry-font/template
index fc6ee3cb292..496d45988d1 100644
--- a/srcpkgs/cherry-font/template
+++ b/srcpkgs/cherry-font/template
@@ -1,7 +1,8 @@
 # Template file for 'cherry-font'
 pkgname=cherry-font
 version=1.4
-revision=2
+revision=1
+archs=noarch
 wrksrc="cherry-${version}"
 hostmakedepends="bdftopcf"
 depends="font-util"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 836a483d71a..225b200a37b 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=1.8.8
+version=1.8.7
 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=1cdd0a4d77714c5003e7abdb46cb3c0c64eb3dfe198d45d36dc5764c2c5c0fcd
+checksum=65800222506317ae0c419aec9e9daafe577b6c668490031453fd53f813788668
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL
index 46bb6a56095..fcaec287674 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=c9d37f91449ea3563d518b13164c5aefb42d166d5aec91f9832948d335ee0de4
+checksum=86a2dfca066f92e2017979b9608f61d82dccde7cad77c46d972312de7c8c5881
 _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 41643dcc2fe..9d0bbde19df 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=86.0.4240.183
+version=86.0.4240.111
 revision=1
 archs="x86_64"
 create_wrksrc=yes
diff --git a/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch b/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
deleted file mode 100644
index 00300a4a919..00000000000
--- a/srcpkgs/chromium/patches/upstream-xproto-fix-underflow-in-Fp1616ToDouble.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5ade494a9966c7a9675af86dc42aca62fb4d806d Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Wed, 21 Oct 2020 22:02:35 +0000
-Subject: [PATCH] [XProto] Fix underflow in Fp1616ToDouble
-
-x11::Input::Fp1616 should be treated as a signed integer, otherwise
--1 will underflow to 65535.  When dragging a scrollbar, this would
-cause the scrollbar to snap to the bottom when the cursor is dragged
-above the window's y=0 coordinate.  Verified that the issue is fixed
-after this CL.
-
-BUG=1139623,1136352
-R=sky
-
-Change-Id: Ie318006ceadde9b9ce3e267fb453ddeba0e81da0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485620
-Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Scott Violet <sky@chromium.org>
-Reviewed-by: Scott Violet <sky@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#819538}
----
- ui/events/x/events_x_utils.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui/events/x/events_x_utils.cc b/ui/events/x/events_x_utils.cc
-index 3010db5f40c..856dfb221e7 100644
---- ui/events/x/events_x_utils.cc
-+++ ui/events/x/events_x_utils.cc
-@@ -376,7 +376,7 @@ base::TimeTicks TimeTicksFromXEvent(const x11::Event& xev) {
- 
- // This is ported from libxi's FP1616toDBL in XExtInt.c
- double Fp1616ToDouble(x11::Input::Fp1616 x) {
--  auto x32 = static_cast<uint32_t>(x);
-+  auto x32 = static_cast<int32_t>(x);
-   return x32 * 1.0 / (1 << 16);
- }
- 
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 0c259fabf3b..980b0d72843 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=86.0.4240.183
+version=86.0.4240.111
 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=aa12c6665c33275f3edffb6f127f97f84fa0bb69c644b4b023d51d2d058a69bc
+checksum=f27bdb02ebf3c48abe054c73f1ae57e22a22535ea34f5edf8693ab8432a7c717
 nocross=yes
 
 lib32disabled=yes
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index 6ca4f30db5d..63ec3a449a2 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'cifs-utils'
 pkgname=cifs-utils
-version=6.11
-revision=1
+version=6.10
+revision=2
 build_style=gnu-configure
 configure_args="--disable-systemd"
 make_install_args="ROOTSBINDIR=/usr/bin"
@@ -12,8 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=b859239a3f204f8220d3e54ed43bf8109e1ef202042dd87ba87492f8878728d9
-python_version=3
+checksum=92fc29c8e9039637f3344267500f1fa381e2cccd7d10142f0c1676fa575904a7
+python_version=2 #unverified
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index 72938c814bb..47283835563 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -1,6 +1,6 @@
 # Template file for 'clipgrab'
 pkgname=clipgrab
-version=3.8.15
+version=3.8.14
 revision=1
 build_style=qmake
 configure_args=clipgrab.pro
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://clipgrab.org"
 distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz"
-checksum=769812558342ebf4dee0f1deb2fe2ea801278e9821d87ad8d639cec52144d7aa
+checksum=cebf6b940133536abf8b0fa1f5913a614eadd0221e6003ad6d7752de253e63a4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-location-devel qt5-quickcontrols2-devel
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..5288cbafeff 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.18.4
-revision=1
+version=3.18.2
+revision=2
 wrksrc="cmake-${version}"
 build_style=cmake
 configure_args="
@@ -21,7 +21,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
 
 do_install() {
 	# We are only interested in cmake-gui.
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..a3fc64c83a2 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,7 +1,7 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.18.4
-revision=1
+version=3.18.2
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
  -DCMAKE_BUILD_TYPE=None
@@ -20,14 +20,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="LGPL-2.1-or-later, BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
-
-pre_check() {
-	# use ctest of this build instead of requirig cmake to test cmake...
-	vsed -i "${wrksrc}/build/Makefile" \
-		-e 's!/usr/bin/ctest!ctest!g'
-	export PATH="${wrksrc}/build/bin:$PATH"
-}
+checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc/cmake
diff --git a/srcpkgs/cmst/template b/srcpkgs/cmst/template
index 83ee03b44e4..3ec18435ebf 100644
--- a/srcpkgs/cmst/template
+++ b/srcpkgs/cmst/template
@@ -1,6 +1,6 @@
 # Template file for 'cmst'
 pkgname=cmst
-version=2020.11.01
+version=2020.05.09
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="Jonathan Lee <vjon207@gmail.com>"
 license="MIT"
 homepage="https://github.com/andrew-bibb/cmst"
 distfiles="https://github.com/andrew-bibb/cmst/archive/${version}.tar.gz"
-checksum=0e445f81afdb51cd288653bc1597488d64846de9cc552f265c5b806716402adb
+checksum=9189323829fa73ab26b894a083793964eb85c6bb91b4bb00faea314a3a981b03
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index 6e77160111a..0c64484c7d3 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -1,7 +1,7 @@
 # Template file for 'colord'
 pkgname=colord
-version=1.4.5
-revision=1
+version=1.4.4
+revision=2
 build_style=meson
 build_helper="gir"
 # man pages fail to generate
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.freedesktop.org/software/colord"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
-checksum=b774ea443d239f4a2ee1853bd678426e669ddeda413dcb71cea1638c4d6c5e17
+checksum=9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5
 
 system_accounts="colord"
 colord_homedir="/var/lib/colord"
@@ -32,10 +32,6 @@ fi
 build_options="gir vala"
 build_options_default="gir vala"
 
-case "$XBPS_TARGET_MACHINE" in
-	ppc-musl) LDFLAGS+=" -lssp_nonshared" ;;
-esac
-
 do_check() {
 	# assertion failed (cd_edid_get_vendor_name (edid) == "LG"): (NULL == "LG")
 	:
diff --git a/srcpkgs/corecollector-devel b/srcpkgs/corecollector-devel
deleted file mode 120000
index c5abecdf4ba..00000000000
--- a/srcpkgs/corecollector-devel
+++ /dev/null
@@ -1 +0,0 @@
-corecollector
\ No newline at end of file
diff --git a/srcpkgs/corecollector/template b/srcpkgs/corecollector/template
deleted file mode 100644
index c5fb32805aa..00000000000
--- a/srcpkgs/corecollector/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'corecollector'
-pkgname=corecollector
-version=0.3.5
-revision=1
-build_style=meson
-configure_args="-Dcoredump_user=_corecollector -Dcoredump_group=_corecollector"
-conf_files="/etc/corecollector/corecollector.conf"
-hostmakedepends="dmd git pkg-config scdoc"
-depends="gdb"
-short_desc="Coredump collector written in D"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/Cogitri/corecollector"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0b9e212ffde1b63024744ccb437504a8ca56d091c1bfd193095b52e0c8a70db6
-nocross="only gcc-gdc(unpackaged as of 3/2020) has cross support"
-
-system_accounts="_corecollector"
-
-corecollector-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index 334d1b0ea94..feccd606958 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -91,16 +91,16 @@ do_check() {
 	local exeext_tests
 
 	# chgrp tests fail inside a chroot
-	vsed -i '/tests\/chgrp/d' Makefile
+	sed -i '/tests\/chgrp/d' Makefile
 
 	# Tests that fail due to being inside a chroot
 	exeext_tests="chown lchown fchownat"
 
-	# Tests that depend on the tests removed
+	# Tests that depend on the tests reemoved
 	exeext_tests+=" fchmodat fchdir"
 
 	for test in $exeext_tests ; do
-		vsed -i "s/test-$test\$(EXEEXT) //" gnulib-tests/Makefile
+		sed -i "/test-$test\$(EXEEXT)/d" gnulib-tests/Makefile
 	done
 
 	make check
diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 19e490f8fb8..e6a3bed8e53 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,15 +1,14 @@
 # Template file for 'cozy'
 pkgname=cozy
 version=0.7.2
-revision=3
+revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
  python3-mutagen python3-gobject-devel gettext"
 makedepends="glib-devel python3-distro python3-peewee python3-mutagen
  python3-gobject-devel"
 depends="python3 python3-peewee gst-libav gst-plugins-good1 gst1-python3
- python3-mutagen python3-distro python3-apsw python3-packaging python3-pytz
- python3-requests python3-gobject"
+ python3-mutagen python3-distro python3-apsw python3-packaging"
 short_desc="Audio book player"
 maintainer="johannes <johannes.brechtmann@gmail.com>"
 license="GPL-3.0-only, LGPL-3.0-only"
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 203c20f4592..e4da16a6f28 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.8.0
+version=5.7.0
 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=20eb49249e94f07c09ee602246d2c74cd829c5f49b09559fced008e7b8651ce6
+checksum=971f0b6f3474411215190867250f619db5728dad4e3e7834b3761a14d4477f7c
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index d1961f950f4..22b1cc069e7 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,18 +1,18 @@
 # Template file for 'crash'
 pkgname=crash
 version=7.2.8
-revision=2
+revision=1
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
-hostmakedepends="flex tar wget"
+hostmakedepends="flex tar"
 makedepends="lzo-devel ncurses-devel zlib-devel"
 short_desc="Kernel crash dump debugger and live inspector"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
-homepage="https://crash-utility.github.io/"
-changelog="https://crash-utility.github.io/crash.changelog.html"
-distfiles="https://github.com/crash-utility/crash/archive/${version}.tar.gz"
-checksum=996d3367764c77e23921c164725e4d0221acc7a15a92a3f825053ea37f2452dc
+homepage="http://people.redhat.com/anderson/"
+changelog="https://people.redhat.com/anderson/crash.changelog.html"
+distfiles="http://people.redhat.com/anderson/${pkgname}-${version}.tar.gz"
+checksum=19abe7fcb6a392f8d741315993e3d8b1a8ea799e9ddb433f12f6db4c59e45751
 nocross=yes
 LDFLAGS=-llzo2
 
@@ -28,6 +28,10 @@ post_extract() {
 }
 
 do_build() {
+	make gdb_unzip
+	sed -i 's|sys/debugreg.h|asm/debugreg.h|g' gdb-7.6/gdb/amd64-linux-nat.c
+	sed -i 's|const struct ps_prochandle|struct ps_prochandle|g' gdb-7.6/gdb/*.c
+
 	make ${makejobs} lzo
 	make ${makejobs} extensions
 }
diff --git a/srcpkgs/cropgui/patches/python3-support.patch b/srcpkgs/cropgui/patches/python3-support.patch
new file mode 100644
index 00000000000..ca6ebb2f9ed
--- /dev/null
+++ b/srcpkgs/cropgui/patches/python3-support.patch
@@ -0,0 +1,11 @@
+--- install.sh
++++ install.sh
+@@ -12,7 +12,7 @@
+ }
+ 
+ site_packages () {
+-    $PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'
++    $PYTHON -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())'
+ }
+ 
+ usage () {
diff --git a/srcpkgs/cropgui/template b/srcpkgs/cropgui/template
index 7fcf83644d1..8209209709a 100644
--- a/srcpkgs/cropgui/template
+++ b/srcpkgs/cropgui/template
@@ -1,7 +1,7 @@
 # Template file for 'cropgui'
 pkgname=cropgui
-version=0.5
-revision=1
+version=0.4
+revision=4
 hostmakedepends="which python3"
 depends="python3 python3-Pillow python3-gobject
  libjpeg-turbo-tools ImageMagick exiftool"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/jepler/cropgui"
 distfiles="https://github.com/jepler/cropgui/archive/v${version}.tar.gz"
-checksum=c1d6eca0b5a5750cd69a1de3fa73a5f444e5064f1cb23d3344554f66196d5513
+checksum=bf5a5b14032d01799f8d942790e316203f33a7c007eedf23e57c79d5a47d6fb1
 python_version=3
 
 do_install() {
diff --git a/srcpkgs/cross-aarch64-linux-gnu/files/use-pure-64bit-configs.patch b/srcpkgs/cross-aarch64-linux-gnu/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-aarch64-linux-gnu/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index f4f2fb518a0..5921456060a 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -105,7 +105,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-aarch64-linux-musl/files/use-pure-64bit-configs.patch b/srcpkgs/cross-aarch64-linux-musl/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-aarch64-linux-musl/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 5ce33afe375..8dba1d564ec 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -91,7 +91,6 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/ppc64-pure64.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/ppc64-pure64.patch
new file mode 120000
index 00000000000..80073669efa
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-gnu/files/ppc64-pure64.patch
@@ -0,0 +1 @@
+../../gcc/patches/ppc64-pure64.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/files/use-pure-64bit-configs.patch b/srcpkgs/cross-powerpc64-linux-gnu/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-powerpc64-linux-gnu/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 7f5394c880f..471e0c98659 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -93,7 +93,9 @@ _gcc_bootstrap() {
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
+	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
+
+	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-pure64.patch b/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-pure64.patch
new file mode 120000
index 00000000000..80073669efa
--- /dev/null
+++ b/srcpkgs/cross-powerpc64-linux-musl/files/ppc64-pure64.patch
@@ -0,0 +1 @@
+../../gcc/patches/ppc64-pure64.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/use-pure-64bit-configs.patch b/srcpkgs/cross-powerpc64-linux-musl/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-powerpc64-linux-musl/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index ed9adc5861e..3d92c564e2b 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -93,13 +93,15 @@ _gcc_bootstrap() {
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
+	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
 	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
+	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
+
 	msg_normal "Building cross gcc bootstrap\n"
 
 	[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/ppc64-pure64.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/ppc64-pure64.patch
new file mode 120000
index 00000000000..80073669efa
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/files/ppc64-pure64.patch
@@ -0,0 +1 @@
+../../gcc/patches/ppc64-pure64.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/files/use-pure-64bit-configs.patch b/srcpkgs/cross-powerpc64le-linux-gnu/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-gnu/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index b7e17774db1..c8803a6970b 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -93,7 +93,9 @@ _gcc_bootstrap() {
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
+	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
+
+	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-pure64.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-pure64.patch
new file mode 120000
index 00000000000..80073669efa
--- /dev/null
+++ b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-pure64.patch
@@ -0,0 +1 @@
+../../gcc/patches/ppc64-pure64.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/use-pure-64bit-configs.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-powerpc64le-linux-musl/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index d2199de88a4..810bc01192d 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -93,13 +93,15 @@ _gcc_bootstrap() {
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
+	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
 	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
+	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
+
 	msg_normal "Building cross gcc bootstrap\n"
 
 	[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
diff --git a/srcpkgs/cross-x86_64-linux-gnu/files/use-pure-64bit-configs.patch b/srcpkgs/cross-x86_64-linux-gnu/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-x86_64-linux-gnu/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index 7d49328e8ee..5bfbef24a29 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -92,7 +92,9 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
+
+	sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+	sed -i 's/lib64/lib/' gcc/config/i386/linux64.h
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/use-pure-64bit-configs.patch b/srcpkgs/cross-x86_64-linux-musl/files/use-pure-64bit-configs.patch
deleted file mode 120000
index e29658aac51..00000000000
--- a/srcpkgs/cross-x86_64-linux-musl/files/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/use-pure-64bit-configs.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 96e6c7feb71..8ccf71beeb0 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -93,13 +93,15 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
 	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
+	sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+	sed -i 's/lib64/lib/' gcc/config/i386/linux64.h
+
 	msg_normal "Building cross gcc bootstrap\n"
 
 	[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index b6cd39cf449..48daba8cbe3 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,7 +1,7 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.15.1
-revision=1
+version=0.15
+revision=2
 build_style=gnu-configure
 configure_args="--disable-systemd"
 hostmakedepends="pkg-config libtool python3 $(vopt_if man go-md2man)"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=1b3f05d1b585bc6dfde3c2ad50aa4c3db3b507705cbc6d2c7810880282063433
+checksum=5f88f6c6a951473406700fbf634e665dc75596a032b06bf9c91911cd999347a0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"
diff --git a/srcpkgs/cups-filters/patches/disable-test-font-cross-compile-check.patch b/srcpkgs/cups-filters/patches/disable-test-font-cross-compile-check.patch
new file mode 100644
index 00000000000..b27b631a506
--- /dev/null
+++ b/srcpkgs/cups-filters/patches/disable-test-font-cross-compile-check.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2020-04-27 11:43:40.128998764 -0400
++++ configure	2020-04-27 11:44:53.843061000 -0400
+@@ -23628,8 +23628,6 @@
+ if eval \${$as_ac_File+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  test "$cross_compiling" = yes &&
+-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+ if test -r ""$with_test_font_path""; then
+   eval "$as_ac_File=yes"
+ else
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index b9a3e9efd1c..c78307e2776 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,6 +1,6 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
-version=1.28.5
+version=1.27.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-rcdir=no --enable-avahi
@@ -17,7 +17,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
 homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz"
-checksum=a8425fc7bcbf50794264ab30239003936f88c38a2d6bf08e1eb14bc8c928f60f
+checksum=0bc9df9c4ca0f41685c8d6de56fad40109798f567326fc4167d7edb2600f0b84
+
 lib32disabled=yes
 
 post_install() {
diff --git a/srcpkgs/dar/template b/srcpkgs/dar/template
index c289909e812..4130f4e148d 100644
--- a/srcpkgs/dar/template
+++ b/srcpkgs/dar/template
@@ -1,6 +1,6 @@
 # Template file for 'dar'
 pkgname=dar
-version=2.6.13
+version=2.6.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-upx --disable-build-html"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://dar.linux.free.fr/"
 distfiles="${SOURCEFORGE_SITE}/dar/dar-${version}.tar.gz"
-checksum=3fea9ff9e55fb9827e17a080de7d1a2605b82c2320c0dec969071efefdbfd097
+checksum=d3ef3ad2fc9b5199333fc462e68b49498eb6e2c3e5472e6f9b7aa42b6a548f4b
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr
diff --git a/srcpkgs/dejavu-fonts-ttf/template b/srcpkgs/dejavu-fonts-ttf/template
index 729c4f66a28..45141a8ddc6 100644
--- a/srcpkgs/dejavu-fonts-ttf/template
+++ b/srcpkgs/dejavu-fonts-ttf/template
@@ -3,13 +3,13 @@ pkgname=dejavu-fonts-ttf
 version=2.37
 revision=2
 depends="font-util"
+font_dirs="/usr/share/fonts/TTF"
 short_desc="DejaVu family of TrueType fonts"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT, custom:Public Domain"
-homepage="https://dejavu-fonts.github.io/"
-distfiles="${SOURCEFORGE_SITE}/dejavu/${pkgname}-${version}.tar.bz2"
+homepage="http://dejavu-fonts.org/wiki/Main_Page"
+license="MIT, Public domain"
+distfiles="${SOURCEFORGE_SITE}/dejavu/$pkgname-$version.tar.bz2"
 checksum=fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7
-font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
 	vmkdir usr/share/fonts/TTF
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 034de7241fd..e7799e65e89 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,3 @@
 #!/bin/sh
-[ -r ./conf ] && . ./conf
-exec deluged -d -U deluge -g deluge ${OPTS} 2>&1
+set -e
+exec chpst -u deluge:deluge deluged -d 2>&1
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 660a8d7eb7c..15d7fc5ebd9 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,7 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=9
+revision=8
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index c1626c5bbe5..8467f965930 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,7 +1,7 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=161
-revision=1
+version=160
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-magic python3-libarchive-c python3-setuptools
@@ -15,4 +15,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=9c27d60a7bf3984b53c8af3fee86eb3d3e2292c4ddb9449c38b6cba068b8e22c
+checksum=f164b5e74cc11f6238ad8d62c92d3a819fa4c8b618683fc0533e04f21acae6b2
diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template
index d07aac1ad2e..80bb2cbb26d 100644
--- a/srcpkgs/diffutils/template
+++ b/srcpkgs/diffutils/template
@@ -5,7 +5,6 @@ revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="gl_cv_func_gettimeofday_clobber=no gl_cv_func_tzset_clobber=no"
-checkdepends="perl"
 short_desc="The GNU diff utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/dina-font/template b/srcpkgs/dina-font/template
index a1777a33ea8..2d4a740eacc 100644
--- a/srcpkgs/dina-font/template
+++ b/srcpkgs/dina-font/template
@@ -1,16 +1,18 @@
 # Template file for 'dina-font'
 pkgname=dina-font
 version=2.93
-revision=3
+revision=2
+archs=noarch
 create_wrksrc=yes
 hostmakedepends="bdftopcf font-util unzip"
 depends="font-util"
 short_desc="Monospace bitmap font, primarily aimed at programmers"
 maintainer="Lee Wang <lee.wang.gretzky@gmail.com>"
-license="custom:Dina"
+license="Custom"
 homepage="http://www.donationcoder.com/Software/Jibz/Dina/index.html"
 distfiles="http://ftp.osuosl.org/pub/gentoo/distfiles/dina-${version}.zip"
 checksum=47792817b7716577727a488952b9892b16966a45dc3ba52e026d59b9d9e20695
+
 font_dirs="/usr/share/fonts/X11/misc"
 
 _ex_pt() {
diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index a6847d085e2..fc7919eab01 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,6 +1,6 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
-version=1.1
+version=1.0
 revision=1
 wrksrc="distrobuilder-distrobuilder-${version}"
 build_style=go
@@ -13,4 +13,4 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://linuxcontainers.org/distrobuilder/introduction/"
 distfiles="https://github.com/lxc/distrobuilder/archive/distrobuilder-${version}.tar.gz"
-checksum=a21b41f7d4030b923d7ea3840f90ff6912f6474e516140f488b87c8dfe970bbc
+checksum=e8a9bc5d8dd7fd48bdd244407697d4a1265d55bb628ad62b824066bd23999acf
diff --git a/srcpkgs/dkms/files/kernel.d/dkms.postinst b/srcpkgs/dkms/files/kernel.d/dkms.postinst
index 6b345bef905..ef2a10bac28 100644
--- a/srcpkgs/dkms/files/kernel.d/dkms.postinst
+++ b/srcpkgs/dkms/files/kernel.d/dkms.postinst
@@ -19,8 +19,8 @@ fi
 
 export IGNORE_CC_MISMATCH=1
 
-if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] || [ ! -f /lib/modules/${VERSION}/build/scripts/mod/modpost ]; then
-	yes "" | make -j $(nproc) -C /lib/modules/${VERSION}/build prepare0
+if [ ! -f /lib/modules/${VERSION}/build/scripts/basic/fixdep ] ; then
+	yes "" | make -j $(nproc) -C /lib/modules/${VERSION}/build scripts
 fi
 
 # Check available DKMS modules
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ba61736f1b5..664f899abb9 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
 # Template file for 'dkms'
 pkgname=dkms
 version=2.8.3
-revision=3
+revision=2
 conf_files="/etc/dkms/framework.conf"
 depends="bash kmod gcc make coreutils"
 short_desc="Dynamic Kernel Modules System"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 9e6f295645e..796c1d7f157 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.51.0
+version=1.49.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=dec16ab128c2724eebfeadac05dd4554cd007a57998d3aae3009c71196578760
+checksum=5b62b595c9503b94a3492cf7f71090d964243b9d901925978cb20f7215208d3a
diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index f4a68247ccd..8bfdf6903e4 100755
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=20.08.3
+version=20.08.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=0cb1b232c9b86811107ef9270ba2be42d242157b8daeeeffd1493ae635f0aa3a
+checksum=7eabeb295ae2932958992bf7273afcb8164fbe90a2574064983fb2ecbc57eeaf
diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 54d4564ed0f..d1cdb92f8ce 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=20.08.3
+version=20.08.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=9d29577e0ef2d364a54718f1a8e0a74cf4246f6bd020ff605825f5888739f680
+checksum=bd13574610fc2108b9b04249cff70ca99958fe57a42fbf260ed16e5e377071bc
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"
diff --git a/srcpkgs/drawterm/patches/posix_generic.patch b/srcpkgs/drawterm/patches/posix_generic.patch
index aec5c76e018..e7b774b4c85 100644
--- a/srcpkgs/drawterm/patches/posix_generic.patch
+++ b/srcpkgs/drawterm/patches/posix_generic.patch
@@ -92,8 +92,8 @@ index 0000000..289f747
 +int
 +tas(int *x)
 +{
-+	/* use a gcc __atomic builtin */
-+	int v = __atomic_exchange_n(x, 1, __ATOMIC_SEQ_CST);
++	/* Use the GCC builtin __sync_fetch_and_add() for optimal code */
++	int v = __sync_fetch_and_add(x, 1);
 +	switch(v) {
 +	case 0:
 +	case 1:
diff --git a/srcpkgs/drawterm/template b/srcpkgs/drawterm/template
index b871806e44e..40443deec3f 100644
--- a/srcpkgs/drawterm/template
+++ b/srcpkgs/drawterm/template
@@ -1,8 +1,8 @@
 # Template file for 'drawterm'
 pkgname=drawterm
-version=0.0.20201103
+version=0.0.20200619
 revision=1
-_hghash=1d3e2b3502f1
+_hghash=9daaec18b823
 wrksrc=${pkgname}-${_hghash}
 makedepends="libX11-devel libXt-devel"
 short_desc="Connect to Plan 9 CPU servers from other operating systems"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LPL-1.02"
 homepage="http://drawterm.9front.org/"
 distfiles="https://code.9front.org/hg/${pkgname}/archive/${_hghash}.tar.gz"
-checksum=5740acc4f7eb8f0ea0524839847d993b7865d240070da69f7a28ca3b7aef6813
+checksum=15c4ac4bbaee888e2a8eb50cf7c4ff883d393253c91dc9e2ba2df5bc2a10940d
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5*) CFLAGS+=" -DARMv5" ;;
diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template
index 69981dcfe9e..ee99230b9e1 100644
--- a/srcpkgs/dropbear/template
+++ b/srcpkgs/dropbear/template
@@ -1,6 +1,6 @@
 # Template file for 'dropbear'
 pkgname=dropbear
-version=2020.81
+version=2020.80
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zlib --disable-bundled-libtom"
@@ -9,9 +9,8 @@ short_desc="Small SSH server and client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://matt.ucc.asn.au/dropbear/dropbear.html"
-changelog="https://matt.ucc.asn.au/dropbear/CHANGES"
 distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2"
-checksum=48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b
+checksum=d927941b91f2da150b2033f1a88b6a47999bf0afb1493a73e9216cffdb5d7949
 make_dirs="/etc/dropbear 0755 root root"
 
 post_install() {
diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e701d53d84f..1cc966ef907 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.4.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=da6b0bb601d7b9a92cfd41005eae7a66573d28e77625f4e747b285207980784b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/econnman/template b/srcpkgs/econnman/template
new file mode 100644
index 00000000000..9568c2e2adf
--- /dev/null
+++ b/srcpkgs/econnman/template
@@ -0,0 +1,22 @@
+# Template file for 'econnman'
+pkgname=econnman
+version=1.1.0
+revision=5
+archs=noarch
+_gitrev=18e7be6bf80df6b86965ba93391b205339fc7267
+wrksrc=${pkgname}-${_gitrev}
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config python3 efl-devel"
+makedepends="efl-devel python3-efl"
+depends="python3-efl python3-dbus connman desktop-file-utils"
+short_desc="Enlightenment ConnMan user interface"
+maintainer="q66 <daniel@octaforge.org>"
+license="LGPL-3.0-only"
+homepage="http://enlightenment.org"
+distfiles="https://git.enlightenment.org/apps/econnman.git/snapshot/econnman-${_gitrev}.tar.gz"
+checksum=6188accebac2bb52466794c685f042f9f2bcc7d5d77b2417b30458e2e7265282
+python_version=3
+
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}
diff --git a/srcpkgs/econnman/update b/srcpkgs/econnman/update
new file mode 100644
index 00000000000..3ee7cf95ab3
--- /dev/null
+++ b/srcpkgs/econnman/update
@@ -0,0 +1 @@
+site="https://git.enlightenment.org/apps/econnman.git/refs/"
diff --git a/srcpkgs/ekushey-fonts-ttf/template b/srcpkgs/ekushey-fonts-ttf/template
index 4862d810d8c..406a5f88969 100644
--- a/srcpkgs/ekushey-fonts-ttf/template
+++ b/srcpkgs/ekushey-fonts-ttf/template
@@ -1,7 +1,8 @@
 # Template file for 'ekushey-fonts-ttf'
 pkgname=ekushey-fonts-ttf
 version=20191020
-revision=2
+revision=1
+archs=noarch
 build_style=fetch
 depends="font-util"
 short_desc="Bengali fonts from Ekushey project"
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index da331ac0d25..bd013d3ef71 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -1,6 +1,6 @@
 # Template file for 'electron10'
 pkgname=electron10
-version=10.1.5
+version=10.1.3
 _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="ae73d71f3f7caa732ad1138d7f6ae0c7a38692880173e82f81244d66ac1cdb31
+checksum="b50e2b86abb3641a664a87d92cb09835e6d0ea5b81c4d3e031f041c75ea74158
  e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
  dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
 
@@ -40,6 +40,7 @@ esac
 
 no_generic_pkgconfig_link=yes
 lib32disabled=yes
+nodebug=yes
 nopie=yes  # contains tools that are not PIE, enables PIE itself
 
 build_options="pulseaudio sndio clang"
@@ -209,8 +210,6 @@ do_configure() {
 	# 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=*([^ ])} )
-	export CFLAGS=${CFLAGS/-g/}
-	export CXXFLAGS=${CXXFLAGS/-g/}
 	local conf=()
 	cd third_party/electron_node
 	if [ "$CROSS_BUILD" ]; then
@@ -274,11 +273,6 @@ do_configure() {
 			'use_sndio=true'
 		)
 	fi
-	if [ -n "$XBPS_DEBUG_PKGS" ]; then
-		conf+=('symbol_level=1')
-	else
-		conf+=('symbol_level=0')
-	fi
 	conf+=(
 		'enable_hangout_services_extension=true'
 		'enable_nacl_nonsfi=false'
@@ -295,6 +289,7 @@ do_configure() {
 		'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"'
@@ -324,8 +319,6 @@ do_configure() {
 do_build() {
 	export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
 	export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
-	export CFLAGS=${CFLAGS/-g/}
-	export CXXFLAGS=${CXXFLAGS/-g/}
 	if [ "$build_option_clang" ]; then
 		export CC=clang
 		export CXX=clang++
diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index e740bff85a2..b3efef8cf95 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=20.08.3
+version=20.08.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=4c84c4960c90a5eb2051d7fabfa536989e2a6630e9b2049ab3576909e4b22321
+checksum=6c04377dfd5e82b2b67b3a43cc3ffd3b206f24ab75c3fe18298ec80876dcc268
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"
diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 8400550b03d..2db63a42fb0 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.11.2
+version=1.11.1
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,4 +13,4 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=318f0a6cb372186b0cf45d2e9c9889b4c9e941643fd67ca0ab1ec32710ab6bf5
+checksum=724774eb685b476a42c838ac8247787439913667fe023d2f1ed9c933d08dc57c
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index de5b44fb888..3a1bcda4506 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,6 +1,6 @@
 # Template file for 'enchant2'
 pkgname=enchant2
-version=2.2.13
+version=2.2.11
 revision=1
 wrksrc="enchant-${version}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ 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=a29c5777c4e45fcac2595c15c49d6d2aa434fa5e7c993dff3f9f367b65fe472a
 
 enchant2-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/enlightenment/patches/mips-name-clash.patch b/srcpkgs/enlightenment/patches/mips-name-clash.patch
deleted file mode 100644
index 06190e8b048..00000000000
--- a/srcpkgs/enlightenment/patches/mips-name-clash.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: variable name 'mips' clashes with target system headers
-
---- src/bin/e_wallpaper_gen_main.c	2020-05-31 20:22:37.495587000 +0200
-+++ src/bin/e_wallpaper_gen_main.c	2020-11-09 17:21:27.533538646 +0100
-@@ -85,33 +85,33 @@
- {
-    int i, j = 0;
-    int nw, nh, pw = 0, ph = 0;
--   Mip *mips = calloc(1, sizeof(Mip) * MAX_RES_NUM);
-+   Mip *l_mips = calloc(1, sizeof(Mip) * MAX_RES_NUM);
- 
--   if (!mips) return NULL;
-+   if (!l_mips) return NULL;
-    for (i = 0; resolutions[i]; i += 2)
-      {
-         nh = resolutions[i + 1];
-         nw = (w * nh) / h;
-         if ((nh >= h) || (nw >= w))
-           {
--             mips[j].from_w = pw;
--             mips[j].from_h = ph;
--             mips[j].to_w = 1000000000;
--             mips[j].to_h = 1000000000;
--             mips[j].last = EINA_TRUE;
-+             l_mips[j].from_w = pw;
-+             l_mips[j].from_h = ph;
-+             l_mips[j].to_w = 1000000000;
-+             l_mips[j].to_h = 1000000000;
-+             l_mips[j].last = EINA_TRUE;
-              break;
-           }
- 
--        mips[j].from_w = pw;
--        mips[j].from_h = ph;
--        mips[j].to_w = nw;
--        mips[j].to_h = nh;
-+        l_mips[j].from_w = pw;
-+        l_mips[j].from_h = ph;
-+        l_mips[j].to_w = nw;
-+        l_mips[j].to_h = nh;
- 
-         j++;
-         pw = nw + 1;
-         ph = nh + 1;
-      }
--   return mips;
-+   return l_mips;
- }
- 
- EAPI int
-@@ -123,9 +123,9 @@
-    int bg_b = 64;
-    char dir_buf[128], img_buf[256], edc_buf[256], cmd_buf[1024], qual_buf[64];
-    const char *dir, *quality_string = NULL, *img_name = NULL;
--   Mip *mips = NULL;
-+   Mip *l_mips = NULL;
-    int i, imw, imh, w, h, quality;
--   int ret = 0, mips_num = 0;
-+   int ret = 0, l_mips_num = 0;
-    Eina_Bool alpha;
-    FILE *f;
- 
-@@ -207,25 +207,25 @@
-        (!strcmp(mode, "scale_out")) ||
-        (!strcmp(mode, "pan")))
-      { // need to produce multiple scaled versions
--        mips = _resolutions_calc(w, h);
--        if (!mips) return 6;
--        for (i = 0; mips[i].to_w; i++)
-+        l_mips = _resolutions_calc(w, h);
-+        if (!l_mips) return 6;
-+        for (i = 0; l_mips[i].to_w; i++)
-           {
--             mips_num++;
--             if (mips[i].last)
-+             l_mips_num++;
-+             if (l_mips[i].last)
-                {
-                   imw = w;
-                   imh = h;
-                }
-              else
-                {
--                  imw = mips[i].to_w;
--                  imh = mips[i].to_h;
-+                  imw = l_mips[i].to_w;
-+                  imh = l_mips[i].to_h;
-                }
-              evas_object_resize(subwin, imw, imh);
-              evas_object_resize(image, imw, imh);
-              elm_win_render(subwin);
--             if (mips[i].last)
-+             if (l_mips[i].last)
-                snprintf(img_buf, sizeof(img_buf), "%s/img.png",
-                         dir);
-              else
-@@ -239,7 +239,7 @@
-           }
-      }
-    // no multiple resolutions -0 save out original
--   if (!mips)
-+   if (!l_mips)
-      {
-         evas_object_resize(subwin, w, h);
-         evas_object_resize(image, w, h);
-@@ -267,16 +267,16 @@
-    snprintf(edc_buf, sizeof(edc_buf), "%s/bg.edc", dir);
-    f = fopen(edc_buf, "w");
-    if (!f) goto cleanup;
--   if ((mips) && (mips_num > 1))
-+   if ((l_mips) && (l_mips_num > 1))
-      {
-         fprintf(f,
-                 "images {\n"
-                 " set { name: \"img\";\n");
--        for (i = mips_num - 1; i >= 0; i--)
-+        for (i = l_mips_num - 1; i >= 0; i--)
-           {
-              fprintf(f,
-                      "  image {\n");
--             if (mips[i].last)
-+             if (l_mips[i].last)
-                {
-                   fprintf(f,
-                           "   image: \"img.png\" %s;\n",
-@@ -284,8 +284,8 @@
-                }
-              else
-                {
--                  imw = mips[i].to_w;
--                  imh = mips[i].to_h;
-+                  imw = l_mips[i].to_w;
-+                  imh = l_mips[i].to_h;
-                   fprintf(f,
-                           "   image: \"img-%ix%i.png\" %s;\n",
-                           imw, imh, quality_string);
-@@ -293,8 +293,8 @@
-              fprintf(f,
-                      "   size: %i %i %i %i;\n"
-                      "  }\n",
--                     mips[i].from_w, mips[i].from_h,
--                     mips[i].to_w, mips[i].to_h);
-+                     l_mips[i].from_w, l_mips[i].from_h,
-+                     l_mips[i].to_w, l_mips[i].to_h);
-           }
-         fprintf(f,
-                 " }\n"
-@@ -489,7 +489,7 @@
-      }
-    ret = system(cmd_buf);
- cleanup:
--   free(mips);
-+   free(l_mips);
-    ecore_file_recursive_rm(dir);
-    evas_object_del(win);
-    return ret;
diff --git a/srcpkgs/envypn-font/template b/srcpkgs/envypn-font/template
index 6c8ab2ff077..9f3d7de3075 100644
--- a/srcpkgs/envypn-font/template
+++ b/srcpkgs/envypn-font/template
@@ -1,7 +1,8 @@
 # Template file for 'envypn-font'
 pkgname=envypn-font
 version=1.7.1
-revision=4
+revision=3
+archs=noarch
 depends="font-util xbps-triggers"
 short_desc="Readable bitmap font inspired by Envy Code R"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2364220ebf4..4451edd900c 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.1.2
+version=23.1.1
 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=afff83ab51830cb7d9ed995d0c98a3947896471cde9af000befd78b390f109be
+checksum=8094484d94bce21d76f3a6c6137098839e7bc121e170c08b472f980296684ac9
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/ettercap/patches/CVE-2017-6430.patch b/srcpkgs/ettercap/patches/CVE-2017-6430.patch
new file mode 100644
index 00000000000..bc090f594ea
--- /dev/null
+++ b/srcpkgs/ettercap/patches/CVE-2017-6430.patch
@@ -0,0 +1,57 @@
+diff --git a/utils/etterfilter/ef_compiler.c b/utils/etterfilter/ef_compiler.c
+index db876636..ddb73bd3 100644
+--- utils/etterfilter/ef_compiler.c
++++ utils/etterfilter/ef_compiler.c
+@@ -239,7 +239,9 @@ size_t compile_tree(struct filter_op **fop)
+    struct filter_op *array = NULL;
+    struct unfold_elm *ue;
+ 
+-   BUG_IF(tree_root == NULL);
++   // invalid file
++   if (tree_root == NULL)
++      return 0;
+   
+    fprintf(stdout, " Unfolding the meta-tree ");
+    fflush(stdout);
+diff --git a/utils/etterfilter/ef_main.c b/utils/etterfilter/ef_main.c
+index ae459134..431084b9 100644
+--- utils/etterfilter/ef_main.c
++++ utils/etterfilter/ef_main.c
+@@ -39,7 +39,7 @@ struct globals *gbls;
+ 
+ int main(int argc, char *argv[])
+ {
+-
++   int ret_value = 0;
+    globals_alloc();
+    /* etterfilter copyright */
+    fprintf(stdout, "\n" EC_COLOR_BOLD "%s %s" EC_COLOR_END " copyright %s %s\n\n", 
+@@ -84,8 +84,12 @@ int main(int argc, char *argv[])
+       fprintf(stdout, "\n\nThe script contains errors...\n\n");
+   
+    /* write to file */
+-   if (write_output() != E_SUCCESS)
+-      FATAL_ERROR("Cannot write output file (%s)", GBL_OPTIONS->output_file);
++   ret_value = write_output();
++   if (ret_value == -E_NOTHANDLED)
++      FATAL_ERROR("Cannot write output file (%s): the filter is not correctly handled.", GBL_OPTIONS->output_file);
++   else if (ret_value == -E_INVALID)
++      FATAL_ERROR("Cannot write output file (%s): the filter format is not correct. ", GBL_OPTIONS->output_file);
++
+    globals_free();
+    return 0;
+ }
+diff --git a/utils/etterfilter/ef_output.c b/utils/etterfilter/ef_output.c
+index 5ae59190..fcf19f01 100644
+--- utils/etterfilter/ef_output.c
++++ utils/etterfilter/ef_output.c
+@@ -51,6 +51,9 @@ int write_output(void)
+    if (fop == NULL)
+       return -E_NOTHANDLED;
+ 
++   if (ninst == 0)
++      return -E_INVALID;
++
+    /* create the file */
+    fd = open(GBL_OPTIONS->output_file, O_CREAT | O_RDWR | O_TRUNC | O_BINARY, 0644);
+    ON_ERROR(fd, -1, "Can't create file %s", GBL_OPTIONS->output_file);
diff --git a/srcpkgs/ettercap/patches/CVE-2017-8366.patch b/srcpkgs/ettercap/patches/CVE-2017-8366.patch
new file mode 100644
index 00000000000..4ffa09bc768
--- /dev/null
+++ b/srcpkgs/ettercap/patches/CVE-2017-8366.patch
@@ -0,0 +1,201 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90050590..8f7c7c36 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -126,7 +126,27 @@ if(NOT DISABLE_RPATH)
+   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+   set(CMAKE_MACOSX_RPATH 1)
+ endif(NOT DISABLE_RPATH)
++
++# set general build flags for debug build-type
+ set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb3 -DDEBUG -Wall -Wno-pointer-sign -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Wextra -Wredundant-decls" CACHE STRING "" FORCE)
++# append ASAN build flags if compiler version has support
++if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
++   if (CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8)
++      set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -fno-omit-frame-pointer" CACHE STRING "" FORCE)
++      message("Building with ASAN support (GNU compiler)")
++   else (CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8)
++      message("Building without ASAN support (GNU compiler)")
++   endif (CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8)
++elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
++   if (CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.1)
++      set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fsanitize=address -fno-omit-frame-pointer" CACHE STRING "" FORCE)
++      message("Building with ASAN support (Clang compiler)")
++   elseif (CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.1)
++      message("Building without ASAN support (Clang compiler)")
++   endif (CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.1)
++endif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
++
++# set build flags for release build-type
+ set(CMAKE_C_FLAGS_RELEASE "-O2 -w -D_FORTIFY_SOURCE=2" CACHE STRING "" FORCE)
+ 
+ if(OS_DARWIN)
+diff --git a/include/ec_strings.h b/include/ec_strings.h
+index f791739d..9ad245ef 100644
+--- include/ec_strings.h
++++ include/ec_strings.h
+@@ -43,7 +43,7 @@
+ 
+ EC_API_EXTERN int match_pattern(const char *s, const char *pattern);
+ EC_API_EXTERN int base64_decode(char *bufplain, const char *bufcoded);
+-EC_API_EXTERN int strescape(char *dst, char *src);
++EC_API_EXTERN int strescape(char *dst, char *src, size_t len);
+ EC_API_EXTERN int str_replace(char **text, const char *s, const char *d);   
+ EC_API_EXTERN size_t strlen_utf8(const char *s);
+ EC_API_EXTERN char * ec_strtok(char *s, const char *delim, char **ptrptr);
+diff --git a/src/ec_encryption.c b/src/ec_encryption.c
+index 6c02529c..3d505603 100644
+--- src/ec_encryption.c
++++ src/ec_encryption.c
+@@ -218,7 +218,7 @@ int set_wep_key(char *string)
+ 
+    if (type == 's') {
+       /* escape the string and check its length */
+-      if (strescape((char *)tmp_wkey, p) != (int)tmp_wkey_len)
++      if (strescape((char *)tmp_wkey, p, strlen(tmp_wkey)+1) != (int)tmp_wkey_len)
+     	  SEMIFATAL_ERROR("Specified WEP key length does not match the given string");
+    } else if (type == 'p') {
+       /* create the key from the passphrase */
+diff --git a/src/ec_strings.c b/src/ec_strings.c
+index 53583851..21b71926 100644
+--- src/ec_strings.c
++++ src/ec_strings.c
+@@ -167,13 +167,14 @@ static int hextoint(int c)
+ /* 
+  * convert the escaped string into a binary one
+  */
+-int strescape(char *dst, char *src)
++int strescape(char *dst, char *src, size_t len)
+ {
+    char  *olddst = dst;
++   char  *oldsrc = src;
+    int   c;
+    int   val;
+ 
+-   while ((c = *src++) != '\0') {
++   while ((c = *src++) != '\0' && (size_t)(src - oldsrc) <= len) {
+       if (c == '\\') {
+          switch ((c = *src++)) {
+             case '\0':
+@@ -218,9 +219,11 @@ int strescape(char *dst, char *src)
+                   if (c >= '0' && c <= '7')
+                      val = (val << 3) | (c - '0');
+                   else 
+-                     --src;
++                     if (src > oldsrc) /* protect against buffer underflow */
++                        --src;
+                } else 
+-                  --src;
++                  if (src > oldsrc) /* protect against buffer underflow */
++                     --src;
+                *dst++ = (char) val;
+                break;
+ 
+@@ -232,15 +235,17 @@ int strescape(char *dst, char *src)
+                        c = hextoint(*src++);
+                        if (c >= 0) 
+                           val = (val << 4) + c;
+-                       else 
+-                          --src;
+-               } else 
+-                  --src;
++                       else if (src > oldsrc) /* protect against buffer underflow */
++                             --src;
++               } else if (src > oldsrc) /* protect against buffer underflow */
++                     --src;
+                *dst++ = (char) val;
+                break;
+          }
+-      } else if (c == 8 || c == 263)  /* the backspace */
+-         dst--;
++      } else if (c == 8 || c == 263) {  /* the backspace */
++         if (dst > oldsrc) /* protect against buffer underflow */
++            dst--;
++      }
+       else
+          *dst++ = (char) c;
+    }
+diff --git a/src/interfaces/curses/ec_curses_view_connections.c b/src/interfaces/curses/ec_curses_view_connections.c
+index fb52331c..011c0edf 100644
+--- src/interfaces/curses/ec_curses_view_connections.c
++++ src/interfaces/curses/ec_curses_view_connections.c
+@@ -614,7 +614,7 @@ static void inject_user(void)
+    size_t len;
+ 
+    /* escape the sequnces in the buffer */
+-   len = strescape((char*)injectbuf, (char*)injectbuf);
++   len = strescape((char*)injectbuf, (char*)injectbuf, strlen(injectbuf)+1);
+    
+    /* check where to inject */
+    if (wdg_c1->flags & WDG_OBJ_FOCUSED) {
+diff --git a/src/interfaces/gtk/ec_gtk_view_connections.c b/src/interfaces/gtk/ec_gtk_view_connections.c
+index fa7dfdc5..b55e1755 100644
+--- src/interfaces/gtk/ec_gtk_view_connections.c
++++ src/interfaces/gtk/ec_gtk_view_connections.c
+@@ -1627,7 +1627,7 @@ static void gtkui_inject_user(int side)
+    size_t len;
+     
+    /* escape the sequnces in the buffer */
+-   len = strescape(injectbuf, injectbuf);
++   len = strescape(injectbuf, injectbuf, strlen(injectbuf)+1);
+ 
+    /* check where to inject */
+    if (side == 1 || side == 2) {
+diff --git a/utils/etterfilter/ef_encode.c b/utils/etterfilter/ef_encode.c
+index d4b9110c..7e359e06 100644
+--- utils/etterfilter/ef_encode.c
++++ utils/etterfilter/ef_encode.c
+@@ -136,7 +136,8 @@ int encode_const(char *string, struct filter_op *fop)
+       fop->op.test.string = (u_char*)strdup(string + 1);
+          
+       /* escape it in the structure */
+-      fop->op.test.slen = strescape((char*)fop->op.test.string, (char*)fop->op.test.string);
++      fop->op.test.slen = strescape((char*)fop->op.test.string, 
++            (char*)fop->op.test.string, strlen(fop->op.test.string)+1);
+      
+       return E_SUCCESS;
+       
+@@ -184,7 +185,8 @@ int encode_function(char *string, struct filter_op *fop)
+             fop->opcode = FOP_FUNC;
+             fop->op.func.op = FFUNC_SEARCH;
+             fop->op.func.string = (u_char*)strdup(dec_args[1]);
+-            fop->op.func.slen = strescape((char*)fop->op.func.string, (char*)fop->op.func.string);
++            fop->op.func.slen = strescape((char*)fop->op.func.string, 
++                  (char*)fop->op.func.string, strlen(fop->op.func.string)+1);
+             ret = E_SUCCESS;
+          } else
+             SCRIPT_ERROR("Unknown offset %s ", dec_args[0]);
+@@ -202,7 +204,8 @@ int encode_function(char *string, struct filter_op *fop)
+             fop->opcode = FOP_FUNC;
+             fop->op.func.op = FFUNC_REGEX;
+             fop->op.func.string = (u_char*)strdup(dec_args[1]);
+-            fop->op.func.slen = strescape((char*)fop->op.func.string, (char*)fop->op.func.string);
++            fop->op.func.slen = strescape((char*)fop->op.func.string, 
++                  (char*)fop->op.func.string, strlen(fop->op.func.string)+1);
+             ret = E_SUCCESS;
+          } else
+             SCRIPT_ERROR("Unknown offset %s ", dec_args[0]);
+@@ -272,9 +275,11 @@ int encode_function(char *string, struct filter_op *fop)
+          /* replace always operate at DATA level */
+          fop->op.func.level = 5;
+          fop->op.func.string = (u_char*)strdup(dec_args[0]);
+-         fop->op.func.slen = strescape((char*)fop->op.func.string, (char*)fop->op.func.string);
++         fop->op.func.slen = strescape((char*)fop->op.func.string, 
++               (char*)fop->op.func.string, strlen(fop->op.func.string)+1);
+          fop->op.func.replace = (u_char*)strdup(dec_args[1]);
+-         fop->op.func.rlen = strescape((char*)fop->op.func.replace, (char*)fop->op.func.replace);
++         fop->op.func.rlen = strescape((char*)fop->op.func.replace, 
++               (char*)fop->op.func.replace, strlen(fop->op.func.replace)+1);
+          ret = E_SUCCESS;
+       } else
+          SCRIPT_ERROR("Wrong number of arguments for function \"%s\" ", name);
+@@ -328,7 +333,8 @@ int encode_function(char *string, struct filter_op *fop)
+       if (nargs == 1) {
+          fop->op.func.op = FFUNC_MSG;
+          fop->op.func.string = (u_char*)strdup(dec_args[0]);
+-         fop->op.func.slen = strescape((char*)fop->op.func.string, (char*)fop->op.func.string);
++         fop->op.func.slen = strescape((char*)fop->op.func.string, 
++               (char*)fop->op.func.string, strlen(fop->op.func.string)+1);
+          ret = E_SUCCESS;
+       } else
+          SCRIPT_ERROR("Wrong number of arguments for function \"%s\" ", name);
diff --git a/srcpkgs/ettercap/patches/libressl.patch b/srcpkgs/ettercap/patches/libressl.patch
deleted file mode 100644
index 15e0d3c1c9e..00000000000
--- a/srcpkgs/ettercap/patches/libressl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b2f7634c9dbc0ef68640f0571787d92300e9f9f9 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan@steils.org>
-Date: Sat, 15 Aug 2020 07:18:31 +0300
-Subject: [PATCH] ec_sslwrap: fix compilation with LibreSSL
-
-Disable taking over SNI extension from ClientHello and SSL configuration
-operations until LibreSSL supports the required API.
-
-Fixes: https://github.com/Ettercap/ettercap/issues/1068
----
- src/ec_sslwrap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git src/ec_sslwrap.c src/ec_sslwrap.c
-index b9f26a142..1e4c24fc1 100644
---- src/ec_sslwrap.c
-+++ src/ec_sslwrap.c
-@@ -71,11 +71,11 @@
- #define TLS_server_method SSLv23_server_method
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_OPENSSL_1_1_0
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_OPENSSL_1_1_1
- #endif
- 
diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..772c073b6d2 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,19 +1,18 @@
 # Template file for 'ettercap'
 pkgname=ettercap
-version=0.8.3.1
-revision=1
+version=0.8.2
+revision=14
 build_style=cmake
 configure_args="-DENABLE_GTK=OFF"
 hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
- libltdl-devel libnet-devel libpcap-devel pcre-devel"
+makedepends="ncurses-devel libressl-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"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://ettercap.github.com/ettercap/"
 distfiles="https://github.com/Ettercap/ettercap/archive/v${version}.tar.gz"
-checksum=d0c3ef88dfc284b61d3d5b64d946c1160fd04276b448519c1ae4438a9cdffaf3
+checksum=f38514f35bea58bfe6ef1902bfd4761de0379942a9aa3e175fc9348f4eef2c81
 lib32disabled=yes
 
 CFLAGS="-fcommon"
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index 77e291d78eb..42ef6369b06 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -9,7 +9,6 @@ build_style=gnu-configure
 configure_args="--enable-hwdb --enable-manpages --disable-introspection"
 hostmakedepends="automake libtool pkg-config gperf libxslt docbook-xsl"
 makedepends="libblkid-devel libkmod-devel"
-checkdepends="xz"
 short_desc="Gentoo's fork of systemd-udev (enhanced userland device daemon)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/faad2/template b/srcpkgs/faad2/template
index 33158709e65..14d7d3b6c82 100644
--- a/srcpkgs/faad2/template
+++ b/srcpkgs/faad2/template
@@ -1,16 +1,16 @@
 # Template file for 'faad2'
 pkgname=faad2
-version=2.10.0
+version=2.9.2
 revision=1
 wrksrc="faad2-${version//./_}"
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool"
 short_desc="AAC decoding library"
-maintainer="Nathan <ndowens@artixlinux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.audiocoding.com/"
 distfiles="https://github.com/knik0/faad2/archive/${version//./_}.tar.gz"
-checksum=0c6d9636c96f95c7d736f097d418829ced8ec6dbd899cc6cc82b728480a84bfb
+checksum=9728b2b94f94ab49363cd229e7377fbe6ef3c311c5cd80da662d53ddb0ee091d
 
 pre_configure() {
 	autoreconf -vfi
@@ -23,6 +23,5 @@ faad2-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
 	}
 }
diff --git a/srcpkgs/fbmenugen/template b/srcpkgs/fbmenugen/template
index 21592ffa8ea..7b7659eb98d 100644
--- a/srcpkgs/fbmenugen/template
+++ b/srcpkgs/fbmenugen/template
@@ -1,14 +1,15 @@
 # Template file for 'fbmenugen'
 pkgname=fbmenugen
-version=0.85
+version=0.84
 revision=1
+archs=noarch
 depends="fluxbox perl-Data-Dump perl-Gtk2 perl-Linux-DesktopFiles"
 short_desc="Fluxbox menu generator (with support for icons)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/trizen/fbmenugen"
 distfiles="https://github.com/trizen/fbmenugen/archive/${version}.tar.gz"
-checksum=99ea3bf39a153c1c05bcd7881d7708fc575c485855e8d8b022520b43013ceb26
+checksum=cc57fa3cced4f959281497b4276052321d88046e358cea27e1cc4363c6f714d1
 
 do_install() {
 	vbin fbmenugen
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 3881119c18c..8a25628f47c 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,7 +1,7 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.13
-revision=1
+version=6.4.12
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"
@@ -11,9 +11,8 @@ short_desc="Remote-mail retrieval utility"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
-changelog="https://gitlab.com/fetchmail/fetchmail/-/blob/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=7d28cf060b06b9c8ec72267be7edc9a99b70f61d7d32d8b609458dcedfa74be1
+checksum=2b84e0971dbf683ec7edd313f9218adbc7dc51c1de9825b3b549bf619c1a4887
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"
diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..23541a38cfd 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,6 +1,6 @@
 # Template file for 'ffsend'
 pkgname=ffsend
-version=0.2.68
+version=0.2.65
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/timvisee/ffsend"
 distfiles="https://github.com/timvisee/ffsend/archive/v${version}.tar.gz"
-checksum=749046507274f03a1e667cf2302b5b3ac2a977e44ae3f9594be65ce0fca40daf
+checksum=a07f1c45888df7ed061d2bb8c035a0b158b9d3c84d533900043407108ce953d6
 
 post_extract() {
 	# avoid ring dependency
diff --git a/srcpkgs/figlet-fonts/template b/srcpkgs/figlet-fonts/template
index 75052314023..36746d35612 100644
--- a/srcpkgs/figlet-fonts/template
+++ b/srcpkgs/figlet-fonts/template
@@ -1,20 +1,18 @@
 # Template file for 'figlet-fonts'
 pkgname=figlet-fonts
 version=20150508
-revision=4
-_figlet_version=2.2.5
+revision=3
+archs=noarch
 create_wrksrc=yes
 depends="figlet perl"
 short_desc="Additional fonts for figlet"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-3-Clause"
+license="BSD"
 homepage="http://www.figlet.org/fontdb.cgi"
 distfiles="ftp://ftp.figlet.org/pub/figlet/fonts/contributed.tar.gz
- ftp://ftp.figlet.org/pub/figlet/fonts/international.tar.gz
- ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${_figlet_version}.tar.gz"
+ ftp://ftp.figlet.org/pub/figlet/fonts/international.tar.gz"
 checksum="2c569e052e638b28e4205023ae717f7b07e05695b728e4c80f4ce700354b18c8
- e6493f51c96f8671c29ab879a533c50b31ade681acfb59e50bae6b765e70c65a
- bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d"
+ e6493f51c96f8671c29ab879a533c50b31ade681acfb59e50bae6b765e70c65a"
 
 do_install() {
 	vmkdir usr/share/figlet
@@ -22,5 +20,4 @@ do_install() {
 	cp international/*.flf $DESTDIR/usr/share/figlet
 	vbin contributed/bdffonts/bdf2flf.pl bdf2flf
 	rm "${DESTDIR}/usr/share/figlet/banner.flf"
-	vlicense "figlet-${_figlet_version}/LICENSE"
 }
diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 83d62af699a..b4d0d26ee31 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -13,14 +13,6 @@ homepage="http://www.darwinsys.com/file/"
 distfiles="https://astron.com/pub/file/file-${version}.tar.gz"
 checksum=f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1
 
-if [ -z "$CHROOT_READY" ]; then
-	# libseccomp's default=auto
-	# and libseccomp is not bootstrap
-	# If we're bootstrap from host with libseccomp installed
-	# bootstrap will fail to install shlib required by file.
-	configure_args+=" --disable-libseccomp"
-fi
-
 if [ "$CROSS_BUILD" ]; then
 	# XXX cross compilation needs exactly the same version for the host
 	hostmakedepends="file"
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index a9ca14471b1..f603441dc38 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=20.08.3
+version=20.08.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=b838cf9aa2b77839860c50c514428a03739d4584465a350384175bd8a4d592ca
+checksum=65f5f90d56d3449722647286324f8aae54754ec2a46c9aaa2e3bad92bae3433e
diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index dac19bad8de..2155bdd80bd 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -25,9 +25,7 @@ post_extract() {
 pre_check() {
 	# LFS reccomends disabling this due to to the possibility of looping forever on some machines
 	# see: http://www.linuxfromscratch.org/lfs/view/development/chapter06/findutils.html
-	vsed -i 's/test-lock..EXEEXT.//' gnulib-tests/Makefile
-	# help-version is broken because we do not build locate
-	vsed -i "/tests\/misc\/help-version.sh/d" Makefile
+	sed -i 's/test-lock..EXEEXT.//' tests/Makefile.in
 }
 post_configure() {
 	make -C locate dblocation.texi
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index d8df644a8c1..6fdd22574cb 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,10 +1,10 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.4.0
+version=68.11.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="35c752c8332e93c7ae10e09691440accdde03232be291f57f106a73e0522da4e
- c0a32333c4d33626b108d6e89f0ebae3924d95e97f93e739ff4720d79d895756
- b1a51894781f6fb757a4502e5f59eb577174274260f980321a8169c5a6b4c761
- 925a61467b506d94c59a0003d8e3f5b01d6bafbac612fd5ab52633661939ad45
- 4ce396e8f2a65d12b082e5d3541069a80ffd79b52286db1de7dc2669923a4212
- 885454f2fa66015fc772442b420cf9361f0ea8fcc6a861c5b3b8952b999e4b23
- 433b6de936c7cfb7a025fc25767744c7392386de646724757d10f586aa83b24a
- 9e17a358e8ba03ff31d98fcb108b0fb42523a1f06a7fb07edf3289da66f65034
- ff54ceea34d4aedbb905d71caffb6606a0f79cdad6b2f58017bc00ef45caf399
- 77e7edd22f3b062b04b89b96d1e8cd03b9b29fa587f401f8fd6a62d8cbb71ef4
- 7df2e3610c0f4ef3d450b6d8b7c31e7941447ba40f06e4075e14e0a16f5e5a63
- 99b3a2a17e2815958e6987e91027d3bf866efdad694b6701e0d00f96b72a4bfd
- 8da6131d3857c403def32ac18f94a760bd4fa9734cfc018afadff0aab435f6b2
- 43fdd1b32eb3fe59853bed4e5dba94b03dcb8d4d6a9ff87869b4637478053c92
- 9ba43cc29edd3f9b4cfeb146e31eb1668cc427d9bd334e5aa9eb0cc904ebdac5
- d1bb088339aa358e9ff7332d40cc7c7ee75e31e6c9653574c03b7aaf01187322
- 20830119a3ce7f0bbfbbed86f38fc1e623dca824ae6e7b36c80cf4a28e14cd2e
- 4668d586d8f2bccd1f20905da08c123dcee4f5cf3bafe9b0a0070ea712a84298
- 60c0c41a9d95c0ae169cb39e84b25a35cfe2b02ed81f2c411067d2285dd95c89
- c18a432bcc3faf4a4b5cde8688483cf4a1dc1b1e8e74ebfc64f490a7b45db66a
- c019015d322d4b37f6266f49994e3ef325c8a99d11505591db9815600905b9a1
- a1285de48c539790cb216c8539c3ac10b1837f0029e7f99dd4247e83b60a40e6
- 1e21753f0334a39db7deabe2b439e1884ef499c02d716f9d3f9f73feaf6109b2
- b9a9a87386d535b131b70db3f7e5d4f3c552fe3e38b21869bf5b0943b58ddfd5
- df9ae1d24f07340f368a2031a3c44f14bc15a72dc076aba2c1692a98ef345d4a
- 6b04111a500d4923e52674874ec0bf76a29522d56b9d19ebc75cae24d3d03fa5
- 29709f30c3a1ff97371417fa35ee985360bdbba8b01367508d34373d990eed84
- fe5eb1d10c74568566c91133af9524108120f1f89b5a6d04fc374821d0c0649a
- f8b747e8564a45ebfa4677dcc105180a883a5f022f87e86d96c1ad56f42f1961
- f54c672d98ea069b628febabe6120d96c9b8ce84dc797577ee292127000820df
- 6323c444f9cb9f9430601cfa561249f072edbcdfe664847bb6f4b78ba9d2ad00
- af3b9a70817316dec6ffc0cfc7d5405f96d637a5b8afcc7ec4fb5f66b1e2965b
- 26b1667f7c5aca3023c0e64c47386f1862bab780dfb51ce4f964bb2dba117ab0
- d6282d2b3ad88b4e2eaca9b48c108ec3a3cdb575ad507313515335551943af75
- 9fa91154b3596c6f360053eee870715f6ee3682ec7a8962c180ba254075df59a
- 15289032b51367eb654e425f3aee15e12d8e3288ae2b3cd36853d137d8489d87
- a69bd27e74de22c6e472aacc5bb9d9c4e543027d861791f0417382a5f7f5118d
- 54f42c8506f639562eca63b63f09566900017c1e22793d233570e28c97db72ca
- 82c3396456c455b13802977bcda8a5f98f4a72471ad9189020603275348d8010
- 4538c6d201312b42989bd8d895e9a32aafb6355f83a7afa4155e2c9afa5e1983
- 4d299eeb204f4e1e8ff7c6c27b84481d1df84d53be1131680e0dab80f4578a6d
- 37d638dfa311486749f970eafe54790e5a4ac79843a1acffd0a9f10a3e96fd83
- 0f34bb060b1cbd05a442d69dd02dcf454ed3de8636a2a3989fbabeaee82efbf9
- 4daca2bbcc014524d096f83891120582294389a727df8608512397b47e8ddbf3
- 90f8bb64ab8f5b9ebf11538edb7f6ad0f484b3bdfef963a491135b18c9d5eabf
- fe8196ebf1940d534eae41f8b8bd481d4b84d306b5f8de4715147e139031b07f
- 093bdbd9150d86df6603e20097ce4c5db18b460fdc6349c824c4723681bb6826
- 1a0282846b44a7ba90219c212e50d8784cd9b77cfab8c8ae14577863cc12ebd6
- 13db9b9ebcb7d9c0868d1260feeee63300910d0e5b193e06ab861e540bddbd0a
- 3ed29ddb978f2ff7c1672bd6525b5adf6818e14b260d7a0835ebf465f9dfca95
- eeb2834967f05b9080a58de1f759406bb4294909a0922c7f7e4e2a69ed22104d
- ed5b351f84260047b2f959b7dbeb9a3fa6f4710777780831c4f0259907b5fbe0
- 1e09c208488553d62fc0f78a926971d3b37d969ed237137844c76f684bb07272
- 8877e26cde0358319b57ade82c2d6aaf56ba3673517fc3fbf46390907c998b30
- 4bb3c5aab906d9cfc53494c79e373b71852bd1cfd551c62dd4e5d4bfb95d8e48
- 5f93db3d3d77dee88888c143e9fdd6c62b3584b5851532671fe14b7d4bee18db
- 35fee74c18d203601a562093cd67013431a1efea99d930b6012f2501bd8a364b
- 5c677d1c44b195af914137eafa94191d964ea4e014b7586a6d6c213b5e78fd49
- b377c9210c98c95330ebbc74fd43226cb4d11ea5d2b3947bef55943e0fe93329
- c6017b6cc9243f558eda77dbe536f3e8089764d490eaa846f61c9b373e91dfda
- 7c2e54610bdc94c3a3d320e158537c5d6589f24a1bdd9bd2f74e2a2e32de41b6
- 6f0b776eec863cdbfbea145551ea24bcee9358bcf014b060de3bced4fd9a9f3b
- 1d93bed629c1fd548bc2e13a25d8fae5dd343888c8c9142f52e8f8a128f91247
- e27c28fe6ba9cfc6191dcedf2511092b610b42c6023c27c05fec3273babb4cda
- e85ff98db5a5b7aaf1719fe5adafd9555e2fc5d5869a6af636747fad416f3cc6
- 947bc98e84fa1668beb3dc3067d96b40575e581df997b1cf4ec13b26856b5a2f
- 42cb022dc9becddba32595855bd358ba8dc1bdc0f5485914337cc087e9c2ebea
- 45b7fef087f305c963cec517db5518af5d3680230617a853ab677fe241c03a79
- b84434f6a5cdc058868633449a984d302b0f0029d605110814e516dc4c0298b3
- daa0bbb4caddc4098a451a050d2a60ff8694bee0da0e48eb04224636531918f5
- 20edddb729bb4a230ded2ba323681e2f6b18b8da6c79f5c78396422affef23a9
- ca8eb956c6061f2ebce77b97a8e7e1a9f8e2378e3d74a83e75b5d750f1f81e56
- 5409bbf56ecd8d1c74328644ab3dd9dd4330d5be92aa4d6d569b3dea6f1aa990
- e1beeb8feee4fd13f21ca1bedbb99b2fd060d99e771c52477ab494866b3fe20c
- ad8c57d68d36893488ad051a4abbe95eb52544eb0f2f5d8f09f524784633e0e1
- 3e275b9eaa134c0457a13fdb89207da4f6f370797c1c5fac809bccceb1a8b661
- 34f67db7354e694b0c9f2a09af4bc7069851a3691280613802eef512fda2e9bf
- cc008ee84e7af7bb51a09120022acb39032ec6fa4d59f6cee2f61b7a32b4daac
- f289208bfd9981968144fa7669c2872cfe67cc15edba6cc109c926b22596a3c8
- c96be633a6b9da032d4aa5e63ebb72924b58d96b61e1f723723a88eafd6c1015
- 27cbe55e65de1dd4dabed9de5ebd5aec1f59d31735c57168675ffc3878cdca7d
- a298214b7cc5a5a807031cda012751692b6d96b83a73c03d82f9f9b909d59be6
- 19de4d1d77ff6eec0d0840ae7b8c1138ea80e162dc62684f8eed59b47670e4ed
- dd066e9bc0d22915388b3be25afed12db90197124afb5355599676a55a2c321a
- b6883ba8e423eacc9f5715172ce591bf056891c4420a952de2284a79293afc49
- 73a0c455ff8e9efdbbf278fcb26711732b85ba3c66e1fb97882e09979b288291
- d90e4348ab6d4cd786acc8a474a9664730ec81b41db90585a3531d19996821ef
- dfe77d29b1290a17497521e464ca1398f4961310ae07795de44683df7cac2a3c
- adffef23919ddf92dedd9c81f5c73cd30e21c9980c354bf20c7bf9ebe58a9709
- 50124f81e3db868533e13436ef6c17c09b591962d021869a710a0e9bd826887b
- ba23938f2767eae74371618aa06d9bf98c70352007d2ada2bb46f3c8e6e26689
- aa6c7d37b9e8590404e7e3ad32a1d9845fcdbf799f5b59cc320ec17dc50c3570
- 2b30f7f634d0f6bb431dd8378e198cf397a8ff7b57b613c085d206b4ec68cc38"
+checksum="a96b2eab357c1d3ae79978919d78227e91427464ec0d506276e8448df878e4de
+ 77b3f295c0c8e331deec5ac81c4566e70e686e1134569e3dc383406634148642
+ dddd186a5e1835778736cf1eb6254dc6909b0fc547b312695788cc455b52aa9e
+ a59a86cc1838461ee51c3235c617ee28bb0ae7a4422866b645f67a7a2bc77673
+ 52acf8999a4f46549ef251787681f8db62ee44a1653cd1eefb82b5c8a7e3c480
+ 02d42d95c95d4b83716d71dbc8f9eab6d046540be34bc65360f16deca54840e8
+ 458001594cf5402dae30241193ffcdf0f727bc0451b46382cd12939458459258
+ 87be7b1c87ad813430e9f587315f1371f21f655ecb7f6dd90380741597ee818b
+ 67f628587202ffef8744e2399fc2e808454562f6e68a607c4a0dadff38f68789
+ 27b99f0e05d79f39abbb1770190f4a3d049aa527bd02ce9dd6815a3f73e3757f
+ 4b30e8c01fc67bb11779fa50d8e1b2c93d6a2a936c6d8c77d3314df0cfccc131
+ 45ebc6437bcc217ac54b0bf380a2f3f2e6cbbeada8d74269a760ae0d7a3a47da
+ 139126e7e7f6c78e23da66dca5441fc9c0c53eca1009cf58377044fe6fdeb202
+ 92b1a9b9465237c6423aac78cd02110354f7a4d4f89e915e045e3cf224323c51
+ a0abce87643502f16e3a4dde825cf3e7f58cd75f5a4196451ede813b799611c3
+ 8faaf99245fa5fd7a8ffe0344a6892546735c19eb9f2c6ecc534fc5808e26aec
+ 9317185ea24b23004971de4187b2561d12c82872e4aa61f406bc02d5e83617fd
+ 6869b14cf69508cd2f34cc722b346f30db0ec3891ebcc31908f69a1f307c8d67
+ c153a54ec2e4ad4e817f8fa91d29a1698c11ca9ec04e494e1d866c7d9842ee8e
+ dfe8300b735d2141798f8255d3ec102699b5b127bf9cfe5860784220ca0b6055
+ fd57e1055a25fa1dcd5a91393408dad91bf0db2054c4bfd29ab47785f3156599
+ a9f17b51896142082b3bfdcdbca9a472d95c5dd12005f2c3ce346c938d57ce7f
+ 935826ae44cace20973c9ee32df8032fa95ab82843a92c514add0d8c44fb4c7e
+ 4579dd24069d6414eb105d58c1789605a0ada438504f4fc14c724a4ee78b3726
+ f69ec189d7eb2a4074a9218a9b87399f0504b8790e8aab98650120acc20ca184
+ 4164c7f23e13e86f6c3e3bb1319da47a51d8b35b13acd2e8bf1c371d6c8a6ec3
+ ffac444bc57d684f0f131f93ff48ddf4db3761905fa36882659a380eddaa1703
+ 017049781b08378ab45a8cc95efda95e8dc4d10dc86d26efaf8209c51c556a0a
+ 5b7851dca418b6cb08a3e6d4f189478de2fba5869d559f82740eec55abb45f93
+ ef8c1054b528afc780b916f87b5038c0d2baa02a4445f7ec18c11f316766533e
+ ee81934fbe482564a28f5e4cd44d3596b5f3a3926abf4e7c30c52918199299e1
+ 269f6ca41e1322939ec1ed68a919e84e990cd431d7dbfc2bb67d3708e8d89bd8
+ c29406cfb4d94e98e15ec5f0fe9f9cec52a6e251865683cca307ff562b52d0a7
+ 025c7ed2fec33d06eb3cca4b7255d8b133cccb5d943d38afceef93ffc494e9e1
+ ac70f1b3f164798e4c95dddb81e45ae91f40ad66b97cd443da94df68cc7b7964
+ b467e26b8facc706501ec93be8b23c4fbc16b1fd01678f968d591951b7dab19b
+ cf0b4e1f2c0620b19917e616ce1d94da9b4361e1e642c080fe36580911d61b18
+ fd18f16b746c48224e4721d2a118fad44c598ca851778331aed4bd4355d8e982
+ 064fe64bde1cd1bf2c255297af730ef0487fb193d5ca425935fc26e6e46c6733
+ 06396fbfaebba29ffded9c79942e7fe6d988d1e0e26ac6bb3082dc5c1bfd1370
+ ac2d5b18284b3702a3b93e09c73dabc42894088bf7bd3ecd9e1114c882ad88be
+ 8f96e6b7e4be985ca90e5a378cb90a87cdef5b0ef36a64e86aac042e6f4dce74
+ ca38f1b8c8198150986e35264d6c8a0f56c2e4b694738d926104d360d1244c1e
+ bdb3756655fb54f5fb3feca19dce0bb6a7a98293f0def9f8855dbd269d20a259
+ f531eee42bb19c32ea1242beb29147e064da58caeede025510d8b3092198c62b
+ 05df51330571877fd1ab339183e6d68a5c92c5a132e109464b75dd5d4879d969
+ 8492216768d7c008a224d5831b47bf0ef6a7ac19ce21b0113ecce921868654ca
+ adea068ac99f58030551f1a080bd70d946c20edd9000c554f46289f3ea75c4bb
+ 0d909de2c7320827eab604e697ad3bd89adfd55c9e8ea5aabc2e3938f45025bc
+ 6edbe0259392b489ff808174e107d01dcaaf42b862ee3d0b804cfbda1ff636d3
+ 4fc4c48637a0d285e85db0d699a62a08c6cc503073b4201b6115c13f9c7283dd
+ e6fe631141ce94e6425e4c745fe2b5a2cbda685c5492ebb3c614d09433c455b8
+ 6f0730299dd9fd362c6b994128bce064bf215fd27f55a673fda6569bbf38a4c4
+ bb2e2cc0a0e4047b67b28596685b228c69c85a6a65d37c2c1003d7a9d8fd378a
+ 8640f7eaa4aa157ce94c951d9eecfaffd0d603bc05ce95559d90042302c99803
+ 2641ca0efcde0c92cc2ad4ad6c65fbe3ab56b711d88f26fd4e78c18cd3138aa2
+ 34cf05b4d96261da6e972bd64bba273de11b24b3032de1bdf1777d69d968b114
+ 0fb47c0ac1aec79351af5e06782c2ba1afd26cf8cc37505858e4028261affdf0
+ c4926c88b3466385c6040378e0fe9f777536f540e01b01f3d70ee514ff3593a6
+ b6edc8d2a7f9ea08ad89d05560351d5dd90f1bdc73c5ca7f6fc6e2cd6902bcd3
+ 5f25b4cc7443a6e8b30a4ffd8233920b2b8e4d1a6adca465739d7badd80f1534
+ 81248e707ced39e1bab3d28c9735dbe15ab7e8a9b563e887a65c6e995045bf17
+ 5fcabf089b74c00a4864dd77191fdbc8c5c35a7b748c96834961d2e2c1d2b15b
+ ea07bc5f78c771e803b00844a49d7f6e45abb6624a106d921d7a0d4bcc8ed886
+ 3c30cfbb658332f44a397e91da7aefbab02adb34bdc534386f6acb47e5eb5c18
+ ea4f2864fa6624a43cc04ad8222256a12b6c2aef877ac811f8c2f64097439006
+ 0bcd2198157a72df46c6702cc1330b152555341eeb4f046f6e7cec63d0715802
+ 2eca90bf5c6f0c762fb1f52cfa7f0146fae69a85bd45080066b8ef3514dc24e5
+ 506ba2747f0eac45f42ee729ca5bbc41931630852f2288244233e98cd7c9a489
+ de98305ce3526749f4cac6ffd47861a3cad7f2cbf25180471c68cf3280776edf
+ 4a8de2a062d67875dec79748e4cb03a3881e378108ede064d5aab10145afd2a2
+ c638de4dc72b87dab2e315b2da71d7612762c4d483d75d2feaa655e24db64241
+ 090918108985a1ab3ee8e155c97e6ef4ab7b7b2613f4be3388bfb4758be4e503
+ 4153ffb1c211c3c45a0efa9700c0908544f90d6a848f5096120933bfd94c44c3
+ 96d86350fd693bf708e4f4f7de238e71e0b90bcdac3205a3a25c84b13500bd99
+ ae4a76c6644585df1777d46ef10dbcbdb35dee0a13a45622bd49ad7b5eb996ac
+ ecb6a93d321be76717245b6a651b96123ec1765f133779caf8a43b38827aa892
+ 51932dccdd95a740fafdb2873f56c3306d803db5a796fd8379d986d84fd128a2
+ 8162375363e6f1650230bc643e2bde1d0018b4f6cf54369e0c59967ad5fa4a97
+ 72c79a7c65a637cb918e999d7d7ee13f4736e646512d165371740862e1e943b1
+ 558887a62a2b09636c5c5f8e7ed99b018344af190ebdf1a6d71548cda11d032e
+ b39046f78509d308072b384511725776d9de7da667f12bc6508eb6c39f843c75
+ 9038e9e671846f1839fa3b4794f121e546ce544021848f933c239b9917a16c2d
+ e238909d4f9ab35a0f1f56cd85747b307626f9713c3899d6497b3e1f257f28cb
+ 220793d97e399aca5d5e82bf159eb12b7acb6d974fcd693d45c7c264e85e6548
+ ef3f9f02f67084fc4dc4bde464002502a176cb7361813815c5460dd94ae0656d
+ 7baede2ac4e391b60896a0a02242aeabfe55ce8b50e7b05d5b77d99dda6b76e1
+ 5dec1a1452fc2303c655f153c19d675ef200f448be4b0c2b2b2d50244c820b41
+ 88ed2511992f45b930922fd4bba5e5ececc761029e3d92cd092d5ed5f66a3030
+ fcd8e1dea4a1c33fd72b096a61712f74a269ab334bf93653b265ee9e2871d999
+ 4ec2d6697632bc8dfd294b668d514deb37efde5414881dccbb9a280fa9f86ef4
+ 6c9aea7e23d20cb9074dc4acf8936cf249eb5b6e2c5ba1e4eab27267b41822a4
+ 5c0f5c8cc336e73a98dd6b22bc11c418e2ab33bc95ac5b7c948ea4eba1f1a7e3"
diff --git a/srcpkgs/firefox-esr/files/firefox-wayland b/srcpkgs/firefox-esr/files/firefox-wayland
deleted file mode 100644
index 495f901320c..00000000000
--- a/srcpkgs/firefox-esr/files/firefox-wayland
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec env MOZ_ENABLE_WAYLAND= /usr/lib/firefox/firefox "$@"
diff --git a/srcpkgs/firefox-esr/files/mozconfig b/srcpkgs/firefox-esr/files/mozconfig
index 31bb6dcd0f2..0798fdd40ef 100644
--- a/srcpkgs/firefox-esr/files/mozconfig
+++ b/srcpkgs/firefox-esr/files/mozconfig
@@ -3,6 +3,7 @@ ac_add_options --libdir=/usr/lib
 
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
+ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-libevent
@@ -11,8 +12,12 @@ 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-sqlite
 ac_add_options --enable-system-ffi
 
+ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr
+ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr
+
 nspr_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nspr"
@@ -21,13 +26,13 @@ nss_config_args="
  --libdir=${XBPS_CROSS_BASE}/usr/lib
  --includedir=${XBPS_CROSS_BASE}/usr/include/nss"
 
+ac_add_options --disable-gconf
 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
diff --git a/srcpkgs/firefox-esr/patches/big-endian-image-decoders.patch b/srcpkgs/firefox-esr/patches/big-endian-image-decoders.patch
deleted file mode 100644
index ccb417b61f1..00000000000
--- a/srcpkgs/firefox-esr/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/firefox-esr/patches/disable-image-format-warning.patch b/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch
new file mode 100644
index 00000000000..bd56e6bc37c
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/disable-image-format-warning.patch
@@ -0,0 +1,15 @@
+Imported from Adélie. Firefox is prone to this warning on BE and
+it leads to huge .xsession-errors, and the warning is not very
+important or meaningful, so just disable it.
+
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -147,7 +147,7 @@
+     case SurfaceFormat::R5G6B5_UINT16:
+       return CAIRO_FORMAT_RGB16_565;
+     default:
+-      gfxCriticalError() << "Unknown image format " << (int)format;
++      //gfxCriticalError() << "Unknown image format " << (int)format;
+       return CAIRO_FORMAT_ARGB32;
+   }
+ }
diff --git a/srcpkgs/firefox-esr/patches/fix-cross.patch b/srcpkgs/firefox-esr/patches/fix-cross.patch
deleted file mode 100644
index 9b8a816d269..00000000000
--- a/srcpkgs/firefox-esr/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/firefox-esr/patches/fix-i686-ppc-musl.patch b/srcpkgs/firefox-esr/patches/fix-i686-musl.patch
similarity index 100%
rename from srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch
rename to srcpkgs/firefox-esr/patches/fix-i686-musl.patch
diff --git a/srcpkgs/firefox-esr/patches/fix-image-format-warning.patch b/srcpkgs/firefox-esr/patches/fix-image-format-warning.patch
deleted file mode 100644
index 9b3b38d9065..00000000000
--- a/srcpkgs/firefox-esr/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/firefox-esr/patches/fix-sandbox-membarrier.patch b/srcpkgs/firefox-esr/patches/fix-sandbox-membarrier.patch
new file mode 100644
index 00000000000..caffd83cf67
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-sandbox-membarrier.patch
@@ -0,0 +1,52 @@
+allow usage of SYS_membarrier, needed since musl-1.1.22
+
+--- security/sandbox/linux/SandboxFilter.cpp
++++ security/sandbox/linux/SandboxFilter.cpp
+@@ -283,6 +283,8 @@
+       case __NR_set_tid_address:
+         return Allow();
+ #endif
++      case __NR_membarrier:
++        return Allow();
+ 
+         // prctl
+       case __NR_prctl: {
+
+--- security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ security/sandbox/chromium/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)
+
+--- security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ security/sandbox/chromium/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_
+ 
+--- security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1490,5 +1490,9 @@
+ #define __NR_shutdown 373
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/firefox-esr/patches/fix-seccomp-bpf.patch b/srcpkgs/firefox-esr/patches/fix-seccomp-bpf.patch
new file mode 100644
index 00000000000..ed94fc39ed0
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-seccomp-bpf.patch
@@ -0,0 +1,14 @@
+--- security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig	2015-09-23 09:10:08.812740571 +0200
++++ security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc	2015-09-23 09:11:38.404746155 +0200
+@@ -23,6 +23,11 @@
+ #include "sandbox/linux/services/android_ucontext.h"
+ #endif
+ 
++// musl libc defines siginfo_t __si_fields instead of _sifields
++#if defined(OS_LINUX) && !defined(__GLIBC__)
++#define _sifields __si_fields
++#endif
++
+ namespace {
+ 
+ struct arch_sigsys {
diff --git a/srcpkgs/firefox-esr/patches/fix-toolkit.patch b/srcpkgs/firefox-esr/patches/fix-toolkit.patch
new file mode 100644
index 00000000000..86e8ef47855
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-toolkit.patch
@@ -0,0 +1,78 @@
+--- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig    2016-07-05 21:00:03.672000517 +0200
++++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200
+@@ -1134,6 +1134,12 @@
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#undef __NR_pread
++#define __NR_pread __NR_pread64
++#undef __NR_pwrite
++#define __NR_pwrite __NR_pwrite64
++
+ /* End of x86-64 definitions                                                 */
+ #elif defined(__mips__)
+ #if _MIPS_SIM == _MIPS_SIM_ABI32
+--- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-03-15 05:19:36.000000000 +0000
++++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-04-17 10:24:33.793431933 +0000
+@@ -45,6 +45,7 @@
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <libgen.h>
+ 
+ #include <iostream>
+ #include <set>
+--- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-03-15 05:19:36.000000000 +0000
++++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-04-17 10:24:33.793431933 +0000
+@@ -41,6 +41,10 @@
+ 
+ #include "common/using_std_string.h"
+ 
++#ifndef N_UNDF
++#define N_UNDF 0
++#endif
++
+ using std::vector;
+ 
+ namespace google_breakpad {
+--- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-03-15 05:19:36.000000000 +0000
++++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-04-17 10:24:33.793431933 +0000
+@@ -55,7 +55,7 @@
+
+ #ifdef HAVE_MACH_O_NLIST_H
+ #include <mach-o/nlist.h>
+-#elif defined(HAVE_A_OUT_H)
++#elif 0
+ #include <a.out.h>
+ #endif
+
+--- toolkit.orig/mozapps/update/common/updatedefines.h	2019-01-29 11:34:36.416804577 +0100
++++ toolkit/mozapps/update/common/updatedefines.h	2019-01-29 11:34:59.193583777 +0100
+@@ -102,7 +102,7 @@
+
+ #  ifdef SOLARIS
+ #    include <sys/stat.h>
+-#  else
++#  elif !(defined(__linux__)) || defined(__GLIBC__)
+ #    include <fts.h>
+ #  endif
+ #  include <dirent.h>
+--- toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
++++ toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
+@@ -3978,6 +3978,7 @@
+ 
+ int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
+   int rv = OK;
++#if !defined(__linux__) || defined(__GLIBC__)
+   FTS* ftsdir;
+   FTSENT* ftsdirEntry;
+   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
+@@ -4085,6 +4086,7 @@
+   }
+ 
+   fts_close(ftsdir);
++#endif
+ 
+   return rv;
+ }
diff --git a/srcpkgs/firefox-esr/patches/fix-tools.patch b/srcpkgs/firefox-esr/patches/fix-tools.patch
index 1af39bc6118..0ed043fb5b5 100644
--- a/srcpkgs/firefox-esr/patches/fix-tools.patch
+++ b/srcpkgs/firefox-esr/patches/fix-tools.patch
@@ -1,5 +1,34 @@
+--- tools/profiler/lul/LulElf.cpp.orig	2019-01-29 12:05:34.223834130 +0100
++++ tools/profiler/lul/LulElf.cpp	2019-01-29 12:08:02.480400845 +0100
+@@ -469,10 +469,10 @@
+ // Return the non-directory portion of FILENAME: the portion after the
+ // last slash, or the whole filename if there are no slashes.
+ string BaseFileName(const string& filename) {
+-  // Lots of copies!  basename's behavior is less than ideal.
+-  char* c_filename = strdup(filename.c_str());
+-  string base = basename(c_filename);
+-  free(c_filename);
++  // basename's behavior is less than ideal so avoid it
++  const char *c_filename = filename.c_str();
++  const char *p = strrchr(c_filename, '/');
++  string base = p ? p+1 : c_filename;
+   return base;
+ }
+ 
 --- 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
+@@ -253,7 +253,11 @@
+ 
+   // Request profiling signals.
+   struct sigaction sa;
++#if defined(GP_ARCH_arm)
++  sa.sa_sigaction = SigprofHandler;
++#else
+   sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler);
++#endif
+   sigemptyset(&sa.sa_mask);
+   sa.sa_flags = SA_RESTART | SA_SIGINFO;
+   if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) {
 @@ -497,8 +501,10 @@
  ucontext_t sSyncUContext;
  
diff --git a/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch b/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch
deleted file mode 100644
index e3f60e8ecf6..00000000000
--- a/srcpkgs/firefox-esr/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/firefox-esr/patches/gettid-musl.patch b/srcpkgs/firefox-esr/patches/gettid-musl.patch
new file mode 100644
index 00000000000..c1cb99bf651
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/gettid-musl.patch
@@ -0,0 +1,11 @@
+--- tools/profiler/core/platform-linux-android.cpp.orig	2019-07-09 22:58:30.039475686 +0200
++++ tools/profiler/core/platform-linux-android.cpp	2019-07-09 22:58:39.331437677 +0200
+@@ -73,7 +73,7 @@
+ 
+ int profiler_current_thread_id() {
+   // glibc doesn't provide a wrapper for gettid().
+-#if defined(__GLIBC__)
++#if defined(__linux__)
+   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
+ #else
+   return static_cast<int>(gettid());
diff --git a/srcpkgs/firefox-esr/patches/ppc32-fix-build.patch b/srcpkgs/firefox-esr/patches/ppc32-fix-build.patch
deleted file mode 100644
index c1a8f422d0a..00000000000
--- a/srcpkgs/firefox-esr/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/firefox-esr/patches/rust-configure.patch b/srcpkgs/firefox-esr/patches/remove-rustc-check.patch
similarity index 85%
rename from srcpkgs/firefox-esr/patches/rust-configure.patch
rename to srcpkgs/firefox-esr/patches/remove-rustc-check.patch
index 887c102bc55..26a20dd94ce 100644
--- a/srcpkgs/firefox-esr/patches/rust-configure.patch
+++ b/srcpkgs/firefox-esr/patches/remove-rustc-check.patch
@@ -1,9 +1,9 @@
 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 @@
+--- build/moz.configure/rust.configure	2019-07-06 03:48:30.000000000 +0200
++++ build/moz.configure/rust.configure	2019-07-09 22:35:23.326851798 +0200
+@@ -79,9 +79,6 @@
  
      return unwrap
  
@@ -13,7 +13,7 @@ Remove calls to unwrap_rustup, they fail if rustup isn't present
  
  set_config('CARGO', cargo)
  set_config('RUSTC', rustc)
-@@ -348,26 +345,6 @@
+@@ -365,26 +362,6 @@
  
              os.write(in_fd, source)
              os.close(in_fd)
diff --git a/srcpkgs/firefox-esr/patches/rust-has-i128.patch b/srcpkgs/firefox-esr/patches/rust-has-i128.patch
deleted file mode 100644
index 4c90cd3d106..00000000000
--- a/srcpkgs/firefox-esr/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/firefox-esr/patches/sandbox-fork.patch b/srcpkgs/firefox-esr/patches/sandbox-fork.patch
deleted file mode 100644
index 72640cb7f70..00000000000
--- a/srcpkgs/firefox-esr/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/firefox-esr/patches/skia-sucks1.patch b/srcpkgs/firefox-esr/patches/skia-sucks1.patch
index 05ad34a3fc3..223c9b14e6b 100644
--- a/srcpkgs/firefox-esr/patches/skia-sucks1.patch
+++ b/srcpkgs/firefox-esr/patches/skia-sucks1.patch
@@ -1,77 +1,84 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
-https://bugzilla.mozilla.org/attachment.cgi?id=9028600
+# HG changeset patch
+# Parent  548d0a2f3a22bfac32ec0c3921c6c969c8bf32a9
 
---- 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
+diff -r 548d0a2f3a22 gfx/2d/ConvolutionFilter.cpp
+--- gfx/2d/ConvolutionFilter.cpp	Mon Jul 22 16:57:54 2019 +0200
++++ gfx/2d/ConvolutionFilter.cpp	Thu Jul 25 14:27:59 2019 +0200
+@@ -35,9 +35,38 @@
+   return true;
  }
  
- 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
++static void ByteSwapArray(uint8_t *u8Array, int32_t size) {
++    uint32_t *array = reinterpret_cast<uint32_t*>(u8Array);
++    for (int pxl = 0; pxl < size; ++pxl) {
++        // Use an endian swap to move the bytes, i.e. BGRA -> ARGB.
++        uint32_t rgba = array[pxl];
++        array[pxl] = NativeEndian::swapToLittleEndian(rgba);
++    }
++}
++
+ void ConvolutionFilter::ConvolveHorizontally(const uint8_t* aSrc, uint8_t* aDst,
+                                              bool aHasAlpha) {
++#ifdef MOZ_BIG_ENDIAN
++    int outputSize = mFilter->numValues();
++
++    // Input size isn't handed in, so we have to calculate it quickly
++    int inputSize = 0;
++    for (int xx = 0; xx < outputSize; ++xx) {
++        // Get the filter that determines the current output pixel.
++        int filterOffset, filterLength;
++        mFilter->FilterForValue(xx, &filterOffset, &filterLength);
++        inputSize = std::max(inputSize, filterOffset + filterLength);
++    }
++
++    ByteSwapArray((uint8_t*)aSrc, inputSize);
++#endif
++
+   SkOpts::convolve_horizontally(aSrc, *mFilter, aDst, aHasAlpha);
++
++#ifdef MOZ_BIG_ENDIAN
++    ByteSwapArray((uint8_t*)aSrc, inputSize);
++    ByteSwapArray(aDst, outputSize);
++#endif
  }
  
---- gfx/2d/DrawTargetSkia.cpp
-+++ gfx/2d/DrawTargetSkia.cpp
-@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
-   return surfaceBounds.Intersect(bounds);
+ void ConvolutionFilter::ConvolveVertically(uint8_t* const* aSrc, uint8_t* aDst,
+@@ -49,8 +78,26 @@
+   int32_t filterLength;
+   auto filterValues =
+       mFilter->FilterForValue(aRowIndex, &filterOffset, &filterLength);
++
++#ifdef MOZ_BIG_ENDIAN
++  for (int filterY = 0; filterY < filterLength; filterY++) {
++      // Skia only knows LE, so we have to swizzle the input
++    ByteSwapArray(aSrc[filterY], aRowSize);
++  }
++#endif
++
+   SkOpts::convolve_vertically(filterValues, filterLength, aSrc, aRowSize, aDst,
+                               aHasAlpha);
++
++#ifdef MOZ_BIG_ENDIAN
++  // After skia is finished, we swizzle back to BE, in case
++  // the input is used again somewhere else
++  for (int filterY = 0; filterY < filterLength; filterY++) {
++    ByteSwapArray(aSrc[filterY], aRowSize);
++  }
++  // The destination array as well
++  ByteSwapArray(aDst, aRowSize);
++#endif
  }
  
--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.
-   //
+ /* ConvolutionFilter::ComputeResizeFactor is derived from Skia's
+diff -r 548d0a2f3a22 gfx/skia/skia/include/core/SkPreConfig.h
+--- gfx/skia/skia/include/core/SkPreConfig.h	Mon Jul 22 16:57:54 2019 +0200
++++ gfx/skia/skia/include/core/SkPreConfig.h	Thu Jul 25 14:27:59 2019 +0200
+@@ -73,7 +73,7 @@
+       defined(__ppc__) || defined(__hppa) || \
+       defined(__PPC__) || defined(__PPC64__) || \
+       defined(_MIPSEB) || defined(__ARMEB__) || \
+-      defined(__s390__) || \
++      defined(__s390__) || defined(__s390x__) || \
+       (defined(__sh__) && defined(__BIG_ENDIAN__)) || \
+       (defined(__ia64) && defined(__BIG_ENDIAN__))
+          #define SK_CPU_BENDIAN
diff --git a/srcpkgs/firefox-esr/patches/skia-sucks3.patch b/srcpkgs/firefox-esr/patches/skia-sucks3.patch
index f4e890f0536..d95b81698e9 100644
--- a/srcpkgs/firefox-esr/patches/skia-sucks3.patch
+++ b/srcpkgs/firefox-esr/patches/skia-sucks3.patch
@@ -1,5 +1,3 @@
-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.
@@ -19,7 +17,7 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
        SkCanvas::kPreserveLCDText_SaveLayerFlag |
            (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
  
-+#if MOZ_BIG_ENDIAN()
++#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.
@@ -30,27 +28,3 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
    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/firefox-esr/patches/sndio.patch b/srcpkgs/firefox-esr/patches/sndio.patch
index c5e5c486dd1..6c72284c19b 100644
--- a/srcpkgs/firefox-esr/patches/sndio.patch
+++ b/srcpkgs/firefox-esr/patches/sndio.patch
@@ -1,8 +1,8 @@
 --- old-configure.in.orig
 +++ old-configure.in
-@@ -2818,6 +2818,22 @@
-     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
- fi
+@@ -2839,6 +2839,22 @@
+ 
+ AC_SUBST(MOZ_ALSA)
  
 +dnl ==================================
 +dnl = Check sndio availability
@@ -21,11 +21,26 @@
 +AC_SUBST(MOZ_SNDIO)
 +
  dnl ========================================================
- dnl =
- dnl = Maintainer debug option (no --enable equivalent)
+ dnl = Disable PulseAudio
+ dnl ========================================================
+--- toolkit/library/moz.build.orig
++++ toolkit/library/moz.build
+@@ -235,10 +235,8 @@
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
+     OS_LIBS += CONFIG['TK_LIBS']
+ 
+-if CONFIG['OS_ARCH'] == 'OpenBSD':
+-    OS_LIBS += [
+-        'sndio',
+-    ]
++if CONFIG['MOZ_SNDIO']:
++    OS_LIBS += CONFIG['MOZ_SNDIO_LIBS']
+ 
+ if CONFIG['MOZ_ENABLE_DBUS']:
+     OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS']
 --- media/libcubeb/src/moz.build.orig
 +++ media/libcubeb/src/moz.build
-@@ -44,11 +44,13 @@
+@@ -43,7 +43,7 @@
      ]
      DEFINES['USE_JACK'] = True
  
@@ -34,19 +49,49 @@
      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 @@
+--- build/moz.configure/old.configure.orig
++++ build/moz.configure/old.configure
+@@ -169,6 +169,7 @@
  @old_configure_options(
      '--cache-file',
      '--datadir',
 +    '--enable-sndio',
-     '--enable-crashreporter',
-     '--enable-dbus',
-     '--enable-debug-js-modules',
+     '--enable-content-sandbox',
+     '--enable-cookies',
+     '--enable-cpp-rtti',
+--- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig
++++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
+@@ -349,6 +349,21 @@
+         }
+       }
+     }
++
++#ifdef MOZ_SNDIO
++    // ~/.aucat_cookie (sndio)
++    rv = homeDir->Clone(getter_AddRefs(confDir));
++    if (NS_SUCCEEDED(rv)) {
++      rv = confDir->AppendNative(NS_LITERAL_CSTRING(".aucat_cookie"));
++      if (NS_SUCCEEDED(rv)) {
++        nsAutoCString tmpPath;
++        rv = confDir->GetNativePath(tmpPath);
++        if (NS_SUCCEEDED(rv)) {
++          policy->AddPath(rdwrcr, tmpPath.get());
++        }
++      }
++    }
++#endif
+   }
+ 
+   // Firefox binary dir.
+--- security/sandbox/linux/moz.build.orig
++++ security/sandbox/linux/moz.build
+@@ -81,6 +81,9 @@
+ if CONFIG['MOZ_ALSA']:
+     DEFINES['MOZ_ALSA'] = True
+ 
++if CONFIG['MOZ_SNDIO']:
++    DEFINES['MOZ_SNDIO'] = True
++
+ # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
+ # dependency like the one in libxul does, but this way the behavior is
+ # consistent.  See also the comment in SandboxLogging.h.
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 3ebb35ac5df..eb3c32bed59 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,55 +3,57 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.4.0
+version=68.11.0
 revision=1
 wrksrc="firefox-${version}"
-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="Firefox browser - Extended Support Release"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+build_helper="rust"
+short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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=8e3cf0bbf1062768134db2eb10ab774731ca5ec6694b65def82234bb0a9170fc
+checksum=91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160
+
 lib32disabled=yes
+hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
+ python3 cargo llvm clang rust cbindgen nasm nodejs-lts-10 tar which"
+makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
+ pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel
+ libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
+ libXdamage-devel $(vopt_if alsa alsa-lib-devel)
+ $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if startup_notification startup-notification-devel)
+ $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if sndio sndio-devel)"
+depends="nss>=3.44.3 desktop-file-utils hicolor-icon-theme"
 conflicts="firefox>=0"
 
-build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
-build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
+build_options="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio"
+build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver sndio"
 
 case $XBPS_TARGET_MACHINE in
-	armv[56]*) broken="required NEON extensions are not supported on armv[56]" ;;
+	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac
 
-CXXFLAGS="-Wno-class-memaccess -Wno-unused-function"
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 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
+# 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
 }
 
 post_extract() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	case "$XBPS_TARGET_MACHINE" in
+	*-musl)
 		cp "${FILESDIR}/stab.h" toolkit/crashreporter/google-breakpad/src/
-	fi
+		;;
+	esac
+
 	# Google API key (see http://www.chromium.org/developers/how-tos/api-keys)
 	# Note: This is for Void Linux use ONLY.
 	echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" > google-api-key
@@ -62,18 +64,19 @@ post_extract() {
 }
 
 post_patch() {
-	_clear_vendor_checksums num-traits
-	_clear_vendor_checksums glslopt
+	_clear_vendor_checksums cssparser
 }
 
 do_build() {
-	cp ${FILESDIR}/mozconfig .mozconfig
+	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	case "$XBPS_TARGET_MACHINE" in
+	       *-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig
 		echo "ac_add_options --disable-gold" >>.mozconfig
 		echo "ac_add_options --enable-release" >>.mozconfig
-	fi
+		;;
+	esac
 
 	case "$XBPS_TARGET_MACHINE" in
 	arm*|x86_64*|i686*)
@@ -98,16 +101,17 @@ do_build() {
 
 		export BINDGEN_CFLAGS="--target=$XBPS_CROSS_TRIPLET \
 			--sysroot=${XBPS_CROSS_BASE} ${BINDGEN_INCLUDE_FLAGS}"
-		export HOST_CC="${CC_host}"
+		export HOST_CC=cc
 		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
+		export ac_cv_sqlite_secure_delete=yes \
+			ac_cv_sqlite_threadsafe=yes \
+			ac_cv_sqlite_enable_fts3=yes \
+			ac_cv_sqlite_dbstat_vtab=yes \
+			ac_cv_sqlite_enable_unlock_notify=yes \
+			ac_cv_prog_hostcxx_works=1
+
 		echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig
 		echo "ac_add_options --host=$XBPS_TRIPLET" >>.mozconfig
 	else
@@ -134,11 +138,6 @@ do_build() {
 		build/moz.configure/toolchain.configure
 	fi
 
-	case "$XBPS_TARGET_MACHINE" in
-	aarch64*|i686*|x86_64*)
-		echo "ac_add_options --enable-rust-simd" >>.mozconfig ;;
-	esac
-
 	export LDFLAGS+=" -Wl,-rpath=/usr/lib/firefox"
 
 	if [ "$SOURCE_DATE_EPOCH" ]; then
@@ -148,57 +147,38 @@ do_build() {
 	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
+	cat <<! >>.mozconfig
 ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-google-safebrowsing-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key"
 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 --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3')
-EOF
+ac_add_options $(vopt_enable startup_notification startup-notification)
+!
+
 	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}/firefox-wayland
 	vinstall ${FILESDIR}/vendor.js 644 usr/lib/firefox/browser/defaults/preferences
 	vinstall taskcluster/docker/firefox-snap/firefox.desktop 644 usr/share/applications
 
-	for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+	for i in 16x16 22x22 24x24 32x32 48x48 128x128 256x256; do
 		vinstall ${wrksrc}/browser/branding/official/default${i%x*}.png 644 \
 			usr/share/icons/hicolor/${i}/apps firefox.png
 	done
-	vinstall ${wrksrc}/browser/branding/official/default256.png 644 \
-		usr/share/pixmaps firefox.png
 
-	# Use system-provided dictionaries
-	rm -rf ${DESTDIR}/usr/lib/firefox/{dictionaries,hyphenation}
-	ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/firefox/dictionaries
-	ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/firefox/hyphenation
+	# We don't want the development stuff
+	rm -rf ${DESTDIR}/usr/{include,lib/firefox-devel,share/idl}
 
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
 	ln -sf firefox ${DESTDIR}/usr/lib/firefox/firefox-bin
-
-	# Remove the development files - noone uses them
-	rm -rf ${DESTDIR}/usr/{include,lib/firefox-devel,share/idl}
 }
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index f191a73a57e..000dc693e25 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=82.0.3
+version=82.0.2
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="5514206e7f44214f3c39bca279f9bab57d0678d3de27179d3ce8c31cbd1993d0
- 4ef22df523a86b4a3d4c0727894f192a1d314250cddfe428f6a0aa7f3dc67349
- 0bda85b614cce9cff8d29f50f330abd467f5bedeeacc1060a83899a708f17977
- 2ce68308195cf7d323a6a1f0ba7afda77c641bee7a35b03d0413dd7759a676df
- 26242521dde6b9506c38b1b6793b5b74523a6818af9b31bc809278ff8480ad63
- a7764763adcfce9a9ca7ff3ab23f0d3bcdb5eba681a20e16c169c90b29e902f4
- 9b87238a74b1ab3167db45576cb81f56c9f2caf99dc96d9cfb2d23b2c32f4149
- 98a22b059d5f2d8ff2c06736f41930141599af50489dce5e0d57af714f558fe8
- 9358d85e5872a6366f5fefc5aa273328f0d4bcea5c99116d24ce06855aa4b06a
- 156da1b0a75f4aea7c22a5c7e01910c2ae69d9e5843c2cf70a009330c1f53a0a
- 93232cccacf3b0dae4abffec9a034bdee079e5a15586ebb8442fbe1451c31cd0
- 25e1591c5b28966096f79a6136b89c11200a123bde1084e8b8b1fcda0659725f
- 37328b286ea2c7183da9d23296c87b69327cdfdb24f3a88d97e2c81bd7fe8efe
- fcce82357cf018c15f7d31cfd6dac98f7c5f4638003b60cd4d95ed4278e10bf5
- 6971ae4f97791864cc40ecd77f00b2037ccc8221ac4e72036408f5305b2e9b1c
- ef0734f1d4d879d065dc390965f49a63fc96563a4b4b6e759ebb9c6c10389bf6
- 96e8c0be96a8f7274f5d704d352db772e36315310c2b1a645ad03584408f01bd
- 4958880c3cee8c284fad069627deb252f9e2cd1a7cce39abd7136cb9102b8c08
- 0ce2126ebd227b4937c4d6979b4af9f3ea42d3e8c8b20338c5a33f158e13864c
- 9ba2e4f71268acbf123cb64a82b23f8968dd106cce6b8ca623f25a389e2768f9
- c87fa995402ede4418955c4f0a048d9f3a28357c044715632bfba989bc88e89a
- 50fa9eb50529937bfc2981f8e596aaf5212abac4215e4ba1e08f27d9941d1597
- 9996260d4f532528b556ff417ec47e271670c92bd6ce237ce4e9498f55e4be4a
- 71ed166233bafaee3c1cfe8630d7a99f07143284aec192d6a89ba68b9573f1c4
- 2e60b360e5b48f3066dd7219b4614b969e65dbe18e7ac028e772d3044bb0395e
- 28b66a552bc8a982d4a1858f8630a888a1127717ec76d3f88b5cca1f22fc4aa6
- 286695d8f356ef0dcfdde343c6923325cc6b4de08ca6f72ad6a8474d993ef6d1
- 773c5296fec3747e96207a541c080d48352171f87c25a99238356605cbbf9b94
- 4104565143301c94b39966a50fab71d57e458d9c501a73ea86d55af5d20c4246
- ef0a3f45d7ebd0087e37fd6080fdf1191a4b8bce88c1c9aa11c96ce5d53cffc1
- 63890546a50523c3a39fe53d55d85486cb06a09d80ce816aadc0c5b6173eca7b
- ad2cf24f020eb718cc79bc14f57f5b6d37ffb837104b23183ea59680f664dbdf
- 5ad2e0c759db2d0311a38b579c63309e6a27a86872bd3c67d30b76e133f3419f
- dfbf8e4e1db766a44a77e9c496e04e5d780e62092630780fe4b42d371ec5cbe3
- 1b0c49c006862ffa5841b9b147a3b5bb5f3a4d29fbbc0e761c91e5491ff7944d
- 676fcc1cdc12afb799a045b96ff5d1fdd8935dd58f4113b4c716fd4fa6f090ea
- 2ea51c7d92d82a8442a4f5dd00bac42fc4254a287c4f0ecd21527befe348abef
- 498f6b742347fbe072f3031aff5f3b25ca53b4128efdae42a72977f45986afa8
- e037c9ca7ef6daa1aecf5e9174cea8ae8b4089c3773625a2e8a857f9582a5d34
- 74b965ca5095d970e566d2afe3794a5394df0fad41791d37bd6933e417085225
- b346add39e55e8e42c1b25a492d98d038bfbca982c9ab7902886077e7452ebc2
- 99e07b0deaa86cd4da94ed145f733585caa54f8ee8f21f478a5493a1162fb46d
- b5482baf0702bd02a7faac2ecb2c7bf8fa81802532c200f356aa0179a150e63a
- d4a96870091db124bb895717b048affddad3c97bfb8496fe3699af34f9346455
- cd624e1b0c851fe5a19b7464edeb10abae3953956e290b847333f842c0e2c358
- 279f96954d82024af9d85a2d98a1b0a6ce35a41525aa0d1c98e24cc04a92521e
- bbaf1cf4865f202d0a57be95f04a70d53688d19ca54ecf15532badba6d6f721e
- a6f3a85aee1a35d17ca33d944f7f7888d80ed2a99e829a08e102398952421409
- de0e3efa4373d7c1d6b35ea5a604666cad6389e67098ab30db99553a9c85b45a
- 97321d14c7cfe5da7f537b9c6a2e2a1ded32d1d3ccbd7b595364b34d39c71634
- 85ddf51aaec9b95f072f98c219e7b0940f2c06a436f7f77839dcb210c4b1378a
- c9e495c629d21a841b0313c6e82b44153fbb811e3e133dec4a03135eb1dddd2e
- 218e5e3781ac629490fd5c4bcfeb665a1699b7d847ae4fd5068470b193246c00
- aa51a3adfe854f1fd731b96ebff54624a0bb36ab315dede6abb9a7ee37cbb828
- f749e9b0330a0347d7ae0e2e9ff52d708586ed7caff20a2639a0b7516b0468cc
- ab764f80572ca17cd2e9d868e400397f71cbdfc2451c7755878cefe2dcdb6db0
- 08083f5613e9b38d5fed37b19ec26bf006a1f25de9238068943b0eacac4ff848
- 2cd8a556b7ccacfe16559a472fb6ee2381516f94a56e96af79a8b53f27219cda
- fbbbfeda3cdb3c876447bc69fe1bc66f19302b262b41a6c77540fd114b8a98bc
- e5e3abef092369799cdf55b65a82011c2348daf236d85ddaaaa60d6e7bdd4e33
- f0c522fdc8bb316fb4fbe340ae762e1c16ce3d78d85094926278aea3daceef51
- a652c781e31b8164639e29e2f1ef13d7292d03022089d0983ee1f5f1934c2bf2
- a7e8d0aaafd06710f07312859f0f3cb46ff3444d4fd9aca57ca044c5a9050652
- 86c54f1260360febfa0bbcb58668402d9db13ed00a965a0a071c6c9ad93f2815
- dc3204e90558d2ac35505f0171f9d815e297a013e9c373b3b2b6b2e739461f78
- b187e008e022f88acd365f68cdc992ebc8f3100e46db3b89e0fa02cba311e98a
- 069def30d7864b2452bc14a584c129f9dfe2f6a26fae296ea5cb2350dcc1bf81
- 4c7c2b92168b67eabe76e08fb9c27a60307aa61c61095de1d3af2bbe5d8780a7
- 64685394baec35ff9753c77eb70feac5f7806f03050f62ae6ef3ff74595d8839
- f99d66ff27975557bbe452d66292503534b898cc935ad1fd5017b9cd6ec1fd27
- c20e02c0e02e9549b4cce131ddc5f874b236fcde3ad672df11696b741465cd62
- 5632d1698dd6a9119bdd0be326ad1ef54e43cd5a9de1a5fb6b97ac31e5674e09
- 2738ea85d7e0404441d4391f806915399872606b1eded842e0358ad13349029b
- ab2d8e45778a6bac60570798e344b8bc3fc016383b10f2af52be9e8232ddcd1f
- dadab90e8d5ae5ad8898f6ad35123fc61a8f0c99c1fff2e09ba70b30ff65a06c
- 50afef352f62f41d403bb45a1bdec5de94e904d5fc0dbc3f74d725014ff415bd
- a13c05c8c4d212f1510d1e98c910ed3d1004e33ad5ea119b3208fa46ea130b56
- 1b2864463f7f78219553493fab07617cee6b1270464e96380e2094e0a48cba7a
- 0913baf2eafcc3e84b7f92c8bdb63b9a4693759b392fa96314d6530df767c1de
- 167c0780f7ca979b97946b4e061bc468a4148169e90ce9c4ff3191a53cfb0758
- f92d646eeffcfe4f7adebac6c9aa9efbdc2c7b24823a170cd27fff547288245a
- 14866188eec0b40cf834b06ddfc2539d8f1185d55f157a8244216c1e0077877b
- 7d1ad9233c6137420fe6de01c52ce72015fdf0e8a60f73b36579c47d104733ba
- b93e5fdbd23520346d90d416dfc939cb8917d69e596c661a1985483c5f8e4b8f
- 513834b39831fccfede23867ed86775c33996be3de7042e73bb5b6ffb340bb81
- 08ffee7c586bfed9113ffa489cacc7a260aff1df09047fdb1dd48ae6d48f0785
- 9a5854130f904b8596e53a3a4b77b4d595727603c99e8f24674b2a4de4c13f7c
- c4308fb31233f5c2430ceb760727bd506d3e8ccfbe5b14fe5700a0c1590799de
- f4813aad53de25676e87a3a811b1037603a83c064485ccfd97234b08c53e45e0
- fcda650744c1522f44d9c0f27a22e489662f8070c7156179771cf0f373ca5086
- 6ab8fd80a01eeff038cdc2bd4252575dbc5ba39e189982b97bb2f6080f337608
- 4831cd2df36d59e8e7cfe584dbe25991186ec5b90b114c78c05db91329b7f522
- f07ce9c2d27937e29c25efef5f13191b611e6556c26fc4b449add4f4410ffffa
- 6e61751d1a55a6386c27cc6f038e292876064db21f317a5c77a2717f7d46faec
- 562ced1cd3f33057919280cf370d390958abbdbe210aa772d5bb57250e4792a6
- 1ba33e2383e582a04c8a6979c80ed450403273944fe1adb1d43cae4e29ad1662"
+checksum="37fc2dfed2ac7d6197455b868ad4cf7039e5432942654a97a86aac401ea9261c
+ e220bef7397d3b96ea5bf5614264bc2b2d86f25f65604540c9e047015df4b5ec
+ cc7b03be04d008112c40d33f6cccbd0634f6a9fdfdc96bd6a77fdea0d2a0ab27
+ 042cf28ae2640cd70e363b9c0428092eaab1386a51c80b7b3bf04227e979cdf7
+ fa3a242c35835064c4f511cbc733d6c4d6ac23a01ceb8070b3392a8ca9bd6e60
+ 0fb6730e8dbce44cae834d01db3d8d9814835730ceb0986c146d198379cc4bc7
+ 05ad222b737e55d9dc50d29788bb4a18700d12a656e62ed0c210ccf1cbac2a6b
+ 0792f2a651de67e1e7cff3e9da58a0c5ede7976d4304632af2bf9fe2d54fdbe8
+ 147c325154e74415ef7568a0a5913e902426477c46cdcbcbe9bad27a91c8a533
+ d432757388c9865ff8d62854af485a492a3fb0772615345d75df89bdc4e13c04
+ c6ebc6103290a0c9875b00aa781ce746727751b2d9aa9f5ec6abcb80fd044187
+ 251394c4b313e0c002df01311940a107e4f78b0979a5809441b95ecbe75b78a2
+ 31280b9b44c4c3db91fd8f8762251b2ad613e946873867bb859d0a47bb859d4f
+ 4d9c0d4266c375f1df00556c2f12aa767d2df780e8e184535631ef2ffdc12cc8
+ cf3c078435eed6155ef1c04798a1dab06b26dc305e6f34309bd870c7c887aae0
+ 0dbb339e4d80502d7f19bfbcf7e4fc1b149848aa1b64fe0e77fb3d23efa52dbc
+ e80f89d5fa78e4045e6c3402527cb613ab922e5fdbb96be8517dea1d0bbcd70a
+ 4338da996f2e909265aa63927962f49badb27ee34f7d87b23ae38972594dd7eb
+ 4354be7bf9e50d64e725c9371de14f2bbd75b9d460c6668045a3d99724671c08
+ 0aa138eeec43a99792ec4c425eedcb48da2024cc689341cc2e97b69d8f68fed8
+ a4a039fc51c7f90ac743c4eb224c8770ded5243a2638ea511791a68f531eb482
+ d4ed5bd92ce61daa8133ba7263ae5c104b6ea1df0c01d0aef1afa86df489631a
+ 29eec83e25b51e9f54e30b183097e04faf935332622be5017bc0e48c5644e96f
+ 36b1460fc0102fffd59ed2507cdb3e26fa0d1ee10b026ae94e536b2e0d40ec78
+ 2863e52608707e60b3ca0d1fc6f851e65f265ee8d3b012f620736da727d0f45c
+ eb104fd3cb5bdda21138f33f22bd9a8031e656aa4759f095b9f5e297cacb9d94
+ acbcd14075f741837ddafdbe8f37267fad6226fe7bc11a8ed3616029a4fc3090
+ 00e607b58a24a8e3e7969ffe8826ec1254ad12ff855ec204bcfc0313c051bc30
+ 3a34a4910149fcc3e23764b477211babc910b7320a0752841e8ecd608d7481ab
+ 3b61ec1190b23944d36aae7915d8e4037ec8c989f82633f77266072bf7c8f725
+ d9f6b14ecf18669001a574adb7f24ed648d95906b2df37f2cb1ebab7e7a6748b
+ 8ff9f80bb579ba24ef8cb86b1ce279e7a989c295ee1cc0c9edb361faa0a06188
+ fc32206580e99d12947765f714a3b012abcb7e5566f405042b188be31a5bdd75
+ 4ae35e6db1401e3052d0bfdcf72f1d6d37a969d5eafae70e9faa77c2976ea4bb
+ 37f73fb84c02e18490eef55ac67275c034439b136164517ad7d90a46621c8cd4
+ 169c674e2b1ed64d2f1804701238aa98305aa4cd411ecce51c8e20b69e799f23
+ a65f0b54504efe6dcef6cf04bb1205d827b922c011573249ec859733d19590c0
+ 53dfa8ff9543e47f81087712f4cf5b05cf78de29c16614b31c81ef2e5cd7917e
+ 5c51465a3e5f6e748a0ed0fadf13b06ff5018278ac36b85480a87cb1d8bc4837
+ 0e4096f46c1d1ecd4de73a93ef5f489259fc5a3048400c78948a422953f91d9f
+ f05c64afe4058b81bfb52be1404918f362f79e59d7500213b59af661a958d2e4
+ f389848667ee6c51547d156d33f9861128aac83cb39a3d5ad397e587d5f97334
+ b660c88d965907d506b2c7c435e8a1b992ec626ce1660d717673786a1070ba68
+ 81e2ca5fddc4849767079561968afea019087e45d44bce0d93e7b64c457ee7b6
+ ae2cf3040bea117ad6ba0bb2609e30832a38d11b7289a56e583a7b48c0a13e9e
+ 0ac3f6f6c86e1a3ab2ea3fd7048057ab28bbbc672189db1db8f913bb4b8c9d1c
+ dcf29373bba58eff7328912fc4453ffbe5de6166bd4795e3c4bd0d93a2831444
+ f10ac04c805471309e8bf4ff1d5996798edda96b65d19a2250c1815b4116bbbc
+ 2fe5560893df1ff790cb59b0ef953483d07629737696dcab375363b0b452e2a0
+ d9cfd13ef264e2cd858cd2fbf9c1cc930e39c7166bfefb810172e895f0a05077
+ df8c1c0c1aa8c61c374c54070e91a1eab53a938edc40d2ff27c62382a576ec0d
+ f0dbe6c7eed8ae42e88520940562f37060871e531592e9e50f7ce2b60f52ac9a
+ a3d69cb234e9643fedb8106b2ff5e60bee1238b106ac2691fd59bc2f4499efc2
+ 10aab8a51d362e895e7ca5271f36ecb1111495cdf4c9fbe5bc48399bd2fe74d9
+ ad97773c8405107b267761f7e57e49b21e6d30a65cdf402368d14a29909ea907
+ 29635479fc905e106f4269c619fc7cdc39e5ae69039a1dc8ed0e4c320259f087
+ 097ac4f73ad81874104c2434e4dbcc2189b4c04e84679aa0cebf6de5b9aaeaeb
+ 637d38734553ab5b34eedd8ea37a8fdfa8adfa3bd14bedd6d954c47433358f07
+ dc16702eb15487ff3d0260a76e7a2e380b1ce34a2ced3af534a95cf89d102f39
+ e958945f641704fe98d7d33bfe964c7d2201e9bf2c5fb41f069dc6f99ad98646
+ 0efd6494206fea2dddd277dd83da76330cb9b8c0c8af7b4dc653364684619fd7
+ c6f4fe5214c68705ce7e9056d754b406c4b1b2ec3e8fb4bdb41c9deb8f350e26
+ 769216e31c20f6392530675b5239d623b12c96ee8878655b35e88971abaac5a0
+ 9346ce183008820bde21193aa265b848debe31fa3dffefc93aa51074db59d0f5
+ 61f8ba65d749251d28b7cde2603e191de6539a6987b13007ecea95d2d63aca75
+ 3855bac6ed00aff5020368d0f22ae4a93404257705518af05922caeca29965f1
+ d3d02d9563b69932b2e93e3a18abe4c397bd570807a86a7a4f8d03b7a1205335
+ b1595b7af8a37cea67537939b5feb85e00baebcc8f3ea15b10d6356fb45e6c46
+ b707c058e68c72a7a866aa518326e90dacc23b5931a028cebb973cdbee7a3f3b
+ 5c797e0d19dc0dcbc4d57ecbb1e1f32103018ea337dac2c4600fce749341b810
+ 5971b7e08e0c6b5555023b1f7ab4733d97b51751e2c4f66d725c3cb1e8ed5686
+ b31dc719ad0b53fc947e549a24abb7c5ba93414e06cbfc0116680317ffbe8158
+ 10e4f5fa60e243d6ef6d17f475c54af19e9bb54f0fbea53a75cbec555454a060
+ 7d17052bc422f8ad2ecbaa0695eba9e6415f569977b5920e714913f5acc97f86
+ 29c513af75dd0bf67352218195c3deb0ee0a5e3ff73bcde8e31506dc7b127fe5
+ 945b61d3fc50079b3951f2bc9c2212b3d729332364ae5b7760d323d77b7f47db
+ 0739506295fbd9a106cfaafcd98c6fd2c81014f96250cb97ac1b28b535c1aa2e
+ c1846c2e965db37400a96038ec79830e4d5825f4ca6a09e33459c3395f561849
+ bee2291dd0be4330b669d626d8ef2af1c88a436ea5016187a8a7c27450bb5cd3
+ 8d5278bbac28908438d9b59f838d405c0bc10e2570893e26987f64739dd11dab
+ 69a2b77f1da6b4bb8dff86402b797c0feeaef843a476367b4de05920e1e68d2b
+ c5f9d6968046482de288e06cc1a80794a54e01b59f02d2c3c2cfd830bb7515da
+ 4dd58e93bac7d0b255593d79b99f506f8e371caa52840bcb386a3ec9683f37ae
+ 8e0ff1cbd05f15060803ff6460fbfdcb4d57c74d677dc5d4c8e398470c574640
+ 16d4644b172445d7cccd86d524ae985b0943d12a124d3245b4a4026a216d32b3
+ f2b580f2b711de7a6df61fd43ada3cbd30da5ede13e11d8aa7e718bbd7df31a2
+ e1f3bec3febd1118c2d376b6d9667f728c7e186c2bb9196f08c1fe28f969d10e
+ 2011a049af667b58632deacec3775b35a63da6a9c04bb07a39e114baabbfe542
+ 3bef2c028cc2d516cd36e533318c8be931c4a84b67904b2f31bc87188d8ff398
+ ed40c00d0c6b09187fc1f4644e78de43f76b7b2cd6c3c0db149055f42549a786
+ 28216ffc094f68ad3a95717dce6b2f96153ac093020f47b9575d84dc710cd84c
+ 02bef3b852e4a9058a3a6e7b0d9789252477daf1c9848ded24494de1b9ab2333
+ a757f7f69fb37e377606a92307cf95db6f71aac9570b9d58513f8b1592b7dbeb
+ 085a830ad038b4f845f236cf48c8887c1ec2be73833f6b00f049ae313e353969
+ be1dda5cc372857ba670f966ac357b5776e014ed86f438ca019749194bf69ea8
+ 0c1c223dd326883ea96640f04e13bd77c2868addf4f10b6972c5e10db2bb2465"
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 716d932356b..2d08c0e3bb1 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=82.0.3
+version=82.0.2
 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=4df40aecf4b71107c4816db585bcd425f093123f29d8563bc2443a8659058691
+checksum=8851cae2df9923844c3dc97a4f77f6f3c86cc6f298b888b38949fbf74fcf2ca9
 
 lib32disabled=yes
 
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index d6c8214cfb4..4f007738c3e 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.1.5
+version=2.1.3
 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=b539b7c65a650b56f01cd60a4e83c6125c217c5a63c0c214ef6274894a677d00
+checksum=645fbfd7c04543c6d3bf415eab8250527813b8dc8e6d6972dbcc8cb525e1d409
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"
diff --git a/srcpkgs/fmit/template b/srcpkgs/fmit/template
index 8750a40db14..1071c86f92e 100644
--- a/srcpkgs/fmit/template
+++ b/srcpkgs/fmit/template
@@ -1,6 +1,6 @@
 # Template file for 'fmit'
 pkgname=fmit
-version=1.2.14
+version=1.2.13
 revision=1
 build_style=qmake
 configure_args="CONFIG+=acs_qt CONFIG+=$(vopt_if alsa acs_alsa)
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://gillesdegottex.github.io/fmit/"
 distfiles="https://github.com/gillesdegottex/fmit/archive/v${version}.tar.gz"
-checksum=8dc123c84c19d6a9a62b303015255718705d5b0b8448a330d3815dd7f9688b02
+checksum=ce36e612c936ce12a586a4bf37e921789f73715eebb124d7c30dbda87bc76296
 
 build_options="alsa jack portaudio"
 build_options_default="alsa jack portaudio"
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 89c0cf5ea24..18504e4503f 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'fontconfig'
 pkgname=fontconfig
 version=2.13.1
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
 hostmakedepends="gperf pkg-config"
@@ -42,6 +42,7 @@ fontconfig-devel_package() {
 
 fontconfig-doc_package() {
 	short_desc+=" - documentation"
+	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc
 	}
diff --git a/srcpkgs/fontforge/patches/sys_select_h.patch b/srcpkgs/fontforge/patches/sys_select_h.patch
new file mode 100644
index 00000000000..1217c221bcc
--- /dev/null
+++ b/srcpkgs/fontforge/patches/sys_select_h.patch
@@ -0,0 +1,11 @@
+--- gdraw/gdraw.c	2019-08-01 08:28:36.000000000 +0000
++++ -	2019-08-02 16:37:08.648486270 +0000
+@@ -32,7 +32,7 @@
+ #include "gkeysym.h"
+ #include "ustring.h"
+ 
+-#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__
++#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ || __linux__
+ #  include <sys/select.h>
+ #endif
+ 
diff --git a/srcpkgs/fontforge/template b/srcpkgs/fontforge/template
index 1f1e377855d..3e97703b4f3 100644
--- a/srcpkgs/fontforge/template
+++ b/srcpkgs/fontforge/template
@@ -1,7 +1,7 @@
 # Template file for 'fontforge'
 pkgname=fontforge
-version=20201107
-revision=1
+version=20200314
+revision=3
 build_style=cmake
 hostmakedepends="automake ca-certificates gettext libltdl-devel libtool m4
  pkg-config python3"
@@ -16,7 +16,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://fontforge.github.io/en-US/"
 distfiles="https://github.com/fontforge/fontforge/archive/${version}.tar.gz"
-checksum=274f8c8cbd7b6a1c77d2a1c03d4d6cd3c9319db62be8b8c88fabbf597f7e863c
+checksum="ad0eb017379c6f7489aa8e2d7c160f19140d1ac6351f20df1d9857d9428efcf2
+ 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3"
 
 post_extract() {
 	# Disable unused #include <execinfo.h>
diff --git a/srcpkgs/fonts-croscore-ttf/template b/srcpkgs/fonts-croscore-ttf/template
index 8072e5a0557..2014d2fda6e 100644
--- a/srcpkgs/fonts-croscore-ttf/template
+++ b/srcpkgs/fonts-croscore-ttf/template
@@ -1,16 +1,17 @@
 # Template file for 'fonts-croscore-ttf'
 pkgname=fonts-croscore-ttf
 version=1.31.0
-revision=3
+revision=2
+archs=noarch
 wrksrc="croscorefonts-${version}"
 depends="font-util xbps-triggers"
+font_dirs="/usr/share/fonts/TTF"
 short_desc="TrueType fonts Arimo, Cousine, Tinos and SymbolNeu from Google"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://www.google.com/fonts/"
 distfiles="http://gsdview.appspot.com/chromeos-localmirror/distfiles/croscorefonts-${version}.tar.bz2"
 checksum=672c3487883ec1ef83d9254240d4327b014212abc823d06d15816095867315e1
-font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
 	vmkdir usr/share/fonts/TTF
diff --git a/srcpkgs/fonts-droid-ttf/template b/srcpkgs/fonts-droid-ttf/template
index f93c9b65cff..cae1c2979c2 100644
--- a/srcpkgs/fonts-droid-ttf/template
+++ b/srcpkgs/fonts-droid-ttf/template
@@ -1,10 +1,13 @@
 # Template file for 'fonts-droid-ttf'
 pkgname=fonts-droid-ttf
 version=20150613
-revision=2
+revision=1
+archs=noarch
 _githash=f5de525ee3547b8a69a21aec1e1a3175bc06f442
 create_wrksrc=yes
 depends="font-util"
+font_dirs="/usr/share/fonts/TTF"
+conflicts="google-fonts-ttf"
 short_desc="General-purpose Android fonts (CJK support)"
 maintainer="travankor <travankor@tuta.io>"
 license="Apache-2.0"
@@ -12,8 +15,6 @@ homepage="http://www.droidfonts.com/droidfonts/"
 changelog="https://android.googlesource.com/platform/frameworks/base/+log/master/data/fonts"
 distfiles="https://android.googlesource.com/platform/frameworks/base/+archive/${_githash}/data/fonts.tar.gz"
 checksum=@722c954d839cc131c17161956c5117624ceeea3f90e01d4d8ad3d38f374000cc
-conflicts="google-fonts-ttf"
-font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
 	vmkdir usr/share/fonts/TTF
diff --git a/srcpkgs/fonts-nanum-ttf/template b/srcpkgs/fonts-nanum-ttf/template
index 3bba3856b17..6a2e826673d 100644
--- a/srcpkgs/fonts-nanum-ttf/template
+++ b/srcpkgs/fonts-nanum-ttf/template
@@ -1,7 +1,8 @@
 # Template file for 'fonts-nanum-ttf'
 pkgname=fonts-nanum-ttf
 version=20180306
-revision=2
+revision=1
+archs=noarch
 wrksrc=${pkgname%-*}-${version}
 depends="font-util"
 short_desc="Nanum Korean fonts"
diff --git a/srcpkgs/fonts-roboto-ttf/template b/srcpkgs/fonts-roboto-ttf/template
index 7c0f6b0edc5..2a268ab3c74 100644
--- a/srcpkgs/fonts-roboto-ttf/template
+++ b/srcpkgs/fonts-roboto-ttf/template
@@ -1,17 +1,18 @@
 # Template file for 'fonts-roboto-ttf'
 pkgname=fonts-roboto-ttf
 version=2.138
-revision=2
+revision=1
+archs=noarch
 wrksrc=roboto-${version}
 depends="font-util"
+font_dirs="/usr/share/fonts/TTF"
+conflicts=google-fonts-ttf
 short_desc="Google's signature family of fonts"
 maintainer="travankor <travankor@tuta.io>"
 license="Apache-2.0"
 homepage="https://fonts.google.com/specimen/Roboto"
 distfiles="https://github.com/google/roboto/archive/v${version}.tar.gz"
 checksum=5427a734ba778333956093f85f5a67b7134ea925ef9dea236a2c5bd0d200341b
-font_dirs="/usr/share/fonts/TTF"
-conflicts=google-fonts-ttf
 
 do_install() {
 	vmkdir usr/share/fonts/TTF
diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index 21ec1c7b585..0e82f39b3e6 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.5.3
+version=1.5.2
 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=cf14050281cebb1e2e3f077b47b5800e0c70aca02c6e7350940d77a2c46af1c7
+checksum=e6103117bc77627dd5ea7a3f79324e21ae6a65d31100fb4d09b09528a8cb3846
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index b2aff4b4106..5e2272558e6 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
 # Template file for 'fotoxx'
 pkgname=fotoxx
-version=20.19
+version=20.11
 revision=1
 wrksrc=fotoxx
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
 distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
-checksum=4c9216d4612641151ca75e3f6fd74521a8dcfbb0a14d765b73d2ff62eed37a3e
+checksum=c01567e9085d713acfe724702757e6843ef66d27f41faf5d9679366df65ddddd
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12"
 
diff --git a/srcpkgs/freecell-solver/template b/srcpkgs/freecell-solver/template
index c0c2d821f69..475e1dbd82a 100644
--- a/srcpkgs/freecell-solver/template
+++ b/srcpkgs/freecell-solver/template
@@ -1,6 +1,6 @@
 # Template file for 'freecell-solver'
 pkgname=freecell-solver
-version=6.2.0
+version=6.0.1
 revision=1
 build_style=cmake
 configure_args="-DFCS_WITH_TEST_SUITE=OFF"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://fc-solve.shlomifish.org/"
 changelog="https://fc-solve.shlomifish.org/docs/distro/NEWS.html"
 distfiles="https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-${version}.tar.xz"
-checksum=2267758cc00ec7e7f0c47e61f398032afb4bb5386d1e54d5164ca815547f7423
+checksum=9f1a4c6d5c8ac54c6619b3b988efb5562d460cd048d33345e52a0c849fd0d9df
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
diff --git a/srcpkgs/freefont-ttf/template b/srcpkgs/freefont-ttf/template
index dca87f59871..ec248d2f8c7 100644
--- a/srcpkgs/freefont-ttf/template
+++ b/srcpkgs/freefont-ttf/template
@@ -1,7 +1,8 @@
 # Template file for 'freefont-ttf'
 pkgname=freefont-ttf
 version=20120503
-revision=8
+revision=7
+archs=noarch
 wrksrc="freefont-${version}"
 hostmakedepends="unzip"
 depends="font-util xbps-triggers>=0.58"
diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template
index ca1cc938995..5d4ed842e47 100644
--- a/srcpkgs/fwup/template
+++ b/srcpkgs/fwup/template
@@ -1,6 +1,6 @@
 # Template file for 'fwup'
 pkgname=fwup
-version=1.8.2
+version=1.8.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 changelog="https://github.com/fhunleth/fwup/raw/main/CHANGELOG.md"
 homepage="https://github.com/fhunleth/fwup"
 distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz"
-checksum=dcf1e44fab2279d2d77cf1bb3474c89c6572a6e2c06fee54d3baec201e60f6cb
+checksum=afeef2b000c2eb7065e679270e41cd5f66e4e356b7002ca84a099e65811e4ce4
 
 if [ -z "$CROSS_BUILD" ]; then
 	hostmakedepends+=" help2man"
diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 84c95ee7e47..b7f0cc5ea11 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,7 +1,7 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.5.1
-revision=1
+version=1.4.6
+revision=2
 build_style=meson
 build_helper="gir"
 # tests require unpackaged umockdev
@@ -9,47 +9,42 @@ configure_args="-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-libdir=${XBPS_CROSS_BASE}/usr/lib -Delogind=true"
+ -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib -Delogind=true
+ $(vopt_bool uefi plugin_uefi) $(vopt_bool uefi plugin_redfish)
+ $(vopt_bool dell plugin_dell)"
 hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config gcab
- vala glib-devel polkit gettext gtk-doc"
+ vala glib-devel polkit gettext gtk-doc $(vopt_if uefi efivar)"
 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"
+ python3-Pillow elogind-devel tpm2-tss-devel libjcat-devel
+ $(vopt_if uefi 'libefivar-devel gnu-efi-libs') $(vopt_if dell libsmbios-devel)"
 depends="udisks2"
 conf_files="
- /etc/fwupd/*.conf
+ /etc/fwupd/daemon.conf
  /etc/fwupd/remotes.d/*.conf"
 short_desc="Daemon to allow session software to update firmware"
 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=16e59ea1ce6e109246f86a2932cc84d2e06ed836d62dde1412493a5d26109477
+checksum=2e70a4221e6ca09dae768af25f19fddcdbdafb9f7d7984d19e8686846fa4420a
 replaces="fwupdate>=0"
 
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*|arm*|aarch64*) _have_uefi=yes;;
-esac
+build_options="uefi dell"
+desc_option_uefi="Enable support for UEFI firmware update"
+desc_option_dell="Enable support for Dell specific firmware update"
 
+# no efi on non-efi platforms
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*) ;;
-	*) configure_args+=" -Dplugin_msr=false";;
+	x86_64*|i686*)
+		build_options_default="uefi dell"
+		;;
+	aarch64*|arm*)
+		build_options_default="uefi"
+		;;
 esac
 
-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
 	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
 
@@ -63,6 +58,8 @@ 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
+	# Replace host objcopy with the cross one
+	vsed -i -e "s|command -v objcopy|command -v ${XBPS_CROSS_BASE}/usr/bin/objcopy|" plugins/uefi/efi/generate_binary.sh
 }
 
 post_install() {
diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index be145bf6530..eb4ffda7412 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.24.3
+version=0.24.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=5643a21851b7f495cd33d42839f46f0e975b162aa7aa5f2079f8c25764be112a
+checksum=35e8f57319d4b0ad3297251f4487b15203d288a081c1019d67f80758264b9d45
 
 post_install() {
 	cd ${wrksrc}
diff --git a/srcpkgs/gcc/patches/ppc64-pure64.patch b/srcpkgs/gcc/patches/ppc64-pure64.patch
new file mode 100644
index 00000000000..1ab0f8ee08c
--- /dev/null
+++ b/srcpkgs/gcc/patches/ppc64-pure64.patch
@@ -0,0 +1,57 @@
+--- gcc/config/rs6000/t-linux
++++ gcc/config/rs6000/t-linux
+@@ -2,7 +2,8 @@
+ # or soft-float.
+ ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
+ ifneq (,$(findstring powerpc64,$(target)))
+-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
++MULTILIB_OSDIRNAMES := m64=../lib
++MULTILIB_OSDIRNAMES += m32=../lib32
+ else
+ ifneq (,$(findstring spe,$(target)))
+ MULTIARCH_DIRNAME := powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1)
+@@ -14,7 +15,8 @@
+ MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
+ endif
+ ifneq (,$(findstring powerpc64le,$(target)))
+-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
++MULTILIB_OSDIRNAMES := m64=../lib
++MULTILIB_OSDIRNAMES += m32=../lib32
+ endif
+ endif
+ 
+--- gcc/config/rs6000/t-linux64
++++ gcc/config/rs6000/t-linux64
+@@ -28,8 +28,8 @@
+ MULTILIB_OPTIONS    := m64/m32
+ MULTILIB_DIRNAMES   := 64 32
+ MULTILIB_EXTRA_OPTS := 
+-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
++MULTILIB_OSDIRNAMES := m64=../lib
++MULTILIB_OSDIRNAMES += m32=../lib32
+ 
+ rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
+ 	$(COMPILE) $<
+--- gcc/config/rs6000/t-linux64bele
++++ gcc/config/rs6000/t-linux64bele
+@@ -2,6 +2,6 @@
+ 
+ MULTILIB_OPTIONS    += mlittle
+ MULTILIB_DIRNAMES   += le
+-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
+-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+ MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
+--- gcc/config/rs6000/t-linux64lebe
++++ gcc/config/rs6000/t-linux64lebe
+@@ -2,6 +2,6 @@
+ 
+ MULTILIB_OPTIONS    += mbig
+ MULTILIB_DIRNAMES   += be
+-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
+-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
++MULTILIB_OSDIRNAMES := m64=../lib
++MULTILIB_OSDIRNAMES += m32=../lib32
+ MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
diff --git a/srcpkgs/gcc/patches/use-pure-64bit-configs.patch b/srcpkgs/gcc/patches/use-pure-64bit-configs.patch
deleted file mode 100644
index 3602de66e4f..00000000000
--- a/srcpkgs/gcc/patches/use-pure-64bit-configs.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From e0453ba5a738647f84a6dac9d8551fe8dbfdbece Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun, 8 Nov 2020 03:58:09 +0100
-Subject: [PATCH] use pure 64-bit config
-
-avoid using lib64 dirs
-
-when adding a new platform, expand this patch
----
- gcc/config/aarch64/t-aarch64-linux | 2 +-
- gcc/config/i386/linux64.h          | 2 +-
- gcc/config/i386/t-linux64          | 4 ++--
- gcc/config/mips/linux.h            | 4 ++--
- gcc/config/mips/mips.h             | 8 ++++----
- gcc/config/mips/t-linux64          | 6 +++---
- gcc/config/rs6000/linux64.h        | 8 ++++----
- gcc/config/rs6000/t-linux          | 6 ++++--
- gcc/config/rs6000/t-linux64        | 4 ++--
- gcc/config/rs6000/t-linux64bele    | 4 ++--
- gcc/config/rs6000/t-linux64lebe    | 4 ++--
- gcc/config/s390/t-linux64          | 4 ++--
- 12 files changed, 29 insertions(+), 27 deletions(-)
-
-diff --git gcc/config/aarch64/t-aarch64-linux gcc/config/aarch64/t-aarch64-linux
-index 5ad670ba2..e10d58a6c 100644
---- gcc/config/aarch64/t-aarch64-linux
-+++ gcc/config/aarch64/t-aarch64-linux
-@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
- LIB1ASMFUNCS = _aarch64_sync_cache_range
- 
- AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
--MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
- MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
- 
- MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-diff --git gcc/config/i386/linux64.h gcc/config/i386/linux64.h
-index c08221c42..6f18c0214 100644
---- gcc/config/i386/linux64.h
-+++ gcc/config/i386/linux64.h
-@@ -28,7 +28,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
- 
- #undef MUSL_DYNAMIC_LINKER32
-diff --git gcc/config/i386/t-linux64 gcc/config/i386/t-linux64
-index c686ab2f0..89c183019 100644
---- gcc/config/i386/t-linux64
-+++ gcc/config/i386/t-linux64
-@@ -33,6 +33,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
-diff --git gcc/config/mips/linux.h gcc/config/mips/linux.h
-index 6f79ac9c0..bddfacd84 100644
---- gcc/config/mips/linux.h
-+++ gcc/config/mips/linux.h
-@@ -24,9 +24,9 @@ along with GCC; see the file COPYING3.  If not see
- #define GLIBC_DYNAMIC_LINKER32 \
-   "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
- #define GLIBC_DYNAMIC_LINKER64 \
--  "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}"
-+  "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
- #define GLIBC_DYNAMIC_LINKERN32 \
--  "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}"
-+  "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
- 
- #undef UCLIBC_DYNAMIC_LINKER32
- #define UCLIBC_DYNAMIC_LINKER32 \
-diff --git gcc/config/mips/mips.h gcc/config/mips/mips.h
-index 953d82e85..3f09f21bc 100644
---- gcc/config/mips/mips.h
-+++ gcc/config/mips/mips.h
-@@ -3447,11 +3447,11 @@ struct GTY(())  machine_function {
- /* If we are *not* using multilibs and the default ABI is not ABI_32 we
-    need to change these from /lib and /usr/lib.  */
- #if MIPS_ABI_DEFAULT == ABI_N32
--#define STANDARD_STARTFILE_PREFIX_1 "/lib32/"
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib32/"
-+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
- #elif MIPS_ABI_DEFAULT == ABI_64
--#define STANDARD_STARTFILE_PREFIX_1 "/lib64/"
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib64/"
-+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
- #endif
- 
- /* Load store bonding is not supported by micromips and fix_24k.  The
-diff --git gcc/config/mips/t-linux64 gcc/config/mips/t-linux64
-index 3a2ff700d..3b253aeb9 100644
---- gcc/config/mips/t-linux64
-+++ gcc/config/mips/t-linux64
-@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
- MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
- MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
- MULTILIB_OSDIRNAMES = \
--	../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
--	../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
--	../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
-+	../lib \
-+	../lib32 \
-+	../lib
-diff --git gcc/config/rs6000/linux64.h gcc/config/rs6000/linux64.h
-index 9946d3fed..fcdf0d265 100644
---- gcc/config/rs6000/linux64.h
-+++ gcc/config/rs6000/linux64.h
-@@ -427,12 +427,12 @@ extern int dot_symbols;
- 
- #ifdef LINUX64_DEFAULT_ABI_ELFv2
- #define GLIBC_DYNAMIC_LINKER64 \
--"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
--":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
-+"%{mabi=elfv1:%(dynamic_linker_prefix)/lib/ld64.so.1;" \
-+":%(dynamic_linker_prefix)/lib/ld64.so.2}"
- #else
- #define GLIBC_DYNAMIC_LINKER64 \
--"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
--":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
-+"%{mabi=elfv2:%(dynamic_linker_prefix)/lib/ld64.so.2;" \
-+":%(dynamic_linker_prefix)/lib/ld64.so.1}"
- #endif
- 
- #undef MUSL_DYNAMIC_LINKER32
-diff --git gcc/config/rs6000/t-linux gcc/config/rs6000/t-linux
-index aeb7440c4..ab14c455d 100644
---- gcc/config/rs6000/t-linux
-+++ gcc/config/rs6000/t-linux
-@@ -2,7 +2,8 @@
- # or soft-float.
- ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
- ifneq (,$(findstring powerpc64,$(target)))
--MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- else
- MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
- endif
-@@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target)))
- MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
- endif
- ifneq (,$(findstring powerpc64le,$(target)))
--MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- endif
- endif
- 
-diff --git gcc/config/rs6000/t-linux64 gcc/config/rs6000/t-linux64
-index f3c6e2be1..f4df2377d 100644
---- gcc/config/rs6000/t-linux64
-+++ gcc/config/rs6000/t-linux64
-@@ -28,8 +28,8 @@
- MULTILIB_OPTIONS    := m64/m32
- MULTILIB_DIRNAMES   := 64 32
- MULTILIB_EXTRA_OPTS := 
--MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
--MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- 
- rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
- 	$(COMPILE) $<
-diff --git gcc/config/rs6000/t-linux64bele gcc/config/rs6000/t-linux64bele
-index 97c1ee6fb..08d72639c 100644
---- gcc/config/rs6000/t-linux64bele
-+++ gcc/config/rs6000/t-linux64bele
-@@ -2,6 +2,6 @@
- 
- MULTILIB_OPTIONS    += mlittle
- MULTILIB_DIRNAMES   += le
--MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
--MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-diff --git gcc/config/rs6000/t-linux64lebe gcc/config/rs6000/t-linux64lebe
-index 2e63bdb9f..c6e1c5db6 100644
---- gcc/config/rs6000/t-linux64lebe
-+++ gcc/config/rs6000/t-linux64lebe
-@@ -2,6 +2,6 @@
- 
- MULTILIB_OPTIONS    += mbig
- MULTILIB_DIRNAMES   += be
--MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
--MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-diff --git gcc/config/s390/t-linux64 gcc/config/s390/t-linux64
-index cc6ab3670..7f498ee1c 100644
---- gcc/config/s390/t-linux64
-+++ gcc/config/s390/t-linux64
-@@ -7,5 +7,5 @@
- 
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
--MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
--- 
-2.29.2
-
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 667818d2c1a..f4e2f949933 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -191,21 +191,37 @@ do_configure() {
 		armv5*) _args+=" --with-arch=armv5te --with-float=soft";;
 		armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";;
 		armv7l*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";;
-		aarch64*) _args+=" --with-arch=armv8-a";;
-		ppc64le*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpcle-linux";;
-		ppc64*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpc-linux";;
-		ppc*) _args+=" --enable-secureplt";;
-	esac
-
-	# on ppc64le-musl and all big endian ppc64
-	case "$XBPS_TARGET_MACHINE" in
-		ppc64le) ;;
-		ppc64*) _args+=" --disable-libquadmath" ;;
+		aarch64*) # use lib not lib64 by default
+			_args+=" --with-arch=armv8-a"
+			sed -i '/m64=/s/lib64/lib/' gcc/config/aarch64/t-aarch64-linux
+			;;
+		ppc) _args+=" --target=powerpc-linux-gnu --enable-secureplt";;
+		ppc-musl) _args+=" --target=powerpc-linux-musl --enable-secureplt --disable-decimal-float";;
+		ppcle) _args+=" --target=powerpcle-linux-gnu --enable-secureplt";;
+		ppcle-musl) _args+=" --target=powerpcle-linux-musl --enable-secureplt --disable-decimal-float";;
+		ppc64le*) # use lib not lib64 by default
+			_args+=" --target=${_triplet} --with-abi=elfv2 --enable-secureplt --enable-targets=powerpcle-linux"
+			sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
+			;;
+		ppc64*) # use lib not lib64 by default
+			_args+=" --target=${_triplet} --with-abi=elfv2 --enable-secureplt --enable-targets=powerpc-linux"
+			sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h
+			;;
+		x86_64*) # use lib not lib64 by default
+			sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+			sed -i 's/lib64/lib/' gcc/config/i386/linux64.h
+			;;
 	esac
 
 	# fix: unknown long double size, cannot define BFP_FMT
 	case "$XBPS_TARGET_MACHINE" in
-		ppc*-musl) _args+=" --disable-decimal-float";;
+		ppc64le-musl|ppc64-musl)
+			_args+=" --enable-decimal-float=no --disable-libquadmath"
+		;;
+		ppc64)
+			_args+=" --disable-libquadmath"
+		;;
+		*) ;;
 	esac
 
 	if [ -z "$CHROOT_READY" -o -n "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e9101168195..786938af35c 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"
diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index 6ce6741dd64..312651db44f 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,6 +1,6 @@
 # Template file for 'gifski'
 pkgname=gifski
-version=1.2.3
+version=1.2.2
 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=52d87342125220a5d7552097adcfa43c12455709c32b4a52b27d56523a94de67
+checksum=e5830f18b38fb333f1d89af99d651c173c816d71f764e703460a38d241ce8df4
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index fa73d41afba..63468249255 100644
--- a/srcpkgs/git-absorb/template
+++ b/srcpkgs/git-absorb/template
@@ -1,6 +1,6 @@
 # Template file for 'git-absorb'
 pkgname=git-absorb
-version=0.6.6
+version=0.6.5
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/tummychow/git-absorb"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=955069cc70a34816e6f4b6a6bd1892cfc0ae3d83d053232293366eb65599af2f
+checksum=0c8bf3520209f6d292515ccaaa4b91d7d5e18bd8abe41fad049b5a2797386892
 
 post_install() {
 	vlicense LICENSE.md
diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index e6e7defeab0..2754ba6be4f 100644
--- a/srcpkgs/git-cola/template
+++ b/srcpkgs/git-cola/template
@@ -1,7 +1,7 @@
 # Template file for 'git-cola'
 pkgname=git-cola
-version=3.8
-revision=1
+version=3.7
+revision=2
 build_style=python3-module
 pycompile_dirs="usr/share/git-cola/lib"
 hostmakedepends="python3"
@@ -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=9a1427b05c107ec8337881ed68bb450ac040a08880f91dcb770588f755d6fd1b
diff --git a/srcpkgs/git-extras/template b/srcpkgs/git-extras/template
index 8aa97990db5..e84f4cd9817 100644
--- a/srcpkgs/git-extras/template
+++ b/srcpkgs/git-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'git-extras'
 pkgname=git-extras
-version=6.1.0
-revision=1
+version=6.0.0
+revision=2
 build_style=gnu-makefile
 depends="bash git"
 short_desc="Little git extras"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tj/git-extras"
 distfiles="https://github.com/tj/git-extras/archive/${version}.tar.gz"
-checksum=7be0b15ee803d76d2c2e8036f5d9db6677f2232bb8d2c4976691ff7ae026a22f
+checksum=a823c12e4bf74e2f07ee80e597500e5f5120dcd8fa345e67e2c03544fd706ffe
 
 post_patch() {
 	vsed -i 's|$(SYSCONFDIR)/bash_completion.d|/usr/share/bash-completion/completions|' Makefile
diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template
index 8a5c942dbf4..1263d4cf480 100644
--- a/srcpkgs/glslViewer/template
+++ b/srcpkgs/glslViewer/template
@@ -1,6 +1,6 @@
 # Template file for 'glslViewer'
 pkgname=glslViewer
-version=1.6.8
+version=1.6.0
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://patriciogonzalezvivo.com/2015/glslViewer/"
 distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version}.tar.gz"
-checksum=3792984457c9487cd1f87374b7698f3b66f4480b3eeac7d940a2ecf9e74dee3e
+checksum=9235fefc41130ad4088c50c76a1f246069fe4986e42df972e352549d16d935b7
 
 pre_build() {
 	# can obscure real errors
diff --git a/srcpkgs/gnome-2048/template b/srcpkgs/gnome-2048/template
index 9bc161700a6..b39ba672e20 100644
--- a/srcpkgs/gnome-2048/template
+++ b/srcpkgs/gnome-2048/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-2048'
 pkgname=gnome-2048
-version=3.38.0
+version=3.36.4
 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://wiki.gnome.org/Apps/2048"
 distfiles="${GNOME_SITE}/gnome-2048/${version%.*}/gnome-2048-${version}.tar.xz"
-checksum=4c257f9799085263070a88acf5fbc8f7aae075ac8d56dca3e63dd982607123c9
+checksum=1e1762a66daf1c2dee908c128eebb4350638b37fc11fc1f4f843b28aee17e153
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708e..aa4ef940136 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=3.37.2
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=1d3469d5e90f23d129d1276b2f9b885459f3d7b43054cd09759b85ac76c918b4
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 4aab60c6b74..037497ccb55 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=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -18,7 +18,7 @@ depends="
  evolution-data-server>=3.38.0
  folks>=0.14.0
  font-adobe-source-code-pro>=2.030R
- gcr>=3.38.0
+ gcr>=3.36.0
  gdm>=3.38.0
  geocode-glib>=3.26.0
  gfbgraph>=0.2.4
@@ -34,7 +34,7 @@ depends="
  gnome-getting-started-docs>=3.36.2
  gnome-initial-setup>=3.38.0
  gnome-keyring>=3.36.0
- gnome-online-accounts>=3.38.0
+ gnome-online-accounts>=3.37.90
  gnome-online-miners>=3.34.0
  gnome-session>=3.38.0
  gnome-settings-daemon>=3.38.0
@@ -47,7 +47,7 @@ depends="
  gvfs>=1.46.0
  mutter>=3.38.0
  nautilus>=3.38.0
- sushi>=3.38.0
+ sushi>=3.34.0
  tracker3>=3.0.0
  yelp>=3.38.0
  xdg-desktop-portal-gtk>=1.8.0
diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template
index 7a23c7e70ee..39d656f16db 100644
--- a/srcpkgs/gnome-nibbles/template
+++ b/srcpkgs/gnome-nibbles/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-nibbles'
 pkgname=gnome-nibbles
-version=3.38.2
+version=3.38.1
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel intltool itstool pkg-config vala"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 changelog="https://github.com/GNOME/gnome-nibbles/raw/gnome-3-24/NEWS"
 homepage="https://wiki.gnome.org/Apps/Nibbles"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=457a64b1c88e2d8d0143c452ffd01f0300d7d3005802954ef5abf9c896b353d9
+checksum=7387e3ada8449b108fb86a1e42bf4c495f0441859691990500ea07a5a198d524
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index d44450e043f..29980d43424 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.38.0
+version=3.37.90
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -20,7 +20,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3760ea78729b3038dda0c416b57bc2cbaafcc619eec6c5109654d747fad2418c
+checksum=9f6982c896e6235a2e85b8a497c7bf63a4a288b5678db40dc373515efbedb1bb
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34..24d9d2b9eb5 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.37.1
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=1d598fd68933e76018f2fb116a7871cbc0033c1f109bfbfe08a1ecb56067d152
 patch_args="-Np1"
 
 gnome-panel-devel_package() {
diff --git a/srcpkgs/gnome-photos/patches/tracker3.patch b/srcpkgs/gnome-photos/patches/tracker3.patch
index 6062fac2b26..406dca30fd4 100644
--- a/srcpkgs/gnome-photos/patches/tracker3.patch
+++ b/srcpkgs/gnome-photos/patches/tracker3.patch
@@ -1,7 +1,45 @@
-From 4673c40a7c006ccb6de203ec2b25ca39a74782d9 Mon Sep 17 00:00:00 2001
+From b4a8de1ef79c94c1c11b730787108f305c962e38 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Wed, 26 Aug 2020 01:57:46 +0200
+Subject: [PATCH 1/4] photos-tracker-controller: Label unit of timing
+ measurements
+
+Otherwise, it's not clear if these are timings or some kind of ID
+number.
+---
+ src/photos-tracker-controller.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/photos-tracker-controller.c b/src/photos-tracker-controller.c
+index a02db077..3a62cf2d 100644
+--- a/src/photos-tracker-controller.c
++++ b/src/photos-tracker-controller.c
+@@ -237,7 +237,7 @@ photos_tracker_controller_cursor_next (GObject *source_object, GAsyncResult *res
+     }
+ 
+   now = g_get_monotonic_time ();
+-  photos_debug (PHOTOS_DEBUG_TRACKER, "Query Cursor: %" G_GINT64_FORMAT, (now - priv->last_query_time) / 1000000);
++  photos_debug (PHOTOS_DEBUG_TRACKER, "Query Cursor: %" G_GINT64_FORMAT " seconds", (now - priv->last_query_time) / 1000000);
+ 
+   photos_item_manager_add_item_for_mode (PHOTOS_ITEM_MANAGER (priv->item_mngr),
+                                          PHOTOS_TRACKER_CONTROLLER_GET_CLASS (self)->base_item_type,
+@@ -346,7 +346,7 @@ photos_tracker_controller_set_query_status (PhotosTrackerController *self, gbool
+   else
+     {
+       photos_debug (PHOTOS_DEBUG_TRACKER,
+-                    "Query Elapsed: %" G_GINT64_FORMAT,
++                    "Query Elapsed: %" G_GINT64_FORMAT " seconds",
+                     (now - priv->last_query_time) / 1000000);
+       priv->last_query_time = 0;
+     }
+-- 
+GitLab
+
+
+From 7c98a884ba6a26795ea25a8780002ac101036887 Mon Sep 17 00:00:00 2001
 From: Sam Thursfield <sam@afuera.me.uk>
 Date: Wed, 27 May 2020 13:07:58 +0200
-Subject: [PATCH 1/3] Fix build failure due to undefined M_PI constant
+Subject: [PATCH 2/4] Fix build failure due to undefined M_PI constant
 
 The <math.h> header needs to be included.
 
@@ -11,10 +49,10 @@ Previously I suppose libtracker-sparql.h pulled this in.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/photos-utils.c b/src/photos-utils.c
-index 1d7be577..d659b47d 100644
+index 401f52ba..c638297b 100644
 --- a/src/photos-utils.c
 +++ b/src/photos-utils.c
-@@ -32,6 +32,7 @@
+@@ -30,6 +30,7 @@
  #include <glib.h>
  #include <tracker-sparql.h>
  #include <libgd/gd.h>
@@ -26,10 +64,10 @@ index 1d7be577..d659b47d 100644
 GitLab
 
 
-From 18f126a67a37d1f6efe546e42eef22ae15da7642 Mon Sep 17 00:00:00 2001
+From 0e4bd7bbc8056743a8ea07ab3713ad543c00d478 Mon Sep 17 00:00:00 2001
 From: Sam Thursfield <sam@afuera.me.uk>
 Date: Sun, 7 Jun 2020 21:53:20 +0200
-Subject: [PATCH 2/3] Generate queries using SPARQL templates
+Subject: [PATCH 3/4] Generate queries using SPARQL templates
 
 The code to generate SPARQL queries was split across many different
 source files, making it difficult to make big changes. Now the
@@ -193,7 +231,7 @@ index e768bca0..8a3415fc 100644
  
  G_END_DECLS
 diff --git a/src/photos-query-builder.c b/src/photos-query-builder.c
-index 2c52a130..5d9d8a5a 100644
+index 6b996811..e0735bde 100644
 --- a/src/photos-query-builder.c
 +++ b/src/photos-query-builder.c
 @@ -26,112 +26,76 @@
@@ -406,7 +444,7 @@ index 2c52a130..5d9d8a5a 100644
  
    return sparql;
  }
-@@ -234,12 +182,37 @@ photos_query_builder_collection_icon_query (PhotosSearchContextState *state, con
+@@ -231,12 +179,37 @@ photos_query_builder_collection_icon_query (PhotosSearchContextState *state, con
  PhotosQuery *
  photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
  {
@@ -1114,10 +1152,10 @@ index 00000000..4eb10b74
 GitLab
 
 
-From dbbb76f228bad33334e0574784c34efb7071f950 Mon Sep 17 00:00:00 2001
+From d61d440efe340bda4e195d640066fb29220d0cb5 Mon Sep 17 00:00:00 2001
 From: Sam Thursfield <sam@afuera.me.uk>
 Date: Sat, 23 May 2020 13:36:25 +0200
-Subject: [PATCH 3/3] Port to Tracker 3
+Subject: [PATCH 4/4] Port to Tracker 3
 
 Notable changes:
 
@@ -1140,13 +1178,13 @@ Closes https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/152
  ...e.Photos.Tracker3.Miner.Extract.service.in |   7 +
  ...ome.Photos.Tracker3.Miner.Files.service.in |   7 +
  data/tracker/org.gnome.Photos.domain.rule.in  |  20 +
- flatpak/org.gnome.Photos.json                 |  49 +-
+ flatpak/org.gnome.Photos.json                 |  55 +-
  meson.build                                   |   3 +-
  src/meson.build                               |  19 +-
  ...freedesktop.Tracker3.Miner.Files.Index.xml |  11 +
  src/org.freedesktop.Tracker3.Miner.xml        |  56 +++
- src/photos-application.c                      | 176 ++-----
- src/photos-base-item.c                        |  10 +
+ src/photos-application.c                      | 184 +++----
+ src/photos-base-item.c                        |  18 +-
  src/photos-indexing-notification.c            |  53 +-
  src/photos-item-manager.c                     |  69 +--
  src/photos-quarks.c                           |  20 +-
@@ -1171,7 +1209,7 @@ Closes https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/152
  src/queries/collections.sparql.template       |  20 +-
  src/queries/favorite-photos.sparql.template   |  20 +-
  src/queries/photos.sparql.template            |  22 +-
- 36 files changed, 736 insertions(+), 1142 deletions(-)
+ 36 files changed, 754 insertions(+), 1146 deletions(-)
  create mode 100644 data/tracker/meson.build
  create mode 100644 data/tracker/org.gnome.Photos.Tracker3.Miner.Extract.service.in
  create mode 100644 data/tracker/org.gnome.Photos.Tracker3.Miner.Files.service.in
@@ -1185,10 +1223,10 @@ Closes https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/152
  delete mode 100644 src/photos-tracker-resources.xml
 
 diff --git a/data/meson.build b/data/meson.build
-index f51a4511..9b528c96 100644
+index 7898b0cc..f0d85d4b 100644
 --- a/data/meson.build
 +++ b/data/meson.build
-@@ -83,3 +83,5 @@ install_data(
+@@ -54,3 +54,5 @@ install_data(
    photos_namespace.to_lower() + '.gschema.xml',
    install_dir: join_paths(photos_datadir, 'glib-2.0', 'schemas'),
  )
@@ -1286,7 +1324,7 @@ index 00000000..8f5fc4a1
 +# List of miners we expect to run in this domain.
 +Miners=Miner.Files;Miner.Extract
 diff --git a/flatpak/org.gnome.Photos.json b/flatpak/org.gnome.Photos.json
-index 4d3ac2a8..adfdaf34 100644
+index 5d16689c..adfdaf34 100644
 --- a/flatpak/org.gnome.Photos.json
 +++ b/flatpak/org.gnome.Photos.json
 @@ -7,7 +7,7 @@
@@ -1309,14 +1347,14 @@ index 4d3ac2a8..adfdaf34 100644
          "--talk-name=com.intel.dleyna-renderer",
          "--talk-name=org.gnome.ControlCenter",
          "--talk-name=org.gnome.SettingsDaemon",
-@@ -248,50 +248,22 @@
+@@ -248,56 +248,22 @@
                  }
              ]
          },
 -        {
 -            "name": "tracker",
 -            "buildsystem": "meson",
--            "cleanup": [ "/bin", "/etc", "/lib/girepository-1.0", "/share/dbus-1", "/share/gir-1.0" ],
+-            "cleanup": [ "/bin", "/etc", "/lib/girepository-1.0", "/libexec", "/share/dbus-1", "/share/gir-1.0" ],
 -            "config-opts": [ "-Dbash_completion=no", "-Ddocs=false", "-Dsystemd_user_services=no" ],
 -            "sources": [
 -                {
@@ -1341,13 +1379,19 @@ index 4d3ac2a8..adfdaf34 100644
              "name": "tracker-miners",
              "buildsystem": "meson",
 -            "cleanup": [ "/etc",
+-                         "/lib",
+-                         "/libexec",
 -                         "/share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service",
 -                         "/share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service",
 -                         "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Applications.service",
 -                         "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Extract.service",
 -                         "/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service",
+-                         "/share/tracker-miners",
+-                         "/share/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml",
 -                         "/share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml" ],
--            "config-opts": [ "-Dextract=true",
+-            "config-opts": [ "-Dextract=false",
+-                             "-Dgeneric_media_extractor=none",
+-                             "-Dminer_apps=false",
 +            "cleanup": [ "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service",
 +                         "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service",
 +                         "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service" ],
@@ -1366,7 +1410,7 @@ index 4d3ac2a8..adfdaf34 100644
                  }
              ]
          },
-@@ -303,7 +275,8 @@
+@@ -309,7 +275,8 @@
                  {
                      "type": "git",
                      "url": "https://gitlab.gnome.org/GNOME/gnome-photos.git",
@@ -1377,10 +1421,10 @@ index 4d3ac2a8..adfdaf34 100644
              ]
          }
 diff --git a/meson.build b/meson.build
-index ead63250..d20e1289 100644
+index 70816d24..1c6f2906 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -172,8 +172,7 @@ libgdata_dep = dependency('libgdata', version: '>= 0.15.2')
+@@ -172,8 +172,7 @@ libgdata_dep = dependency('libgdata', version: '>= 0.17.10')
  libgfgraph_dep = dependency('libgfbgraph-0.2', version: '>= 0.2.1')
  libjpeg_dep = dependency('libjpeg')
  libpng_dep = dependency('libpng16')
@@ -1389,7 +1433,7 @@ index ead63250..d20e1289 100644
 +tracker_sparql_dep = dependency('tracker-sparql-3.0')
  
  dbus_dep = dependency('dbus-1')
- dbus_services_dir = dbus_dep.get_pkgconfig_variable(
+ dbus_service_dir = dbus_dep.get_pkgconfig_variable(
 diff --git a/src/meson.build b/src/meson.build
 index b5b2759c..6b3b7f01 100644
 --- a/src/meson.build
@@ -1520,7 +1564,7 @@ index 00000000..6fe09c84
 +  </interface>
 +</node>
 diff --git a/src/photos-application.c b/src/photos-application.c
-index f7b4b56e..7d6758cd 100644
+index cb114fda..5fbbbef2 100644
 --- a/src/photos-application.c
 +++ b/src/photos-application.c
 @@ -36,7 +36,6 @@
@@ -1541,17 +1585,16 @@ index f7b4b56e..7d6758cd 100644
  #include "photos-utils.h"
  
  
-@@ -127,8 +127,7 @@ struct _PhotosApplication
+@@ -127,7 +127,7 @@ struct _PhotosApplication
    PhotosSearchProvider *search_provider;
    PhotosSelectionController *sel_cntrlr;
    PhotosThumbnailFactory *factory;
--  TrackerMinerManager *miner_manager;
 -  TrackerExtractPriority *extract_priority;
 +  TrackerMinerFilesIndex *miner_control_proxy;
    gboolean empty_results;
    gboolean main_window_deleted;
    guint create_miners_count;
-@@ -149,7 +148,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
+@@ -148,7 +148,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
  
  static void photos_application_search_context_iface_init (PhotosSearchContextInterface *iface);
  
@@ -1559,15 +1602,48 @@ index f7b4b56e..7d6758cd 100644
  G_DEFINE_TYPE_WITH_CODE (PhotosApplication, photos_application, GTK_TYPE_APPLICATION,
                           G_IMPLEMENT_INTERFACE (PHOTOS_TYPE_SEARCH_CONTEXT,
                                                  photos_application_search_context_iface_init));
-@@ -174,7 +172,6 @@ static const gchar *DESKTOP_KEY_PICTURE_OPTIONS = "picture-options";
- static const gchar *DESKTOP_KEY_COLOR_SHADING_TYPE = "color-shading-type";
- static const gchar *DESKTOP_KEY_PRIMARY_COLOR = "primary-color";
- static const gchar *DESKTOP_KEY_SECONDARY_COLOR = "secondary-color";
--static const gchar *MINER_FILES = "org.gnome.Photos.Tracker1.Miner.Files";
- 
- typedef struct _PhotosApplicationCreateData PhotosApplicationCreateData;
- typedef struct _PhotosApplicationImportData PhotosApplicationImportData;
-@@ -582,27 +579,6 @@ photos_application_actions_update (PhotosApplication *self)
+@@ -191,11 +190,11 @@ struct _PhotosApplicationCreateData
+ struct _PhotosApplicationImportData
+ {
+   PhotosApplication *application;
++  TrackerMinerFilesIndex *miner_control_proxy;
+   GFile *destination;
+   GFile *import_sub_dir;
+   GList *files;
+   PhotosBaseItem *collection;
+-  TrackerMinerManager *manager;
+   gchar *collection_urn;
+   gint64 ctime_latest;
+ };
+@@ -248,7 +247,7 @@ photos_application_create_data_free (PhotosApplicationCreateData *data)
+ 
+ static PhotosApplicationImportData *
+ photos_application_import_data_new (PhotosApplication *application,
+-                                    TrackerMinerManager *manager,
++                                    TrackerMinerFilesIndex *miner_control_proxy,
+                                     GList *files,
+                                     gint64 ctime_latest)
+ {
+@@ -257,7 +256,7 @@ photos_application_import_data_new (PhotosApplication *application,
+   data = g_slice_new0 (PhotosApplicationImportData);
+   g_application_hold (G_APPLICATION (application));
+   data->application = application;
+-  data->manager = g_object_ref (manager);
++  data->miner_control_proxy = miner_control_proxy;
+   data->files = g_list_copy_deep (files, (GCopyFunc) g_object_ref, NULL);
+   data->ctime_latest = ctime_latest;
+   return data;
+@@ -277,8 +276,8 @@ photos_application_import_data_free (PhotosApplicationImportData *data)
+ 
+   g_clear_object (&data->destination);
+   g_clear_object (&data->import_sub_dir);
++  g_clear_object (&data->miner_control_proxy);
+   g_list_free_full (data->files, g_object_unref);
+-  g_clear_object (&data->manager);
+   g_free (data->collection_urn);
+   g_slice_free (PhotosApplicationImportData, data);
+ }
+@@ -584,27 +583,6 @@ photos_application_actions_update (PhotosApplication *self)
  }
  
  
@@ -1595,7 +1671,7 @@ index f7b4b56e..7d6758cd 100644
  static gboolean
  photos_application_delete_event (PhotosApplication *self)
  {
-@@ -639,16 +615,6 @@ photos_application_destroy (PhotosApplication *self)
+@@ -641,16 +619,6 @@ photos_application_destroy (PhotosApplication *self)
    self->create_window_cancellable = g_cancellable_new ();
  
    photos_application_stop_miners (self);
@@ -1612,38 +1688,28 @@ index f7b4b56e..7d6758cd 100644
  }
  
  
-@@ -738,57 +704,34 @@ photos_application_gegl_init_fishes_idle (gpointer user_data)
+@@ -740,60 +708,6 @@ photos_application_gegl_init_fishes_idle (gpointer user_data)
  }
  
  
 -static void
 -photos_application_tracker_set_rdf_types (GObject *source_object, GAsyncResult *res, gpointer user_data)
-+static TrackerMinerFilesIndex *
-+photos_application_get_miner_fs_control_proxy (GCancellable *cancellable)
- {
+-{
 -  PhotosApplication *self = PHOTOS_APPLICATION (user_data);
 -  TrackerExtractPriority *extract_priority = TRACKER_EXTRACT_PRIORITY (source_object);
 -
 -  {
 -    g_autoptr (GError) error = NULL;
-+  g_autoptr (PhotosTrackerQueue) tracker_queue = NULL;
-+  const gchar *miner_fs_control_busname;
-+  g_autoptr (GError) error = NULL;
-+  TrackerMinerFilesIndex *miner_control_proxy;
- 
+-
 -    if (!tracker_extract_priority_call_set_rdf_types_finish (extract_priority, res, &error))
 -      {
 -        if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
 -          g_warning ("Unable to call SetRdfTypes: %s", error->message);
-+  tracker_queue = photos_tracker_queue_dup_singleton (cancellable, &error);
- 
+-
 -        goto out;
 -      }
-+  if (!tracker_queue) {
-+    g_warning ("Error getting Tracker queue: %s. Import will not work.", error->message);
-+    return NULL;
-   }
- 
+-  }
+-
 - out:
 -  g_application_release (G_APPLICATION (self));
 -}
@@ -1666,18 +1732,8 @@ index f7b4b56e..7d6758cd 100644
 -
 -        goto out;
 -      }
-+  miner_fs_control_busname = photos_tracker_queue_get_miner_fs_control_busname (tracker_queue);
-+  miner_control_proxy = tracker_miner_files_index_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-+                                                                          G_DBUS_PROXY_FLAGS_NONE,
-+                                                                          miner_fs_control_busname,
-+                                                                          "/org/freedesktop/Tracker3/Miner/Files/Control",
-+                                                                          NULL,
-+                                                                          &error);
-+  if (!miner_control_proxy) {
-+    g_warning ("Error getting Tracker Miner FS control proxy: %s. Import will not work", error->message);
-+    return NULL;
-   }
- 
+-  }
+-
 -  g_application_hold (G_APPLICATION (self));
 -  tracker_extract_priority_call_set_rdf_types (self->extract_priority,
 -                                               rdf_types,
@@ -1687,29 +1743,27 @@ index f7b4b56e..7d6758cd 100644
 -
 - out:
 -  g_application_release (G_APPLICATION (self));
-+  return miner_control_proxy;
- }
- 
- 
-@@ -826,15 +769,10 @@ photos_application_create_window (PhotosApplication *self)
+-}
+-
+-
+ static gboolean
+ photos_application_create_window (PhotosApplication *self)
+ {
+@@ -828,13 +742,6 @@ photos_application_create_window (PhotosApplication *self)
      self->init_fishes_id = g_idle_add (photos_application_gegl_init_fishes_idle, self);
  
    g_application_hold (G_APPLICATION (self));
 -  tracker_extract_priority_proxy_new_for_bus (G_BUS_TYPE_SESSION,
 -                                              G_DBUS_PROXY_FLAGS_NONE,
--                                              "org.gnome.Photos.Tracker1.Miner.Extract",
+-                                              "org.freedesktop.Tracker1.Miner.Extract",
 -                                              "/org/freedesktop/Tracker1/Extract/Priority",
 -                                              self->create_window_cancellable,
 -                                              photos_application_tracker_extract_priority,
 -                                              self);
  
    photos_application_start_miners (self);
-+
-+  self->miner_control_proxy = photos_application_get_miner_fs_control_proxy (NULL);
    return TRUE;
- }
- 
-@@ -1111,18 +1049,18 @@ photos_application_get_state (PhotosSearchContext *context)
+@@ -1113,18 +1020,18 @@ photos_application_get_state (PhotosSearchContext *context)
  
  
  static void
@@ -1731,7 +1785,15 @@ index f7b4b56e..7d6758cd 100644
        {
          g_autofree gchar *uri = NULL;
  
-@@ -1345,6 +1283,8 @@ photos_application_import_file_copy (GObject *source_object, GAsyncResult *res,
+@@ -1323,7 +1230,6 @@ photos_application_import_file_copy (GObject *source_object, GAsyncResult *res,
+   PhotosApplication *self = data->application;
+   g_autoptr (GFile) destination = NULL;
+   GFile *source = G_FILE (source_object);
+-  TrackerMinerManager *manager = data->manager;
+ 
+   {
+     g_autoptr (GError) error = NULL;
+@@ -1348,6 +1254,8 @@ photos_application_import_file_copy (GObject *source_object, GAsyncResult *res,
    else
      {
        g_autofree gchar *destination_uri = NULL;
@@ -1740,11 +1802,11 @@ index f7b4b56e..7d6758cd 100644
  
        g_assert_true (G_IS_FILE (destination));
        g_set_object (&data->destination, destination);
-@@ -1361,11 +1301,13 @@ photos_application_import_file_copy (GObject *source_object, GAsyncResult *res,
+@@ -1364,11 +1272,13 @@ photos_application_import_file_copy (GObject *source_object, GAsyncResult *res,
  
        g_application_hold (G_APPLICATION (self));
        g_application_mark_busy (G_APPLICATION (self));
--      tracker_miner_manager_index_file_for_process_async (self->miner_manager,
+-      tracker_miner_manager_index_file_for_process_async (manager,
 -                                                          destination,
 -                                                          NULL,
 -                                                          photos_application_import_index_file,
@@ -1759,64 +1821,93 @@ index f7b4b56e..7d6758cd 100644
      }
  
   out:
-@@ -1529,9 +1471,9 @@ photos_application_import (PhotosApplication *self)
-   selection = photos_selection_controller_get_selection (self->sel_cntrlr);
-   g_return_if_fail (selection != NULL);
- 
--  if (self->miner_manager == NULL)
-+  if (!self->miner_control_proxy)
-     {
--      g_warning ("No TrackerMinerManager, importing from attached devices won't work");
-+      g_warning ("No Tracker3.Miner.Files.Index proxy, importing from attached devices won't work");
-       goto out;
-     }
+@@ -1509,6 +1419,37 @@ photos_application_import_response (GtkDialog *dialog, gint response_id, gpointe
+ }
  
-@@ -1563,6 +1505,7 @@ photos_application_import (PhotosApplication *self)
-   gtk_widget_show_all (dialog);
  
-   data = photos_application_import_data_new (self, files, ctime_latest);
++static TrackerMinerFilesIndex *
++photos_application_get_miner_fs_control_proxy (GCancellable *cancellable)
++{
++  g_autoptr (PhotosTrackerQueue) tracker_queue = NULL;
++  const gchar *miner_fs_control_busname;
++  g_autoptr (GError) error = NULL;
++  TrackerMinerFilesIndex *miner_control_proxy;
++
++  tracker_queue = photos_tracker_queue_dup_singleton (cancellable, &error);
++
++  if (!tracker_queue) {
++    g_warning ("Error getting Tracker queue: %s. Import will not work.", error->message);
++    return NULL;
++  }
++
++  miner_fs_control_busname = photos_tracker_queue_get_miner_fs_control_busname (tracker_queue);
++  miner_control_proxy = tracker_miner_files_index_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
++                                                                          G_DBUS_PROXY_FLAGS_NONE,
++                                                                          miner_fs_control_busname,
++                                                                          "/org/freedesktop/Tracker3/Miner/Files/Control",
++                                                                          NULL,
++                                                                          &error);
++  if (!miner_control_proxy) {
++    g_warning ("Error getting Tracker Miner FS control proxy: %s. Import will not work", error->message);
++    return NULL;
++  }
++
++  return miner_control_proxy;
++}
++
 +
-   g_signal_connect (dialog,
-                     "response",
-                     G_CALLBACK (photos_application_import_response),
-@@ -2234,35 +2177,7 @@ photos_application_share_current (PhotosApplication *self)
  static void
- photos_application_start_miners (PhotosApplication *self)
+ photos_application_import (PhotosApplication *self)
  {
+@@ -1519,8 +1460,8 @@ photos_application_import (PhotosApplication *self)
+   GtkWidget *dialog;
+   g_autoptr (PhotosApplicationImportData) data = NULL;
+   PhotosSource *source;
+-  TrackerMinerManager *manager = NULL; /* TODO: use g_autoptr */
+   gint64 ctime_latest = -1;
++  TrackerMinerFilesIndex *miner_control_proxy;
+ 
+   source = PHOTOS_SOURCE (photos_base_manager_get_active_object (self->state->src_mngr));
+   g_return_if_fail (PHOTOS_IS_SOURCE (source));
+@@ -1533,17 +1474,9 @@ photos_application_import (PhotosApplication *self)
+   selection = photos_selection_controller_get_selection (self->sel_cntrlr);
+   g_return_if_fail (selection != NULL);
+ 
 -  {
 -    g_autoptr (GError) error = NULL;
 -
--    self->miner_manager = tracker_miner_manager_new_full (TRUE, &error);
+-    manager = tracker_miner_manager_new_full (FALSE, &error);
 -    if (error != NULL)
--      g_warning ("Unable to create a TrackerMinerManager: %s", error->message);
+-      {
+-        g_warning ("Unable to create a TrackerMinerManager, importing from attached devices won't work: %s",
+-                   error->message);
+-        goto out;
+-      }
 -  }
--
--  if (self->miner_manager != NULL)
--    {
--      GSList *available = NULL;
--      GSList *miner_files = NULL;
--
--      available = tracker_miner_manager_get_available (self->miner_manager);
--      miner_files = g_slist_find_custom (available, MINER_FILES, (GCompareFunc) strcmp);
--      if (miner_files == NULL)
--        {
--          g_warning ("Unable to find miner %s", MINER_FILES);
--        }
--      else
--        {
--          if (!tracker_miner_manager_is_active (self->miner_manager, MINER_FILES))
--            g_warning ("Unable to activate miner %s", MINER_FILES);
--        }
--
--      g_slist_free_full (available, g_free);
--    }
--
-- photos_application_create_online_miners (self);
-+  photos_application_create_online_miners (self);
- }
++  miner_control_proxy = photos_application_get_miner_fs_control_proxy (NULL);
++  if (!miner_control_proxy)
++    goto out;
+ 
+   for (l = selection; l != NULL; l = l->next)
+     {
+@@ -1572,14 +1505,14 @@ photos_application_import (PhotosApplication *self)
+   dialog = photos_import_dialog_new (GTK_WINDOW (self->main_window), ctime_latest);
+   gtk_widget_show_all (dialog);
+ 
+-  data = photos_application_import_data_new (self, manager, files, ctime_latest);
++  data = photos_application_import_data_new (self, miner_control_proxy, files, ctime_latest);
++
+   g_signal_connect (dialog,
+                     "response",
+                     G_CALLBACK (photos_application_import_response),
+                     g_steal_pointer (&data));
  
+  out:
+-  g_clear_object (&manager);
+   g_list_free_full (files, g_object_unref);
+ }
  
-@@ -2991,6 +2906,7 @@ photos_application_dispose (GObject *object)
+@@ -2974,6 +2907,7 @@ photos_application_dispose (GObject *object)
    g_clear_object (&self->insta_action);
    g_clear_object (&self->load_next_action);
    g_clear_object (&self->load_previous_action);
@@ -1824,17 +1915,15 @@ index f7b4b56e..7d6758cd 100644
    g_clear_object (&self->open_action);
    g_clear_object (&self->preview_menu_action);
    g_clear_object (&self->primary_menu_action);
-@@ -3019,8 +2935,7 @@ photos_application_dispose (GObject *object)
+@@ -3002,7 +2936,6 @@ photos_application_dispose (GObject *object)
    g_clear_object (&self->camera_cache);
    g_clear_object (&self->sel_cntrlr);
    g_clear_object (&self->factory);
 -  g_clear_object (&self->extract_priority);
--  g_clear_object (&self->miner_manager);
-+  g_clear_object (&self->miner_control_proxy);
  
    if (self->state != NULL)
      {
-@@ -3148,8 +3063,7 @@ photos_application_get_miners_running (PhotosApplication *self)
+@@ -3130,8 +3063,7 @@ photos_application_get_miners_running (PhotosApplication *self)
    return self->miners_running;
  }
  
@@ -1845,7 +1934,7 @@ index f7b4b56e..7d6758cd 100644
  {
    GList *windows;
 diff --git a/src/photos-base-item.c b/src/photos-base-item.c
-index 0d72f9c5..4ef69224 100644
+index 143431f9..b34706f2 100644
 --- a/src/photos-base-item.c
 +++ b/src/photos-base-item.c
 @@ -2756,6 +2756,16 @@ photos_base_item_update_info_from_type (PhotosBaseItem *self)
@@ -1865,8 +1954,23 @@ index 0d72f9c5..4ef69224 100644
  static void
  photos_base_item_populate_from_cursor (PhotosBaseItem *self, TrackerSparqlCursor *cursor)
  {
+@@ -2891,10 +2901,10 @@ photos_base_item_populate_from_cursor (PhotosBaseItem *self, TrackerSparqlCursor
+       priv->width = height;
+     }
+ 
+-  priv->exposure_time = tracker_sparql_cursor_get_double (cursor, PHOTOS_QUERY_COLUMNS_EXPOSURE_TIME);
+-  priv->fnumber = tracker_sparql_cursor_get_double (cursor, PHOTOS_QUERY_COLUMNS_FNUMBER);
+-  priv->focal_length = tracker_sparql_cursor_get_double (cursor, PHOTOS_QUERY_COLUMNS_FOCAL_LENGTH);
+-  priv->iso_speed = tracker_sparql_cursor_get_double (cursor, PHOTOS_QUERY_COLUMNS_ISO_SPEED);
++  priv->exposure_time = get_double_with_default (cursor, PHOTOS_QUERY_COLUMNS_EXPOSURE_TIME, 0.0);
++  priv->fnumber = get_double_with_default (cursor, PHOTOS_QUERY_COLUMNS_FNUMBER, 0.0);
++  priv->focal_length = get_double_with_default (cursor, PHOTOS_QUERY_COLUMNS_FOCAL_LENGTH, 0.0);
++  priv->iso_speed = get_double_with_default (cursor, PHOTOS_QUERY_COLUMNS_ISO_SPEED, 0.0);
+ 
+   flash = tracker_sparql_cursor_get_string (cursor, PHOTOS_QUERY_COLUMNS_FLASH, NULL);
+   priv->flash = g_quark_from_string (flash);
 diff --git a/src/photos-indexing-notification.c b/src/photos-indexing-notification.c
-index 72394983..122d0d91 100644
+index 7b2ea7dd..122d0d91 100644
 --- a/src/photos-indexing-notification.c
 +++ b/src/photos-indexing-notification.c
 @@ -26,12 +26,13 @@
@@ -1897,7 +2001,7 @@ index 72394983..122d0d91 100644
    REMOTE_MINER_TIMEOUT = 10 /* s */
  };
  
--static const gchar *MINER_FILES = "org.gnome.Photos.Tracker1.Miner.Files";
+-static const gchar *MINER_FILES = "org.freedesktop.Tracker1.Miner.Files";
 -
  
  static void
@@ -1957,7 +2061,7 @@ index 72394983..122d0d91 100644
 +                                                                   &error);
 +    }
  
--    self->manager = tracker_miner_manager_new_full (TRUE, &error);
+-    self->manager = tracker_miner_manager_new_full (FALSE, &error);
      if (error != NULL)
        {
 -        g_warning ("Unable to create a TrackerMinerManager, indexing progress notification won't work: %s",
@@ -1983,7 +2087,7 @@ index 72394983..122d0d91 100644
  
  
 diff --git a/src/photos-item-manager.c b/src/photos-item-manager.c
-index 337891c1..4dfe3c7e 100644
+index c44fbbfc..e4511bb1 100644
 --- a/src/photos-item-manager.c
 +++ b/src/photos-item-manager.c
 @@ -41,12 +41,9 @@
@@ -2240,7 +2344,7 @@ index 0870ef62..5ee25745 100644
 +  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nfo#orientation-top-mirror");
  }
 diff --git a/src/photos-query-builder.c b/src/photos-query-builder.c
-index 5d9d8a5a..9b1baf29 100644
+index e0735bde..46d65e8f 100644
 --- a/src/photos-query-builder.c
 +++ b/src/photos-query-builder.c
 @@ -25,6 +25,7 @@
@@ -2366,15 +2470,15 @@ index 5d9d8a5a..9b1baf29 100644
                                                NULL);
 @@ -133,6 +147,7 @@ photos_query_builder_create_collection_query (PhotosSearchContextState *state,
  {
-   GTimeVal tv;
+   g_autoptr (GDateTime) now = NULL;
    PhotosQuery *query;
 +  g_autoptr (TrackerResource) collection = NULL;
    g_autofree gchar *identifier = NULL;
    g_autofree gchar *sparql = NULL;
    g_autofree gchar *time = NULL;
-@@ -147,13 +162,14 @@ photos_query_builder_create_collection_query (PhotosSearchContextState *state,
-   tv.tv_usec = 0;
-   time = g_time_val_to_iso8601 (&tv);
+@@ -144,13 +159,14 @@ photos_query_builder_create_collection_query (PhotosSearchContextState *state,
+   now = g_date_time_new_now_utc ();
+   time = g_date_time_format_iso8601 (now);
  
 -  sparql = g_strdup_printf ("INSERT { _:res a nfo:DataContainer ; a nie:DataObject ; "
 -                            "nie:contentLastModified '%s' ; "
@@ -2394,7 +2498,7 @@ index 5d9d8a5a..9b1baf29 100644
  
    query = photos_query_new (state, sparql);
  
-@@ -183,7 +199,9 @@ PhotosQuery *
+@@ -180,7 +196,9 @@ PhotosQuery *
  photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
  {
    PhotosSparqlTemplate *template;
@@ -2405,7 +2509,7 @@ index 5d9d8a5a..9b1baf29 100644
    g_autofree gchar *item_pattern = NULL;
    g_autofree gchar *search_filter = NULL;
    g_autofree gchar *source_filter = NULL;
-@@ -192,7 +210,10 @@ photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
+@@ -189,7 +207,10 @@ photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
  
    template = photos_base_manager_get_sparql_template (state->srch_typ_mngr, flags);
  
@@ -2417,7 +2521,7 @@ index 5d9d8a5a..9b1baf29 100644
  
    item_pattern = photos_base_manager_get_where (state->item_mngr, flags);
  
-@@ -203,12 +224,16 @@ photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
+@@ -200,12 +221,16 @@ photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
      }
  
    sparql = photos_sparql_template_get_sparql (template,
@@ -2437,7 +2541,7 @@ index 5d9d8a5a..9b1baf29 100644
                                                "order", "",
                                                "offset_limit", "",
                                                NULL);
-@@ -267,7 +292,7 @@ photos_query_builder_fetch_collections_local (PhotosSearchContextState *state)
+@@ -264,7 +289,7 @@ photos_query_builder_fetch_collections_local (PhotosSearchContextState *state)
    g_autofree gchar *sparql = NULL;
  
    sparql = photos_query_builder_query (state,
@@ -2446,7 +2550,7 @@ index 5d9d8a5a..9b1baf29 100644
                                         PHOTOS_QUERY_FLAGS_COLLECTIONS
                                         | PHOTOS_QUERY_FLAGS_LOCAL
                                         | PHOTOS_QUERY_FLAGS_UNLIMITED,
-@@ -287,7 +312,7 @@ photos_query_builder_global_query (PhotosSearchContextState *state,
+@@ -284,7 +309,7 @@ photos_query_builder_global_query (PhotosSearchContextState *state,
    PhotosQuery *query;
    g_autofree gchar *sparql = NULL;
  
@@ -2455,7 +2559,7 @@ index 5d9d8a5a..9b1baf29 100644
    query = photos_query_new (state, sparql);
  
    return query;
-@@ -316,10 +341,19 @@ photos_query_builder_set_collection_query (PhotosSearchContextState *state,
+@@ -313,10 +338,19 @@ photos_query_builder_set_collection_query (PhotosSearchContextState *state,
    PhotosQuery *query;
    g_autofree gchar *sparql = NULL;
  
@@ -2479,7 +2583,7 @@ index 5d9d8a5a..9b1baf29 100644
    query = photos_query_new (state, sparql);
  
    return query;
-@@ -329,17 +363,14 @@ photos_query_builder_set_collection_query (PhotosSearchContextState *state,
+@@ -326,17 +360,14 @@ photos_query_builder_set_collection_query (PhotosSearchContextState *state,
  PhotosQuery *
  photos_query_builder_single_query (PhotosSearchContextState *state, gint flags, const gchar *resource)
  {
@@ -2501,9 +2605,9 @@ index 5d9d8a5a..9b1baf29 100644
    query = photos_query_new (state, sparql);
  
    return query;
-@@ -360,7 +391,14 @@ photos_query_builder_update_mtime_query (PhotosSearchContextState *state, const
-   tv.tv_usec = 0;
-   time = g_time_val_to_iso8601 (&tv);
+@@ -354,7 +385,14 @@ photos_query_builder_update_mtime_query (PhotosSearchContextState *state, const
+   now = g_date_time_new_now_utc ();
+   time = g_date_time_format_iso8601 (now);
  
 -  sparql = g_strdup_printf ("INSERT OR REPLACE { <%s> nie:contentLastModified '%s' }", resource, time);
 +  sparql = g_strdup_printf ("WITH tracker:Pictures "
@@ -2831,7 +2935,7 @@ index eee4f40c..00000000
 -#endif /* PHOTOS_TRACKER_CHANGE_EVENT_H */
 diff --git a/src/photos-tracker-change-monitor.c b/src/photos-tracker-change-monitor.c
 deleted file mode 100644
-index 44c9ffe7..00000000
+index 2e9810aa..00000000
 --- a/src/photos-tracker-change-monitor.c
 +++ /dev/null
 @@ -1,468 +0,0 @@
@@ -3271,7 +3375,7 @@ index 44c9ffe7..00000000
 -
 -  self->resource_service = tracker_resources_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
 -                                                                     G_DBUS_PROXY_FLAGS_NONE,
--                                                                     "org.gnome.Photos.Tracker1",
+-                                                                     "org.freedesktop.Tracker1",
 -                                                                     "/org/freedesktop/Tracker1/Resources",
 -                                                                     cancellable,
 -                                                                     error);
@@ -3352,7 +3456,7 @@ index 9740b046..00000000
 -
 -#endif /* PHOTOS_TRACKER_CHANGE_MONITOR_H */
 diff --git a/src/photos-tracker-controller.c b/src/photos-tracker-controller.c
-index a02db077..6d0053a1 100644
+index 3a62cf2d..f0b81e02 100644
 --- a/src/photos-tracker-controller.c
 +++ b/src/photos-tracker-controller.c
 @@ -292,6 +292,12 @@ photos_tracker_controller_perform_current_query (PhotosTrackerController *self)
@@ -3395,7 +3499,7 @@ index 7e3b9b0c..2b562299 100644
      <method name="SetRdfTypes">
        <arg name="rdf_types" type="as" direction="in" />
 diff --git a/src/photos-tracker-import-controller.c b/src/photos-tracker-import-controller.c
-index 9f130714..d7ed9b20 100644
+index 085ace3a..d7ed9b20 100644
 --- a/src/photos-tracker-import-controller.c
 +++ b/src/photos-tracker-import-controller.c
 @@ -24,7 +24,6 @@
@@ -3549,7 +3653,7 @@ index 9f130714..d7ed9b20 100644
 -  {
 -    g_autoptr (GError) error = NULL;
 -
--    self->manager = tracker_miner_manager_new_full (TRUE, &error);
+-    self->manager = tracker_miner_manager_new_full (FALSE, &error);
 -    if (error != NULL)
 -      g_warning ("Unable to create a TrackerMinerManager, indexing attached devices won't work: %s", error->message);
 -  }
@@ -3558,7 +3662,7 @@ index 9f130714..d7ed9b20 100644
  
  
 diff --git a/src/photos-tracker-queue.c b/src/photos-tracker-queue.c
-index 76d25d5d..a5f4c91a 100644
+index 6ac829cd..a5f4c91a 100644
 --- a/src/photos-tracker-queue.c
 +++ b/src/photos-tracker-queue.c
 @@ -37,9 +37,20 @@ struct _PhotosTrackerQueue
@@ -3767,11 +3871,11 @@ index 76d25d5d..a5f4c91a 100644
          ret_val = TRUE;
        else
          g_assert_nonnull (self->initialization_error);
-@@ -290,13 +399,49 @@ photos_tracker_queue_initable_init (GInitable *initable, GCancellable *cancellab
+@@ -290,11 +399,49 @@ photos_tracker_queue_initable_init (GInitable *initable, GCancellable *cancellab
  
    g_assert_no_error (self->initialization_error);
  
--  tracker_sparql_connection_set_domain ("org.gnome.Photos");
+-  self->connection = tracker_sparql_connection_get (cancellable, &self->initialization_error);
 +  /* Connect to the local database which stores user data.
 +   *
 +   * Same flags that tracker-miner-fs uses by default. See:
@@ -3789,8 +3893,7 @@ index 76d25d5d..a5f4c91a 100644
 +                                                          tracker_sparql_get_ontology_nepomuk (),
 +                                                          cancellable,
 +                                                          &self->initialization_error);
- 
--  self->connection = tracker_sparql_connection_get (cancellable, &self->initialization_error);
++
    if (G_UNLIKELY (self->initialization_error != NULL))
      goto out;
  
@@ -3820,7 +3923,7 @@ index 76d25d5d..a5f4c91a 100644
  
   out:
    self->is_initialized = TRUE;
-@@ -321,10 +466,44 @@ photos_tracker_queue_initable_iface_init (GInitableIface *iface)
+@@ -319,10 +466,44 @@ photos_tracker_queue_initable_iface_init (GInitableIface *iface)
  PhotosTrackerQueue *
  photos_tracker_queue_dup_singleton (GCancellable *cancellable, GError **error)
  {
@@ -3866,7 +3969,7 @@ index 76d25d5d..a5f4c91a 100644
  }
  
  
-@@ -353,6 +532,7 @@ photos_tracker_queue_select (PhotosTrackerQueue *self,
+@@ -351,6 +532,7 @@ photos_tracker_queue_select (PhotosTrackerQueue *self,
  }
  
  
@@ -3940,10 +4043,10 @@ index 18177aa0..00000000
 -  </interface>
 -</node>
 diff --git a/src/photos-utils.c b/src/photos-utils.c
-index d659b47d..72d2e98b 100644
+index c638297b..cc8593d8 100644
 --- a/src/photos-utils.c
 +++ b/src/photos-utils.c
-@@ -1324,7 +1324,13 @@ photos_utils_set_edited_name (const gchar *urn, const gchar *title)
+@@ -1261,7 +1261,13 @@ photos_utils_set_edited_name (const gchar *urn, const gchar *title)
    g_autoptr (PhotosTrackerQueue) queue = NULL;
    g_autofree gchar *sparql = NULL;
  
@@ -3958,7 +4061,7 @@ index d659b47d..72d2e98b 100644
    query = photos_query_new (NULL, sparql);
  
    {
-@@ -1352,9 +1358,19 @@ photos_utils_set_favorite (const gchar *urn, gboolean is_favorite)
+@@ -1289,9 +1295,19 @@ photos_utils_set_favorite (const gchar *urn, gboolean is_favorite)
    g_autoptr (PhotosTrackerQueue) queue = NULL;
    g_autofree gchar *sparql = NULL;
  
@@ -3982,7 +4085,7 @@ index d659b47d..72d2e98b 100644
  
    {
 diff --git a/src/photos-utils.h b/src/photos-utils.h
-index a4d69abf..57069892 100644
+index 78ec3668..f1450f7d 100644
 --- a/src/photos-utils.h
 +++ b/src/photos-utils.h
 @@ -46,7 +46,7 @@ G_BEGIN_DECLS
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index ca3f4be7162..7c83a2e75d4 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-photos'
 pkgname=gnome-photos
-version=3.38.0
+version=3.37.91.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,8 +15,8 @@ short_desc="Access, organize, and share your photos on GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Photos"
-distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
-checksum=667f39477579d577470740e01f37b05c62e461e6f6da6377724d8f3993e1c4c4
+distfiles="${GNOME_SITE}/gnome-photos/${version%.*.*}/gnome-photos-${version}.tar.xz"
+checksum=278da23234e27c543020dae943ad52086b9ecaa5ee3aad0b031b86ee04d394aa
 patch_args="-Np1"
 
 build_options="gir"
diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 99db640ad97..47acd94873c 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,18 +1,16 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.0
+version=3.34.0
 revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel gst-plugins-bad1-devel
- libhandy1-devel"
-depends="desktop-file-utils gjs gsettings-desktop-schemas gst-plugins-bad1
- libhandy1"
+makedepends="gjs-devel libglib-devel gtk+3-devel"
+depends="desktop-file-utils gjs gsettings-desktop-schemas gst-plugins-base1"
 short_desc="GNOME sound recorder application"
 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=49f1d6e0c06ac3bacc6084b2f5a63c8b91c5a20c3fc824532b7736a1151684c4
 lib32disabled=yes
diff --git a/srcpkgs/gnome-taquin/template b/srcpkgs/gnome-taquin/template
index 167f547e42e..6c38d7c857e 100644
--- a/srcpkgs/gnome-taquin/template
+++ b/srcpkgs/gnome-taquin/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-taquin'
 pkgname=gnome-taquin
-version=3.38.1
+version=3.36.4
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool librsvg-devel pkg-config vala"
@@ -10,4 +10,4 @@ maintainer="Nafis <mnabid.25@outlook.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Taquin"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=96db3d8fad497924a7390ad108a3ef72432a1d62d2456cae5e1934057018814f
+checksum=e032343ef8579e4aad9db437c5201998c7358a741120fb88a25e737db1d68e2b
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49..dd247cf9304 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=3.38.0
-revision=2
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -20,7 +20,7 @@ depends="
  gnome-calendar>=3.38.0
  gnome-characters>=3.34.0
  gnome-clocks>=3.38.0
- gnome-contacts>=3.38.0
+ gnome-contacts>=3.37.2
  gnome-disk-utility>=3.38.0
  gnome-font-viewer>=3.34.0
  gnome-maps>=3.38.0
@@ -41,7 +41,7 @@ depends="
  yelp-tools>=3.38.0"
 
 _apps_depends="
- bijiben>=3.38.0
+ bijiben>=3.36.3
  dconf-editor>=3.38.0
  devhelp>=3.38.0
  epiphany>=3.38.0
@@ -62,15 +62,15 @@ _apps_depends="
  gnome-maps>=3.38.0
  gnome-music>=3.38.0
  gnome-nettool>=3.8.1
- gnome-photos>=3.38.0
+ gnome-photos>=3.37.91.1
  gnome-recipes>=2.0.2
  gnome-screenshot>=3.38.0
- gnome-sound-recorder>=3.38.0
+ gnome-sound-recorder>=3.34.0
  gnome-system-monitor>=3.38.0
  gnome-terminal>=3.38.0
  gnome-todo>=3.28.1
  nemiver>=0.9.6
- polari>=3.38.0
+ polari>=3.36.3
  rygel>=0.40.0
  simple-scan>=3.38.0
  totem>=3.38.0
@@ -80,21 +80,21 @@ _games_collection_depends="
  aisleriot>=3.22.12
  five-or-more>=3.32.2
  four-in-a-row>=3.36.4
- gnome-2048>=3.38.0
- gnome-chess>=3.38.0
- gnome-klotski>=3.38.0
- gnome-mahjongg>=3.38.0
+ gnome-2048>=3.36.4
+ gnome-chess>=3.36.1
+ gnome-klotski>=3.36.3
+ gnome-mahjongg>=3.36.2
  gnome-mines>=3.36.1
- gnome-nibbles>=3.38.0
- gnome-robots>=3.38.0
+ gnome-nibbles>=3.26.1
+ gnome-robots>=3.36.1
  gnome-sudoku>=3.36.0
- gnome-tetravex>=3.38.0
+ gnome-tetravex>=3.36.4
  hitori>=3.38.0
- iagno>=3.38.0
- lightsoff>=3.38.0
- quadrapassel>=3.38.0
+ iagno>=3.36.4
+ lightsoff>=3.36.0
+ quadrapassel>=3.36.05
  swell-foop>=3.34.1
- tali>=3.38.0"
+ tali>=3.36.4"
 
 gnome-apps_package() {
 	depends="$_apps_depends"
diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index 9f13ddb0cd1..36a447332d9 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.36.0
 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=29e503645d84abd94eb3ddadbfe7a63a82b30fd7f3ad01418cd4e4c58e07f336
 lib32disabled=yes
diff --git a/srcpkgs/gohufont/template b/srcpkgs/gohufont/template
index a44aa42b195..c6e43d9c0d1 100644
--- a/srcpkgs/gohufont/template
+++ b/srcpkgs/gohufont/template
@@ -1,7 +1,8 @@
 # Template file for 'gohufont'
 pkgname=gohufont
 version=2.1
-revision=3
+revision=2
+archs=noarch
 makedepends="font-util xbps-triggers"
 depends="$makedepends"
 short_desc="Programming monospace bitmap"
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..183ad6454ea 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.32.2
+version=1.29.0
 revision=1
 build_style=go
 go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -11,7 +11,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=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+checksum=1e92c8ff425fe89e1678d576df24f1d1302f613d81c710da890c6aa057171190
 
 # Cross builds fail with -fuse-ld=gold
 LDFLAGS="-fuse-ld=bfd"
diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template
index 0a6f88d03af..abcc87642c4 100644
--- a/srcpkgs/golly/template
+++ b/srcpkgs/golly/template
@@ -1,41 +1,29 @@
 # Template file for 'golly'
 pkgname=golly
-version=4.0
+version=3.4
 revision=1
 wrksrc="${pkgname}-${version}-src"
-build_wrksrc="gui-wx"
-build_style=gnu-makefile
-make_build_args="-f makefile-gtk GOLLYDIR=/usr/share/golly LUALIB=-llua5.4
- CXXC=\$(CXX)"
-make_install_args="${make_build_args}"
-hostmakedepends="python3"
-makedepends="MesaLib-devel glu-devel lua54-devel python3-devel wxWidgets-devel
+build_style=gnu-configure
+configure_script="gui-wx/configure/configure"
+configure_args="LIBS=-lGL"
+hostmakedepends="automake python"
+makedepends="MesaLib-devel glu-devel lua53-devel python-devel wxWidgets-devel
  zlib-devel"
 short_desc="Simulator for Conway's Game of Life and other cellular automata"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://golly.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz"
-checksum=45a8595c9f7064de029f05d339e3fca3776b5a0c36fef95712e697f154d82ae5
+checksum=198dd681e10b1ad5d40c218521206e326fc0c142a14027e18c5b73dde27655dd
 
 post_extract() {
 	# POSIX name clash
 	sed -i 's/PAGESIZE/GOLLYPAGESIZE/' gui-wx/*.cpp
+	sed -i '/LDADD/s/ liblua\.a/ -llua5.3/g' gui-wx/configure/Makefile.in
 }
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
-		sed -i "s,\(PYTHON_INCLUDE\) =.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python3.9,g" makefile-gtk
+		sed -i "s,\(PYTHON_INCLUDE\)=.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" gui-wx/configure/configure
 	fi
 }
-
-do_install() {
-	cd "${wrksrc}"
-	vbin golly
-	vbin bgolly
-	vmkdir usr/share/golly
-	vcopy Help usr/share/golly
-	vcopy Patterns usr/share/golly
-	vcopy Rules usr/share/golly
-	vcopy Scripts usr/share/golly
-}
diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 89b0ee240e8..0cec13269aa 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,12 +1,12 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.6
+version=0.5.2
 revision=1
 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"
+hostmakedepends="appstream-glib desktop-file-utils glib-devel pkg-config gettext"
+makedepends="dconf-devel gst-plugins-base1-devel gtk+3-devel libkeybinder3-devel
+ amtk-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Light and simple internet radio player"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,8 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.com/goodvibes/goodvibes"
 changelog="https://gitlab.com/goodvibes/goodvibes/raw/v${version}/NEWS"
 distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=b3cb769ff2813e38ac5211be5af97a32f17b31ba48c0133d8a406005262f76a5
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" glib-devel"
-fi
+checksum=bef8afaa129dbd95681cd8b8a05964aa3bbdab08fe7565709f0da81d3d11c5a6
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 1d89968f021..3604533d300 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=86.0.4240.183
+_chromeVersion=86.0.4240.111
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=c9d37f91449ea3563d518b13164c5aefb42d166d5aec91f9832948d335ee0de4
+checksum=86a2dfca066f92e2017979b9608f61d82dccde7cad77c46d972312de7c8c5881
 
 do_extract() {
 	mkdir -p ${DESTDIR}
diff --git a/srcpkgs/google-fonts-ttf/template b/srcpkgs/google-fonts-ttf/template
index 1edd6677dc2..25ac61c5dbe 100644
--- a/srcpkgs/google-fonts-ttf/template
+++ b/srcpkgs/google-fonts-ttf/template
@@ -1,28 +1,27 @@
 # Template file for 'google-fonts-ttf'
 pkgname=google-fonts-ttf
 version=20190605
-revision=2
+revision=1
+archs=noarch
 _githash=87776223497b72be361b5c08ba16e9c659209f37
 wrksrc="fonts-${_githash}"
 depends="font-util cantarell-fonts noto-fonts-ttf"
+font_dirs="/usr/share/fonts/TTF"
 short_desc="TrueType fonts from the Google Fonts project"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, OFL-1.1, custom:UFL-1.0"
 homepage="https://www.google.com/fonts"
+license="Apache-2.0, OFL-1.1, UFL-1.0"
 distfiles="https://github.com/google/fonts/archive/${_githash}.tar.gz"
 checksum=84b24d1efa96316f2aab9be9d5352923ab8c2622a15d38bdff22c518c6a1deb1
 conflicts="fonts-croscore-ttf>=0 font-fira-ttf>=0 font-sourcecodepro>=0
  ttf-ubuntu-font-family>=0 font-vollkorn-ttf>=0"
-font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
 	vmkdir usr/share/fonts/TTF
 	find . -type f -name '*.ttf' -exec install -Dm644 '{}' ${DESTDIR}/usr/share/fonts/TTF \;
 }
-
 post_install() {
 	# remove cantarell and noto fonts
 	rm -f ${DESTDIR}/usr/share/fonts/TTF/Cantarell-*.ttf
 	rm -f ${DESTDIR}/usr/share/fonts/TTF/Noto*-*.ttf
-	vlicense ufl/ubuntu/LICENCE.txt
 }
diff --git a/srcpkgs/googler/template b/srcpkgs/googler/template
index a08bc4d7939..d432d1764d5 100644
--- a/srcpkgs/googler/template
+++ b/srcpkgs/googler/template
@@ -1,16 +1,16 @@
 # Template file for 'googler'
 pkgname=googler
-version=4.3.1
+version=4.2
 revision=1
 build_style=gnu-makefile
 make_build_target=disable-self-upgrade
 depends="python3 xsel xclip"
 short_desc="Google Search, Site Search and News from the terminal"
-maintainer="Nathan Owens <ndowens@artixlinux.org>"
+maintainer="Nathan Owens <ndowens04@gmail.com>"
 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=ee0887ec30aea14823bb32117c97f4af8cdba381244b393665d2e273f8b60b43
 
 post_install() {
 	vinstall auto-completion/bash/googler-completion.bash 644 /usr/share/bash-completion/completions/googler
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 8550ce7c372..5ef99f29d7e 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.5.2
+version=0.4.3
 revision=1
 wrksrc=tools-gopls-v${version}
 build_style=go
@@ -11,7 +11,7 @@ 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=b6dfeded6bec0bf960978519cf2d05cb6d996f15d0f13829bdb490de3ca6c675
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index 1277341396b..fa1fee0cc86 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,6 +1,6 @@
 # Template file for 'gops'
 pkgname=gops
-version=0.3.13
+version=0.3.12
 revision=1
 build_style=go
 go_import_path="github.com/google/gops"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/gops"
 distfiles="https://github.com/google/gops/archive/v${version}.tar.gz"
-checksum=340cec010598e9a167d6719dbf46aded5bd3084d7701d2d40037b74ab1a8ffb6
+checksum=d96de501a0ad99feff0c763a13ea0254287b2585501c93dae49311a9e49d99c7
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index a522a681c28..fcad828cb53 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=20.08.3
+version=20.08.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=c557e353f090b3a3cde25d31a1d0c36ba1a9d4f7f94b19a4dfe3fb2d76d9671d
+checksum=8cb4d2f698cf7f44bf70322669809f07900021f215175c8db120abc0f2debf62
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index c825c497435..30077ca942e 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -1,6 +1,6 @@
 # Template file for 'grep'
 pkgname=grep
-version=3.6
+version=3.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/grep/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e
+checksum=b82ac77707c2ab945520c8404c9fa9f890f7791a62cf2103cf6238acad87a44a
 
 pre_check() {
 	case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 83f6ca24b72..158c87cb6a1 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.33.2
+version=1.33.1
 revision=1
 _abseilver=df3ea785d8c30a9503321a3d35ee7d35808f190d
 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="2060769f2d4b0d3535ba594b2ab614d7f68a492f786ab94b4318788d45e3278a
+checksum="58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63
  f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/grub-terminus/template b/srcpkgs/grub-terminus/template
index 7e4e8c2e2f7..5f53c77384d 100644
--- a/srcpkgs/grub-terminus/template
+++ b/srcpkgs/grub-terminus/template
@@ -1,11 +1,12 @@
 # Template file for 'grub-terminus'
 pkgname=grub-terminus
-version=0.3
+version=0.2
 revision=1
+archs=noarch
 hostmakedepends="grub-utils terminus-font"
 short_desc="Terminus bold fonts for GRUB"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="OFL-1.1, GPL-2.0-or-later"
+license="Public Domain"
 homepage="https://voidlinux.org"
 
 do_install() {
@@ -21,6 +22,4 @@ do_install() {
 		-e "s;@sizes@;${_sizes};" \
 		> ${DESTDIR}/usr/bin/grub-terminus
 	chmod o+x ${DESTDIR}/usr/bin/grub-terminus
-	# Copy the OFL.txt license from the original terminus-font
-	vlicense /usr/share/licenses/terminus-font/OFL.txt
 }
diff --git a/srcpkgs/gsfonts/template b/srcpkgs/gsfonts/template
index 7bffdafc025..5d76979e0ed 100644
--- a/srcpkgs/gsfonts/template
+++ b/srcpkgs/gsfonts/template
@@ -1,7 +1,8 @@
 # Template file for 'gsfonts'
 pkgname=gsfonts
 version=8.11
-revision=6
+revision=5
+archs=noarch
 wrksrc=fonts
 makedepends="font-util font-misc-misc"
 depends="${makedepends}"
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index fc2d6929141..f87019d93ed 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.23
+version=3.24.22
 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=5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1
+checksum=bf18a4a5dff28a7b02aaef1b949c2d09c96c18387eddab152bb4cd55a5b67dda
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"
diff --git a/srcpkgs/gtk-layer-shell/template b/srcpkgs/gtk-layer-shell/template
index 00e959b8f00..e2046a5f801 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.1
+version=0.3.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=d77e42dff69e2cf1eee4489fb7db465d4e33be48e67ee0ca653238de0ab882ba
+checksum=edd5e31279d494df66da9e9190c219fa295da547f5538207685e98468dbc134d
 
 post_install() {
 	vlicense LICENSE_MIT.txt
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index fb10a6ca866..16d1180b130 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.2.4
+version=1.2.2
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -10,7 +10,8 @@ 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=b31ebdb94d227331ac954262e43e39e3b9a1fb25bab96fd0cccb7ddfb997e383
+broken="cli.StringFlag does not implement cli.Flag (Apply method has pointer receiver)"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index e6f38d41bc6..6107023c21e 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
+version=1.46.0
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=78ba73a6da09a21ce3acc776b46c26dd5bea216463a65d65b4052a57f5d970e9
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index f643814a462..72cc9da5648 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=20.08.3
+version=20.08.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=acc76c7b80f71ce47fb747c81cd062b1581ccc441f025e023bedc193feb8bc26
+checksum=580df49eb6852db4b1229f0326372dc7da7a08140d552da59a62ece08b03cc9d
 patch_args="-Np1"
 
 pre_configure() {
diff --git a/srcpkgs/gyazo/template b/srcpkgs/gyazo/template
index 4731753fdd1..3661570514a 100644
--- a/srcpkgs/gyazo/template
+++ b/srcpkgs/gyazo/template
@@ -1,15 +1,16 @@
 # Template file for 'gyazo'
 pkgname=gyazo
-version=1.3.1
+version=1.2.1
 revision=1
 wrksrc="Gyazo-for-Linux-${version}"
 depends="ruby xclip ImageMagick"
+archs=noarch
 short_desc="Seriously Instant Screen-Grabbing"
-maintainer="nielznl <nielznl@protonmail.com>"
-license="GPL-2.0-or-later"
+maintainer="DirectorX <DirectorX@users.noreply.github.com>"
+license="GPL-2"
 homepage="https://github.com/gyazo/Gyazo-for-Linux"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=a72fafaef4850d28418e877a0d21c6dd6fac7d549ebd9acae9b839168d987681
+checksum=c3a2a336a5f2515fc7cf71b07619ac9dc78e1db78bc326f8979b74d7ed4132e6
 
 do_install() {
 	vbin src/gyazo.rb gyazo
diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template
index f1ad271c15c..d48c39b134f 100644
--- a/srcpkgs/gzip/template
+++ b/srcpkgs/gzip/template
@@ -17,5 +17,5 @@ esac
 
 pre_check() {
 	# help-version test is know to fail
-	vsed -i '/help-version\s/d' tests/Makefile
+	sed -i '1721,1727d;1447d' tests/Makefile
 }
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index d3f8d6c8ca0..4911185c21b 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.3.0
+version=2.2.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=08badc59e037883f788f2c8f3358fa3e351aeaee826fd8a719f1e6252aff78fc
+checksum=87a4d9d4ff8dc3094cb61bbed4a8eed2c40b5ac47b9604daebaf036d7b541be2
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index 8a7aecc2504..787e24d65b8 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.20.0
+version=1.19.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=116089f671f3f484b45fa8264cd016f92246421ba8c444a98d5bc18741e625e5
+checksum=839d936158377cd6d23b5734853ff5458edcd3cd9c731a7ff57a55fc15c024d8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 62e78c6f0b2..301bb2c6d69 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,6 +1,6 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.0
+version=0.8.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
@@ -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=7162e3e6ab6c93b4694c2cb28797ae6246a5be59ff68eeb55a7271dfb29e616d
+checksum=a14e3b7e0c1c3f6a318a0a9cf631a4ab572e6de22c84c77603cf38e1e425abe2
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..7a74ae3bd12 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,7 +3,7 @@ pkgname=hfsprogs
 _distver=540.1
 _patchver=3
 version="${_distver}.linux${_patchver}"
-revision=7
+revision=6
 wrksrc="diskdev_cmds-${version}"
 hostmakedepends="clang"
 makedepends="libressl-devel libuuid-devel"
@@ -42,11 +42,11 @@ do_check() {
 do_install() {
 	vbin fsck_hfs.tproj/fsck_hfs fsck.hfs
 	vbin newfs_hfs.tproj/newfs_hfs mkfs.hfsplus
-	ln -s fsck.hfs "${DESTDIR}"/usr/bin/fsck.hfsplus
+	ln -s /usr/bin/fsck.hfs "${DESTDIR}"/usr/bin/fsck.hfsplus
 
-	vman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8
-	vman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
-	ln -s fsck.hfs.8 "${DESTDIR}"/usr/share/man/man8/fsck.hfsplus.8
+	vman fsck_hfs.tproj/fsck_hfs.8
+	vman newfs_hfs.tproj/newfs_hfs.8
+	ln -s fsck.hfs.8 "${DESTDIR}"/usr/share/man/man8/fsck.hfs.8
 
 	vlicense "${FILESDIR}"/APSL-2.0
 }
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 1f6337ba8e1..5c1c1d3ee26 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.78.1
+version=0.76.2
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=607502a8678fc7134f3df1ce2978f31e407ac0cb1d6b61e46cdcc9883ce12af8
+checksum=03a32d3c7bff0264bf5e2cb995bff6250c9b6a05a7172ffe98c4f923226f7181
 
 build_options="pygments extended"
 desc_option_pygments="Alternative syntax highlighter"
diff --git a/srcpkgs/hunspell-pt_PT-preao/template b/srcpkgs/hunspell-pt_PT-preao/template
deleted file mode 100644
index db8f65fc027..00000000000
--- a/srcpkgs/hunspell-pt_PT-preao/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'hunspell-pt_PT-preao'
-pkgname=hunspell-pt_PT-preao
-version=20201029
-revision=1
-short_desc="Portuguese dictionary for hunspell (prior to 1990 Orthographic Agreement)"
-maintainer="Luis Henriques <henrix@camandro.org>"
-license="GPL-2.0-only, LGPL-2.1-only, MPL-1.1"
-homepage="https://natura.di.uminho.pt/wiki/doku.php?id=dicionarios:main"
-distfiles="https://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/${pkgname}-${version}.tar.gz"
-checksum=9427f1b21b9a3e8126fce62d008e6215b0b631498232ae567859d363351fbac4
-
-do_install() {
-	vinstall pt_PT-preao.aff 644 usr/share/hunspell
-	vinstall pt_PT-preao.dic 644 usr/share/hunspell
-	vdoc README_pt_PT.txt
-}
diff --git a/srcpkgs/hunspell-pt_PT/template b/srcpkgs/hunspell-pt_PT/template
deleted file mode 100644
index 96317685854..00000000000
--- a/srcpkgs/hunspell-pt_PT/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'hunspell-pt_PT'
-pkgname=hunspell-pt_PT
-version=20201029
-revision=1
-short_desc="Portuguese dictionary for hunspell"
-maintainer="Luis Henriques <henrix@camandro.org>"
-license="GPL-2.0-only, LGPL-2.1-only, MPL-1.1"
-homepage="https://natura.di.uminho.pt/wiki/doku.php?id=dicionarios:main"
-distfiles="https://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/${pkgname}-${version}.tar.gz"
-checksum=711b2a2c755546cb341e5cf8ed70157fc4adaacc74b84e132c85b174d791c8db
-
-do_install() {
-	vinstall pt_PT.aff 644 usr/share/hunspell
-	vinstall pt_PT.dic 644 usr/share/hunspell
-	vdoc README_pt_PT.txt
-}
diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index 62a08bdd0bb..bcc9ffb5c00 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -1,6 +1,6 @@
 # Template file for 'hwloc'
 pkgname=hwloc
-version=2.3.0
+version=2.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.open-mpi.org/projects/hwloc/"
 distfiles="https://www.open-mpi.org/software/hwloc/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=b607f6097873f69ef6b4b01e66e0dcb45f9939e8979827284664bbf0d4018a64
+checksum=653c05742dff16e5ee6ad3343fd40e93be8ba887eaffbd539832b68780d047a9
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;
diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 2f89e13162c..41054421bc4 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,7 +1,7 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.14.2
-revision=1
+version=0.14.1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="dbus-devel pulseaudio-devel"
@@ -11,7 +11,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=66a11cbcfa515c761701788edd573d408391c024086219d8b6641333129a6f87
+checksum=bd22d28b8c3d35c93610b9f46a04fe49a92d62a466dbf0669ceb6b77943c5406
 
 post_install() {
 	vman man/i3status-rs.1
diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index 64f3abd3cdd..f2648d97f24 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -10080,7 +10080,6 @@ jmb-cds1         8900/tcp
 jmb-cds1         8900/udp
 jmb-cds2         8901/tcp
 jmb-cds2         8901/udp
-dpp              8908/tcp
 manyone-http     8910/tcp
 manyone-http     8910/udp
 manyone-xml      8911/tcp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index e991378c561..fccb4fe21a6 100644
--- a/srcpkgs/iana-etc/template
+++ b/srcpkgs/iana-etc/template
@@ -1,7 +1,6 @@
 # Template file for 'iana-etc'
 pkgname=iana-etc
-reverts="202001016_1"
-version=20201019
+version=202001016
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index ee331f65ff7..0e587805a9f 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=1.9.0
+version=1.8.3
 revision=1
 build_style=cmake
 configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=50eaba8773930be822e17c264ef0eb639d704bf3dd592698343a2148d0f7754a
+checksum=8176efa28d9ec366350dd819aea8faeb512b0184fcc52c538eed90d3474ee136
 
 # No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok
 CXXFLAGS="-Wno-odr -fno-strict-aliasing"
diff --git a/srcpkgs/ideviceinstaller/template b/srcpkgs/ideviceinstaller/template
index d0466f375bc..2a58365f6bf 100644
--- a/srcpkgs/ideviceinstaller/template
+++ b/srcpkgs/ideviceinstaller/template
@@ -1,6 +1,6 @@
 # Template file for 'ideviceinstaller'
 pkgname=ideviceinstaller
-version=1.1.1
+version=1.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,10 +9,9 @@ depends="usbmuxd"
 short_desc="Manage apps of iOS devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://libimobiledevice.org"
-changelog="https://raw.githubusercontent.com/libimobiledevice/ideviceinstaller/master/NEWS"
+homepage="https://github.com/libimobiledevice/ideviceinstaller"
 distfiles="https://github.com/libimobiledevice/${pkgname}/archive/${version}.tar.gz"
-checksum=b1401678a61f28c4aca95375c100b5a83ccc2cdfa0222c0de7ad0a2cfb4e3c9f
+checksum=847b58708f9e627af2d09283177a2495e6c49d9a99d459499c4f3fd4ad4f0506
 
 pre_configure() {
 	sed -i "/AS_COMPILER_FLAGS(/s/-Werror//" configure.ac
diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..a4255ae1310 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -1,19 +1,13 @@
 # Template file for 'ifuse'
 pkgname=ifuse
-version=1.1.4
-revision=1
+version=1.1.3
+revision=6
 build_style=gnu-configure
-hostmakedepends="pkg-config automake"
+hostmakedepends="pkg-config"
 makedepends="libressl-devel fuse-devel libimobiledevice-devel"
-depends="usbmuxd"
-short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
+short_desc="A fuse filesystem to access the contents of an iPhone or iPod Touch"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
+license="LGPL-2.1"
 homepage="http://libimobiledevice.org/"
-changelog="https://raw.githubusercontent.com/libimobiledevice/ifuse/master/NEWS"
-distfiles="http://github.com/libimobiledevice/ifuse/archive/${version}.tar.gz"
-checksum=2a00769e8f1d8bad50898b9d00baf12c8ae1cda2d19ff49eaa9bf580e5dbe78c
-
-pre_configure() {
-	autoreconf -fi
-}
+distfiles="http://www.libimobiledevice.org/downloads/ifuse-${version}.tar.bz2"
+checksum=a788de66fb7720c84a5a775df415f78bbfb7c467a76c732d23292c6986252add
diff --git a/srcpkgs/ipafont-fonts-otf/template b/srcpkgs/ipafont-fonts-otf/template
index 8e847fa24db..cd7a474d169 100644
--- a/srcpkgs/ipafont-fonts-otf/template
+++ b/srcpkgs/ipafont-fonts-otf/template
@@ -1,8 +1,9 @@
 # Template file for 'ipafont-fonts-otf'
 pkgname=ipafont-fonts-otf
 version=003.03
-revision=4
+revision=3
 _pkgver=${version/./}
+archs=noarch
 wrksrc="IPAfont${_pkgver}"
 hostmakedepends="unzip"
 depends="font-util xbps-triggers"
@@ -10,7 +11,7 @@ short_desc="Japanese OpenType font set"
 maintainer="Georg Schabel <gescha@posteo.de>"
 license="IPA"
 homepage="http://ipafont.ipa.go.jp/"
-distfiles="http://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont${version//./}.zip"
+distfiles="https://oscdl.ipa.go.jp/IPAfont/IPAfont${_pkgver}.zip"
 checksum=f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5
 
 font_dirs="/usr/share/fonts/OTF"
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 0b7504b9bea..d9aa7887173 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
+revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
 hostmakedepends="pkg-config perl flex"
@@ -35,8 +35,6 @@ post_install() {
 iproute2-tc-ipt_package() {
 	short_desc+=" - tc(8) IPtables support"
 	pkg_install() {
-		# m_ipt.so is symlinked to m_xt.so
-		vmove usr/lib/tc/m_ipt.so
 		vmove usr/lib/tc/m_xt.so
 	}
 }
diff --git a/srcpkgs/iwd/patches/resolvconf-default.patch b/srcpkgs/iwd/patches/resolvconf-default.patch
deleted file mode 100644
index 257615e7b92..00000000000
--- a/srcpkgs/iwd/patches/resolvconf-default.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/resolve.c	2020-09-05 09:43:41.000000000 +0200
-+++ -	2020-10-27 20:27:39.193991880 +0100
-@@ -554,7 +554,7 @@
- 			l_warn("[General].dns_resolve_method is deprecated, "
- 				"use [Network].NameResolvingService");
- 		else /* Default to systemd-resolved service. */
--			method_name = "systemd";
-+			method_name = "resolvconf";
- 	}
- 
- 	for (i = 0; resolve_method_ops_list[i].name; i++) {
---- src/iwd.config.5	2020-09-05 09:47:11.000000000 +0200
-+++ -	2020-11-01 22:37:16.517573954 +0100
-@@ -198,7 +198,7 @@
- \fBEnableNetworkConfiguration\fP and provides the choice of system
- resolver integration.
- .sp
--If not specified, \fBsystemd\fP is used as default.
-+If not specified, \fBresolvconf\fP is used as default.
- T}
- _
- T{
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index c147de23de8..13cf01a762a 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,7 +1,7 @@
 # Template file for 'iwd'
 pkgname=iwd
 version=1.9
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
  --enable-external-ell --enable-dbus-policy --enable-wired"
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index e4397c67278..f6299bc107d 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'j4-dmenu-desktop'
 pkgname=j4-dmenu-desktop
-version=2.18
+version=2.17
 revision=1
 wrksrc="${pkgname}-r${version}"
 build_style=cmake
@@ -11,4 +11,4 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/enkore/j4-dmenu-desktop"
 distfiles="https://github.com/enkore/j4-dmenu-desktop/archive/r${version}.tar.gz"
-checksum=77c5605d0c1291bcf1e13b186ea3b32ddf4753de0d0e39127b4a7d2098393e25
+checksum=78f6e5a534d8b675ee9fcdd4d5a61f18125089af2b094306fdaca72795ba5f49
diff --git a/srcpkgs/jenkins/template b/srcpkgs/jenkins/template
index b0c7390c0c6..78ab3713a97 100644
--- a/srcpkgs/jenkins/template
+++ b/srcpkgs/jenkins/template
@@ -1,6 +1,6 @@
 # Template file for 'jenkins'
 pkgname=jenkins
-version=2.249.3
+version=2.235.1
 revision=1
 build_style=fetch
 make_dirs="/var/lib/jenkins 0755 jenkins jenkins"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://jenkins.io/"
 distfiles="http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"
-checksum=8de8f11d5688c79967bc53a8124960926a90d623e5e9f03f1315ccf3e7c49702
+checksum=6375eb3a09bfde4c1fb3a7296985e225bfe2007153990a8b587e3f5f926f675d
 # Create 'jenkins' user
 system_accounts="jenkins"
 jenkins_homedir="/var/lib/jenkins"
diff --git a/srcpkgs/jmol/template b/srcpkgs/jmol/template
index c90e2d04394..6941eca561c 100644
--- a/srcpkgs/jmol/template
+++ b/srcpkgs/jmol/template
@@ -1,6 +1,6 @@
 # Template file for 'jmol'
 pkgname=jmol
-version=14.31.16
+version=14.31.13
 revision=1
 depends="virtual?java-environment"
 short_desc="Open-source Java/JavaScript-based molecule viewer"
@@ -9,7 +9,7 @@ license="LGPL-2.1-or-later"
 homepage="http://jmol.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/jmol/Jmol/Version%20${version%.*}/Jmol%20${version}/Jmol-${version}-binary.tar.gz
  http://jmol.sourceforge.net/images/Jmol_icon_128.png"
-checksum="cc481d5bd82b88a8f20e3edafff2b2c37c928d925b15294aa53eeef7b0aa5f4e
+checksum="d596d9db0acdba8d63d41e10db153e3ef823bd70507f5f3bb64efb6530053a8e
  302b24c7b8898a04efd74c12592243d05e53b0643a66daf809e72bc590bf9b9e"
 skip_extraction="Jmol_icon_128.png"
 
diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index c5c03dd9805..02d3d35bf78 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,12 +1,12 @@
 # Template file for 'jrnl'
 pkgname=jrnl
 version=2.4.5
-revision=2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-ansiwrap python3-asteval python3-colorama python3-cryptography
  python3-dateutil python3-keyring python3-parsedatetime python3-passlib
- python3-pytz python3-tzlocal python3-xdg python3-yaml python3-packaging"
+ python3-pytz python3-tzlocal python3-xdg python3-yaml"
 short_desc="Simple journal application for your command line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index a96132e145e..0fbdb69905c 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,10 +1,10 @@
 # Template file for 'json-glib'
 pkgname=json-glib
-version=1.6.0
-revision=1
+version=1.4.4
+revision=3
 build_style=meson
 build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
+configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73
+checksum=720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47
 
 # Package build options
 build_options="gir"
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 3be876d20fd..25e4958c49f 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.23.9
+version=0.23.1
 revision=1
 build_style=go
 go_import_path="github.com/derailed/k9s"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://k9scli.io/"
 distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=9608b16b60ec6b39b7a3de1ab5bb75fca00d22844bb9c81107eace65302c7038
+checksum=f2a54832f9d596e43e7936a908aa9d2d1e6f6c249ecf24f59132fd3fe14da319
diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index 33dcbc5b500..a6a7f56346c 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.08.3
+version=20.08.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=420d11c6a507e73543f48d8debcc467ce756130873c9928322474455387dcc00
+checksum=6678ee7d394b69a37e6a220a6cba3804f999997da5803da4bab1d8f329ff30fe
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index 69e74582848..4550de2bfe3 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.08.3
+version=20.08.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=d70d9bb72f12eee5eb13ae16112256eaf588940138778fdb991ac8bf8c19fbee
+checksum=c719d7840ab118ff591e75e12869afc3118e5cdeb5c0415eba5b1f6993664c90
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index 928c77afc5d..ffce4b86d97 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=20.08.3
+version=20.08.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=c65c3746b13c44ae6a05bfbb213882b9d3ebf608748e20696df50a49fc8830c5
+checksum=0398a37f412eb03b5cbf2488ce7e0c38a069f1806bda4ea9bfce4fc67311a9a6
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 2f4fe646433..9231d57dce3 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=20.08.3
+version=20.08.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=e9b7a9b11ae54a387b5a6d6f4253f9da7f63972fe2928d7fa280d969638dfdd4
+checksum=718e8230edfa16f93f54380c4e214a0f25f8a398fe74ad23f12b7dcffae419d0
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 69502cdda7d..cf32c928d1b 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=20.08.3
+version=20.08.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=3aaf99c11dcb45a27d5e89a514859b4c92082b26fcf5709783b8c8cbd237409e
+checksum=e6b84a323a21ae7975ccc07154bcdc6eef1bc92818b800cfc5d546ada7f0387c
 python_version=2
diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 3e324b16808..1bc63662469 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=20.08.3
+version=20.08.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=fc422e1c00c743fc0235a9ad9c53b8037e7a7e7862dce38ea49ef2b61f815ec4
+checksum=fccae5166b627f654412344d0090000ecd270af54b0cedb8648e35af26369cae
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index bef8382eaf7..0c9e2aa004a 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=20.08.3
+version=20.08.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=d260716e3e7485f544f9ac1ce29f716418d79105dc50fc8a806abbf4bcd63cde
+checksum=ce72bb7c48606b0611cfe46a545224cca131d34a4b678c86d9ac473071833f83
diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 3a3dbf77db2..22b23c37b4c 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.08.3
+version=20.08.2
 revision=1
 build_style=meta
 depends="
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 98026cd5e27..27f84cd9374 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.08.2
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
@@ -15,5 +15,5 @@ maintainer="Yuxuan Shui <yshuiv7@gmail.com>"
 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=6d43e38620987de1ddcfdfa7d4e6e31ff383b806139ba02e69a99c3ddfb4ee67
 python_version=3
diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index 6dad06ea807..cdef703f357 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.08.2
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -17,7 +17,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=9f8f3636f65f42a73fd1a97e29f8493fbcb8297ca755852eae93258ce12ceda0
+checksum=535df45a148f0f94271e045ef0c93575fded83da7a2b727aeaf90e61e1d7c418
 
 # needed for mlt to work on musl
 CXXFLAGS="-DHAVE_LOCALE_H=1"
diff --git a/srcpkgs/kdepim-apps-libs/template b/srcpkgs/kdepim-apps-libs/template
index 199218eb068..2844d0ca8bb 100644
--- a/srcpkgs/kdepim-apps-libs/template
+++ b/srcpkgs/kdepim-apps-libs/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-apps-libs'
 pkgname=kdepim-apps-libs
-version=20.08.3
+version=20.08.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/kdepim-apps-libs-${version}.tar.xz"
-checksum=6febbbcccc0b526e62c0b7e3c62035649e6b55617d6a33ef6151925dd30d3c22
+checksum=8c3ebdf7072d3a5a6ea2921697b28aa27e51ba43db152ea83a07b4b13c282434
 
 kdepim-apps-libs-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 0efb79ba88d..b39950525c4 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.08.3
+version=20.08.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"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2b3a82d0d87da6b8df3d263854aa272a0b4b3038cb7c3edf3e27e43730ffe27f
+checksum=3b475dfd394d5c09991eb4e1f0ddb3e2aa1f586ed75aa7961b159ef712d80132
 
 post_install() {
 	vlicense COPYING.agpl3 COPYING.agpl3
diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index e9c4fc0e992..bf4cccc2915 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,14 +1,15 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=20.08.3
+version=20.08.1
 revision=1
 build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
  qt5-host-tools qt5-qmake gettext"
 makedepends="kio-devel"
 short_desc="Utility for displaying dialog boxes from shell scripts"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+maintainer="Denis Revin <denis.revin@gmail.com>"
 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=f3afccffa704361d70a43a0914d75854324c1b551887c754945fc9654e30d44e
+checksum=089e8a8e85a9021b830e9b8a19ecb1999781915a716c9c2b3c99894a5d1c8dcf
diff --git a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
deleted file mode 100644
index 75ef1231f93..00000000000
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aad04fa1c1d953094d570fbb26d8d015ae0e4462 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 6 Nov 2020 21:17:30 +0100
-Subject: [PATCH] fix-tests
-
-
-diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
-index 54df341..c07a310 100644
---- src/kbookmarkmodel/tests/CMakeLists.txt
-+++ src/kbookmarkmodel/tests/CMakeLists.txt
-@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- ###### kbookmarkmodeltest ######
- 
- set(kbookmarkmodeltest_SRCS kbookmarkmodeltest.cpp)
--ecm_add_test(${kbookmarkmodeltest_SRCS}
--    TEST_NAME kbookmarkmodeltest
--    LINK_LIBRARIES kbookmarkmodel_private KF5::Bookmarks Qt5::Test
-+add_executable(kbookmarkmodeltest ${kbookmarkmodeltest_SRCS})
-+add_test(
-+    NAME kbookmarkmodeltest
-+    COMMAND kbookmarkmodeltest
-+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-+target_link_libraries(kbookmarkmodeltest kbookmarkmodel_private KF5::Bookmarks Qt5::Test)
-+
--- 
-2.29.2
-
diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 777f0df739a..3cba9c4958a 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=20.08.3
+version=20.08.1
 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=c811f887a244ee6b90fec176a1a88490fa8ef6bc509bd960928d3eb961b90a55
+checksum=8bfedffae0332dbfb611d25f3178ab7babe374155cce7c44e1aaa841934c3123
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen
diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 872071b3aab..2fe0d2ef5d9 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=20.08.3
+version=20.08.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=b94d9bcc6c72a93d77cae70a1d39449cb6edde2c25c57b78c1595d810daf2582
+checksum=2381bbe7793a666fa9463aead1246dc4244409f68375f6d75e1423be15b42d74
diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index e35d1d675e7..dd72407037e 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=20.08.3
+version=20.08.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=b9b86fce869a1f084bf1af4917228acb34dc99cb0079a7e79908e8c7b92256f5
+checksum=36051a4352a05dd9b74b4e325c0e16e30d6bd8b48d6c3d13980b39a77aab4e2d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 5bbbf744e99..4800ead0cc1 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=20.08.3
+version=20.08.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=9aae7d4a924bbaa4a927821eb65bcf2c30204d6d3fd4f432a678704fdc6e7e6e
+checksum=17a1fd47d91289519cafb12c0d917b4775496ada447cb6f4ba56dc42446152ec
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 01537b410ab..e7fa3cc7696 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=20.08.3
+version=20.08.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=1071a2b93e39aba38509ff1759f4c818e54b43819fd44e323cf7d03d5dfb71b7
+checksum=401832d384e47ea6daf310f7e823ae6b8a55bc117b7570bd4bf36261d01587f5
diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 4a5a387fff4..f993ee4ce87 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=20.08.3
+version=20.08.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=2fd784c6c6b5f11220737a911cb562a481f70fc70258d8bce4dfdb87277dea9a
+checksum=bda4f4b4e94481b70cec270655c0fd2888da51106d80c0388ae5c0dc5d36e092
 
 kimap-devel_package() {
 	short_desc+=" - development"
diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 9ae3e34f661..ee3e13874d0 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.08.3
+version=20.08.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=dea97644341debb20838811352a5a6f629c2949398a4c0a7dea83667f5b6e05e
+checksum=71047e9f8e5ad9317cc3dbf1de2d121f322b5d968d3685351ef0d2aabe2f46ca
diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 46675e77fc5..be067d5bef3 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=20.08.3
+version=20.08.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=c302bcc6e19e91d8797289e9a7063dda1597b415977d88450523a765f5570ac6
+checksum=dfc8bd59d837766e741b33cf8486256b7bd5ffc33ff2aab240d47b4766ec8489
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 6bb6b5810b6..cbdd45fb057 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=20.08.3
+version=20.08.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=932017734a5a34eaf7d66f768ccb1448cac266a145fc0e08a23b248bc77f8478
+checksum=8e933e8ebbf0ab956e2a251312e3d4e027848dc2f2b4e8a7c7250b8fdf10ca05
diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 48b6370cba7..d1bd4bd9c6d 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.08.3
+version=20.08.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=9f49aac1e517a406cea1b19702566a03ef86e2a208fd4868eecf35015451556d
+checksum=7cdb9b60b1a646f0c5c0d0e7dfbe357a9f66bb305afbccbb4b421ee6f6941df8
diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 3fd0db71f29..ae9691012c3 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=20.08.3
+version=20.08.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=0f3ea0772ec3be98f24cba3abef121b4635a156d3995c227ba8b5840f9d1a93c
+checksum=ff179b89836236174cd587ce4ea2a4320e58345d45582cb157186cfbb01e58f2
diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 54797e25e8f..c3abb81d263 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=20.08.3
+version=20.08.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=dfd871327761038c0b9a9c14fbd421ecd707d8419e2177b4f69b3f3b2416a51c
+checksum=8b12836b1ca0243819680cba73c809c491c5e7a8d1ea9d9dc23e7338aed69a0c
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index 2d9f583ea38..07512b22609 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=20.08.3
+version=20.08.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=0b2c32278fd4a66f80eb6021258591c7fa75200d64278f97a7130fcb22e3f546
+checksum=4fa1ad98368130dcdc8ad71dba3084c489130b1e8fc4a2b119ffc6f56595ba73
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index 231ca84699f..e8efb1100be 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=20.08.3
+version=20.08.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=db8cf667d803bc9672f927b11e755d0396f1514342a27ba2039bd42dc2e9abd9
+checksum=9f23e2814e62ae6c4a67fd3223315ef875776f9d098b4d11c7d06a726a725435
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 2ec68cff7d1..a5c7df48c79 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=20.08.3
+version=20.08.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=93b86accbbd37e5ecf7c780b619c9802616dec1573c43e21041d57acdc48f501
+checksum=73453f02a72384382fd7449215189e22b5e1600e9ef0c9cc910f3fddd09beb85
diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index c010958ebea..7281ffd6f55 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=20.08.3
+version=20.08.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=367e1e793a2e6cb49854213a472065b5ef297a6e9ba53c222c087491eb410b7f
+checksum=b62dda6e8b5bb85cc814f7244e39806e38c266be1bf3090eb6de59c8141fc1d4
diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 3379c4b1b1b..eff5e54424f 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=20.08.3
+version=20.08.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=3047607a89e9f840e6013dae2c0f6a5d46d45781201c9499ee7994b2ac7dc434
+checksum=fbcd875a4a407d9b1e5a637d4947bacfb50f39e10af3327f30fdbb953528aae0
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 11108a461fd..ba3aa008a01 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=20.08.3
+version=20.08.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=8c467048639e6c078d8142d500bb9720972534beee12e19b9b6dc1c4d9163565
+checksum=4e52cb2c9e35e90fe77bfb23bd10c1931c56b11e3fec06c215730d60c47e8550
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 59a2ba13ebf..cf49ecb57e8 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=20.08.3
+version=20.08.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.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=5d7a03e745d324210a94099188e64c42203a8e3a27d5854d211675538e6f514a
+checksum=af08ac7666f1ba7c407205f32aaaf015329621247502e80d8df4abe103148951
 replaces="konsole5>=0"
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 5988512f306..02f59d4d922 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=20.08.3
+version=20.08.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=43a2c396809bd5f82bdf84b152fd72840ff00f6f38abe913a91a012d494002aa
+checksum=72d53dbea9db0b1f5654e13c18b4da3d256c6b9d08dfe4581cdf73e3552d2a07
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 7b947fcb926..137b1fce231 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=20.08.3
+version=20.08.2
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,7 +12,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=493b20d53806cbb1bd656817ef139de80197ec585bb097c4bd28c23b655aa4c5
+checksum=e4aaed4e876212a926a05d252dab9d01f240d829e383c6072e168a4f78e6d446
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen
diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 1d0585023ef..67f56bb42a9 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=20.08.3
+version=20.08.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=a298386e53e78a09da2f3916ab5ebaf538bf621bd77574d41f72cb05d72f99d4
+checksum=2dfbcdd53669c812234346b4d31b61af9c510bb4cb0b9912decea8d3c4d406a6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"
diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 0e3b73758ca..5b985b01a2d 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=20.08.3
+version=20.08.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=c3b1f995d88949e3d585a0b152f784f56a88950c025aa83de0c0afc3f246fb50
+checksum=2ba593a65c143cb56a3030f7ee0cced2df7c7e9431cebf1ae93be51c68b4c3b4
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 1898888603e..64e74dcf935 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.0
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -19,7 +19,7 @@ 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=fc5f8376e4712c26178688284aeaf2fa1d48473535ed5b214297178a1fe9278f
 python_version=3
 replaces="calligra-krita>=0"
 
diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index dac0f721316..4304d7dcfe6 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=20.08.3
+version=20.08.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=891cf4da1bcc5e49b123eb6ce48896c1e1f462151945468f6c0e37c6984214ee
+checksum=ede45d9cdf1b514fb20ed3a97877689ec75904438b94735706eb638ba01ca778
diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 5ae86a35d93..d5c463e12bc 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=20.08.3
+version=20.08.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=cc2b45e7a686c6116d91a2e849ab40739dd2f1077ae8cd6574a27a5df7a72cdd
+checksum=5f51e0c025b192719709ae763feeac94df893007b62b5a69b7b95ae9f2fdd8ee
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 11dd28964c0..c0d00977822 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=20.08.3
+version=20.08.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=2285996b8b1447b94d5d4011a4f9e9d117702f8c4fe873fb5d914d486c15cc85
+checksum=63c6a520b63f148de2e3996250a2fef22e1a3ce18e744a699ae21de96a2c4e53
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen
diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 2f7c9df96f2..413322d87ee 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=20.08.3
+version=20.08.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=c7116b9c55dd6fcb19750a3f34139ce9bc1d6c6df51014fbced61e25341a47ee
+checksum=d8e69fdb124e8689c72e4b9fe39226cc49b1ca990478fbb68e02b37f0cd861ac
diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 8919da59a3a..0de3c468322 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=20.08.3
+version=20.08.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=a406de0492b97ca7e9454e79286db14f97be8d68c7f928439a4294e8b11e49d2
+checksum=ab73736e386c2b52a14fb56f1184479ed1c83c0571e9e8518d2b94b1dcd2e47d
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index dc60e189d41..664bb78a429 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=20.08.3
+version=20.08.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=040df573c248b430324cd0a71115ee228baf11ef9343887bfc24fdcdb7393b66
+checksum=ca9bf47b2ec34744492f218c922b10d613b19fbbd2c75b6ddba157eef21337c7
diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 5d3f0240e74..4065b3a35c4 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=20.08.3
+version=20.08.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=b1bc0c7517200c6a7def70139eab2d89e531c11d79af3c4a41548e2e68df07d0
+checksum=7950e250c5351a9b8e3b36165fa2003baa044bb2d3553a32360000a322bddad8
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index f62f22050fe..a77409fc3f5 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,17 +1,17 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.23.7
+version=0.23.6
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 hostmakedepends="git"
 depends="git"
 short_desc="Simple terminal UI for git commands"
-maintainer="Nathan Owens <ndowens@artixlinux.org>"
+maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=0a5284d4ed513cd3094e1e4871da8b99c7b1d8b04a8aaaf4dc77bb932f630f1c
+checksum=b2383a70e54a67382b0f052149891d3d0f3e1eba952a0fa5009214c6591dfc6b
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/libaspell b/srcpkgs/libaspell
deleted file mode 120000
index 2954cad5043..00000000000
--- a/srcpkgs/libaspell
+++ /dev/null
@@ -1 +0,0 @@
-aspell
\ No newline at end of file
diff --git a/srcpkgs/libassuan/template b/srcpkgs/libassuan/template
index 11c7f184e75..5a0daa6c247 100644
--- a/srcpkgs/libassuan/template
+++ b/srcpkgs/libassuan/template
@@ -1,7 +1,7 @@
 # Template file for 'libassuan'
 pkgname=libassuan
-version=2.5.4
-revision=1
+version=2.5.3
+revision=2
 build_style=gnu-configure
 configure_args="--with-libgpg-error-prefix=${XBPS_CROSS_BASE}/usr"
 makedepends="libgpg-error-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libassuan"
 distfiles="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2"
-checksum=c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0
+checksum=91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702
 
 libassuan-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index a8f99d7e6df..1cb8560b2b7 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
 # Template file for 'libcap'
 pkgname=libcap
-version=2.45
+version=2.44
 revision=1
 bootstrap=yes
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://sites.google.com/site/fullycapable/"
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286
+checksum=92188359cd5be86e8e5bd3f6483ac6ce582264f912398937ef763def2205c8e1
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
@@ -33,8 +33,6 @@ libcap-devel_package() {
 		vmove usr/include
 		vmove usr/lib/libcap.a
 		vmove usr/lib/libcap.so
-		vmove usr/lib/libpsx.a
-		vmove usr/lib/libpsx.so
 		vmove usr/share/man/man3
 		vmove usr/lib/pkgconfig
 	}
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 36ec6d3fa67..dcf4ac6a69d 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
 # Template file for 'libdrm'
 pkgname=libdrm
-version=2.4.103
+version=2.4.102
 revision=1
 wrksrc="drm-libdrm-${version}"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://dri.freedesktop.org/"
 distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz"
-checksum=9235bcbcaca43372151ce82af7c1f83aec5e6f371153cd7957a117f99098713f
+checksum=22e7ec53227386fe7daf7c1e52a65d51f480100bb80c5628a35d87feb9b014a0
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*) configure_args+=" -Dvc4=true";;
diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template
index c5ab025a6fb..1936a869e5d 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,6 +1,6 @@
 # Template file for 'libdwarf'
 pkgname=libdwarf
-version=20201020
+version=20200825
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --enable-dwarfgen"
@@ -10,7 +10,7 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="LGPL-2.1-only"
 homepage="https://www.prevanders.net/dwarf.html"
 distfiles="https://prevanders.net/${pkgname}-${version}.tar.gz"
-checksum=1c5ce59e314c6fe74a1f1b4e2fa12caea9c24429309aa0ebdfa882f74f016eff
+checksum=c42786a085bf244c8a1b0238b57f42f6cfc582baebe5e174ea62eb1a81f32103
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="elfutils-devel"
@@ -33,6 +33,7 @@ libdwarf-devel_package() {
 }
 
 libdwarf-doc_package() {
+	archs=noarch
 	short_desc+=" - documentation"
 	pkg_install() {
 		for i in README NEWS libdwarf/*.pdf ; do
diff --git a/srcpkgs/liberation-fonts-ttf/template b/srcpkgs/liberation-fonts-ttf/template
index 70de747a721..47663b2b29d 100644
--- a/srcpkgs/liberation-fonts-ttf/template
+++ b/srcpkgs/liberation-fonts-ttf/template
@@ -1,7 +1,8 @@
 # Template file for 'liberation-fonts-ttf'
 pkgname=liberation-fonts-ttf
 version=2.1.1
-revision=2
+revision=1
+archs=noarch
 wrksrc=${pkgname%-*}-${version}
 build_style=gnu-makefile
 hostmakedepends="fontforge fonttools"
diff --git a/srcpkgs/libfm-qt/template b/srcpkgs/libfm-qt/template
index afc3dbb4eb6..01a9c61a2c7 100644
--- a/srcpkgs/libfm-qt/template
+++ b/srcpkgs/libfm-qt/template
@@ -1,17 +1,17 @@
 # Template file for 'libfm-qt'
 pkgname=libfm-qt
-version=0.16.0
+version=0.15.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-x11extras-devel libexif-devel
  menu-cache-devel"
 short_desc="Core library of PCManFM-Qt"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/libfm-qt/releases/download/${version}/libfm-qt-${version}.tar.xz"
-checksum=7796e74cf372d7ae3289f5d584f2e0d7bd29020b4e0d79308a157c970860f7b4
+checksum=7a6793672114735a67b6a65687922c48f6e9633430e6aba70ba386532262930c
 replaces="libfm-qt5>=0"
 
 libfm-qt-devel_package() {
diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..01aef880487 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,11 +1,11 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
-hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
-makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
+hostmakedepends="intltool pkg-config"
+makedepends="gdk-pixbuf-devel libimobiledevice-devel libplist-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
@@ -13,14 +13,6 @@ homepage="http://www.gtkpod.org/libgpod/"
 distfiles="${SOURCEFORGE_SITE}/gtkpod/$pkgname-$version.tar.bz2"
 checksum=638a7959d04e95f1e62abad02bd33702e4e8dfef98485ac7d9d50395c37e955d
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/g'
-}
-
-pre_configure() {
-	autoreconf -fi
-}
-
 libgpod-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 258313e6d7d..35e394b4ec8 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=20.08.3
+version=20.08.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=190298a460bc1fcc386c58de7cb1b4437934e5061faef94026f8c8b0b2e8bb25
+checksum=4c0a2eb073ef42a26813b93bd76aaa9e26a040a966329e6e3cf371d7de1e55f7
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index a0b23823b21..16e75648a1d 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.3.5
+version=0.3.4
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,13 +15,13 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libgusb"
 changelog="https://raw.githubusercontent.com/hughsie/libgusb/master/NEWS"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
-checksum=5b2a00c6997cc4b0133c5a5748a2e616e9e7504626922105b62aadced78e65df
+checksum=581fd24e12496654b9b2a0732f810b554dfd9212516c18c23586c0cd0b382e04
 
 build_options="gir vala"
 build_options_default="gir vala"
 
 libgusb-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/libhandy/update b/srcpkgs/libhandy/update
index 376af7fbb5c..bbea94b75ae 100644
--- a/srcpkgs/libhandy/update
+++ b/srcpkgs/libhandy/update
@@ -1 +1,2 @@
-ignore="*"
+site="https://source.puri.sm/Librem5/libhandy/tags"
+pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'
diff --git a/srcpkgs/libimobiledevice/patches/CVE-2016-5104.patch b/srcpkgs/libimobiledevice/patches/CVE-2016-5104.patch
new file mode 100644
index 00000000000..f9b5e12a4fd
--- /dev/null
+++ b/srcpkgs/libimobiledevice/patches/CVE-2016-5104.patch
@@ -0,0 +1,32 @@
+From df1f5c4d70d0c19ad40072f5246ca457e7f9849e Mon Sep 17 00:00:00 2001
+From: Joshua Hill <posixninja@gmail.com>
+Date: Tue, 29 Dec 2015 22:27:17 +0100
+Subject: [PATCH] common: [security fix] Make sure sockets only listen locally
+
+---
+ common/socket.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common/socket.c b/common/socket.c
+index b276864e..e2968a64 100644
+--- common/socket.c
++++ common/socket.c
+@@ -172,7 +172,7 @@ int socket_create(uint16_t port)
+ 
+ 	memset((void *) &saddr, 0, sizeof(saddr));
+ 	saddr.sin_family = AF_INET;
+-	saddr.sin_addr.s_addr = htonl(INADDR_ANY);
++	saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ 	saddr.sin_port = htons(port);
+ 
+ 	if (0 > bind(sfd, (struct sockaddr *) &saddr, sizeof(saddr))) {
+@@ -329,7 +329,7 @@ int socket_accept(int fd, uint16_t port)
+ 
+ 	memset(&addr, 0, sizeof(addr));
+ 	addr.sin_family = AF_INET;
+-	addr.sin_addr.s_addr = htonl(INADDR_ANY);
++	addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ 	addr.sin_port = htons(port);
+ 
+ 	addr_len = sizeof(addr);
+
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..4e99e7a9cd9 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,31 +1,26 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
-version=1.3.0
-revision=1
+version=1.2.0
+revision=17
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
- libusb-devel libplist-devel libusbmuxd-devel"
+makedepends="python3-devel libglib-devel libressl-devel libusb-devel
+ libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
-homepage="https://libimobiledevice.org"
-changelog="https://raw.githubusercontent.com/libimobiledevice/libimobiledevice/master/NEWS"
+homepage="https://github.com/libimobiledevice/libimobiledevice"
 distfiles="https://github.com/libimobiledevice/libimobiledevice/archive/${version}.tar.gz"
-checksum=acbfb73eabee162e64c0d9de207d71c0a5f47c40cd5ad32a5097f734328ce10a
+checksum=8ba1ea817691b3548b83371f8ec22d73d1e37f8fda7c899ac9c7121d924ca830
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="ac_cv_sys_file_offset_bits=yes ac_cv_sys_large_file=yes"
 fi
 
-post_patch() {
-	# LibreSSL does not provide this function
-	vsed -e '/SSL_CTX_set_security_level/d' -i src/idevice.c
-	vsed -e 's,-L$(libdir),,g' -i cython/Makefile.am
-}
-
 pre_configure() {
-	export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+	sed -i 's,SSLv3_,SSLv23_,g' src/idevice.c
+	sed -i 's,-L$(libdir),,g' cython/Makefile.am
+	export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
 	export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}"
 	autoreconf -fi
 }
diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 9f7e3507cc8..78439cf5dae 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=20.08.3
+version=20.08.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=2fc7ccc64a9937177eb07e1a839aa0463b772425a001ddb4fd0057988e866664
+checksum=545cf54ac454845c524ba7cd7ec289ac952fa1ce2bbae01411ba71c66a5ed08a
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index f104db8c392..e74b4d627ac 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=20.08.3
+version=20.08.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=e7b62691114b57c6175dd9eace0d0660ba52208a1e82555eebb1668d538a06a0
+checksum=6fbf1a5ca5a439fabb01648cde4b57e1f3de2372b7f3b56ccae03f653490f1b2
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 686c23bb453..5c6c2f37b7d 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=20.08.3
+version=20.08.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=c60dd7e0605b96baa34f453160680c6923f7e4eda5eb8b60beb8e9b20578e7ec
+checksum=3558c9af95c22bb4ce0ceeec483fada9e8e9f27de4ac34ffe44a4eb3b6d21101
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index 8459af722db..b9c8cc07d31 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=20.08.3
+version=20.08.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=d4e5c35d8d60ec46d160830197d05e06a343da24d5541eb2a0ff75c30f4903d2
+checksum=793c4d11bb1b60beca7b25a2427650b3f358364c55be022dfd4a7ccfd889578d
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 444c6d19c32..93def059594 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=20.08.3
+version=20.08.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=8a2233497b07e768c4a4095c4333fa975042f6e9ba17ae0e3d66ed9c7672afce
+checksum=f3fb015e8b8ac92c138e8a59e8e8b9333500e0ea314180cc1ad14e31248312df
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) broken="depends on qt5-webengine";;
diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 8744f55f735..bc94bce3a0d 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=20.08.3
+version=20.08.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=4b62196e4a44bad865abf65b0cbd162a74ee125af70797bfc546a4da8f5fb8ac
+checksum=87ffa30b23779313a94953afe57d1b19515c3a2f311a2dea6449c9d96b09e5b1
 conflicts="libkipi"
 
 libkipi5-devel_package() {
diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 585d4645cdb..1669ede401f 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=20.08.3
+version=20.08.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=e9e0a806bbb7b3ac831e6d5705e7c478c7a6c5222d47a1aa7933668b0955cdb4
+checksum=34537b35e22cef85650ae6f9bf197518bb5a59e9614d6d86ba86f085fddd97c4
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 91c3bb0eb5e..094afb76cc0 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=20.08.3
+version=20.08.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=68714068d3c8051e0c477cb349d913843fe9bb6184dcffb10f5f7109dc94605a
+checksum=91b0b72d5c4e2ddd863636cca299660bfbb5b7a55773cbc51000fe9c1ca91a98
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index db6a0d6c8d8..57b1feaf9dd 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=20.08.3
+version=20.08.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=55e944b35a466dc05c2a96bd424620445d8b685a77ef1805c55a7f653d6e172e
+checksum=589e4dc27d1d91d8c16879fa99aab45f3847a74e3e9357e3e037503e5515ee2e
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
diff --git a/srcpkgs/liblouis/template b/srcpkgs/liblouis/template
index 74d925a3ee4..303cb4f2026 100644
--- a/srcpkgs/liblouis/template
+++ b/srcpkgs/liblouis/template
@@ -1,9 +1,10 @@
 # Template file for 'liblouis'
 pkgname=liblouis
-version=3.15.0
-revision=1
+version=3.13.0
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ucs4"
+pycompile_module="louis"
 hostmakedepends="pkg-config help2man python3-devel"
 makedepends="python3-devel"
 depends="python3"
@@ -12,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="http://liblouis.org/"
 distfiles="https://github.com/liblouis/liblouis/releases/download/v${version}/liblouis-${version}.tar.gz"
-checksum=3a381b132b140747e5fcd47354da6cf43959da2167f8bc598430bbac51224467
+checksum=2803b89a2bff9f02032125fa7b7d0a204a60d8d14f232242344b5f09535e9a01
 disable_parallel_build=yes
 
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template
index bd195b98fb5..bdeb5f98d24 100644
--- a/srcpkgs/liblxqt/template
+++ b/srcpkgs/liblxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'liblxqt'
 pkgname=liblxqt
-version=0.16.0
+version=0.15.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools
@@ -8,11 +8,11 @@ hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools
 makedepends="kwindowsystem-devel libqtxdg-devel libXScrnSaver-devel
  polkit-qt5-devel"
 short_desc="Core utility library for all LXQt components"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/liblxqt/releases/download/${version}/liblxqt-${version}.tar.xz"
-checksum=8dcf423978a22fc9bc43ca5fee31586632b0fd48e650ecdc863ac19114c7b318
+checksum=4991673741df2f731e3c24e65bdc0e91c239ebdf399f4c4793b75e79fd13e655
 
 liblxqt-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template
index b569bbd4dd0..5589eeb4c22 100644
--- a/srcpkgs/libmatroska/template
+++ b/srcpkgs/libmatroska/template
@@ -1,6 +1,6 @@
 # Template file for 'libmatroska'
 pkgname=libmatroska
-version=1.6.2
+version=1.6.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dl.matroska.org/downloads/libmatroska/"
 distfiles="https://dl.matroska.org/downloads/libmatroska/libmatroska-${version}.tar.xz"
-checksum=bc4479aa8422ab07643df6a1fa5a19e4bed4badfd41ca77e081628620d1e1990
+checksum=fec89cebd500807f7fd14b56c14733f11045fa2a21398ff6f6c5c0e3e01b4033
 
 libmatroska-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index 5bf05cd6bbe..109aa23233b 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'libmtp'
 pkgname=libmtp
-version=1.1.18
+version=1.1.17
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-udev=/usr/lib/udev"
@@ -8,10 +8,10 @@ hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel libusb-devel"
 short_desc="Library for Microsoft's Media Transfer Protocol (MTP)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
 homepage="http://libmtp.sourceforge.net"
+license="LGPL-2.1-or-later"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0
+checksum=f8a34cf52d9f9b9cb8c7f26b12da347d4af7eb904c13189602e4c6b62d1a79dc
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX needs host mtp-hotplug
@@ -20,9 +20,12 @@ fi
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
-		vsed -e "s,\(util/mtp-hotplug \),mtp-hotplug ,g" -i Makefile.in
+		sed -e "s,\(util/mtp-hotplug \),mtp-hotplug ,g" -i Makefile.in
 	fi
 }
+post_install() {
+	sed -i "/^Unable to open/d" ${DESTDIR}/usr/lib/udev/rules.d/69-libmtp.rules
+}
 
 libmtp-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template
index 0c061b1c633..506ed7e4042 100644
--- a/srcpkgs/libnpupnp/template
+++ b/srcpkgs/libnpupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libnpupnp'
 pkgname=libnpupnp
-version=4.0.13
+version=4.0.12
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="BSD-3-Clause"
 homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz"
-checksum=020c9c025902950e423316418eecb82ff4e70e4e63c80df6509a10b8bf34dadb
+checksum=746ab66f19b96ce539c118ad6a0a2f3bee7d472f30ed075e0b385ddc9b33ae55
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libopenal/patches/cross.patch b/srcpkgs/libopenal/patches/cross.patch
new file mode 100644
index 00000000000..80f334a0076
--- /dev/null
+++ b/srcpkgs/libopenal/patches/cross.patch
@@ -0,0 +1,35 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -1089,19 +1089,11 @@ ELSE()
+     SET(NATIVE_BIN_DIR  "${OpenAL_BINARY_DIR}/native-tools")
+     FILE(MAKE_DIRECTORY "${NATIVE_BIN_DIR}")
+ 
+-    SET(BIN2H_COMMAND  "${NATIVE_BIN_DIR}/bin2h")
+-    SET(BSINCGEN_COMMAND  "${NATIVE_BIN_DIR}/bsincgen")
+-    ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
+-        COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}"
+-        COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
+-        COMMAND ${CMAKE_COMMAND} --build . --config "Release"
+-        WORKING_DIRECTORY "${NATIVE_BIN_DIR}"
+-        DEPENDS "${NATIVE_SRC_DIR}/CMakeLists.txt"
+-        IMPLICIT_DEPENDS
+-            C "${NATIVE_SRC_DIR}/bin2h.c"
+-            C "${NATIVE_SRC_DIR}/bsincgen.c"
+-        VERBATIM
+-    )
++    set(IMPORT_EXECUTABLES "native-tools/ImportNativeToools.cmake" CACHE FILEPATH "POINT")
++    INCLUDE(${IMPORT_EXECUTABLES})
++
++    SET(BIN2H_COMMAND  bin2h)
++    SET(BSINCGEN_COMMAND  bsincgen)
+ ENDIF()
+ ADD_CUSTOM_TARGET(native-tools
+     DEPENDS "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
+--- native-tools/CMakeLists.txt
++++ native-tools/CMakeLists.txt
+@@ -27,3 +27,5 @@ target_compile_definitions(bsincgen PRIVATE ${CPP_DEFS})
+ if(HAVE_LIBM)
+     target_link_libraries(bsincgen m)
+ endif(HAVE_LIBM)
++
++export(TARGETS bin2h bsincgen FILE  ${CMAKE_BINARY_DIR}/ImportNativeToools.cmake)
diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template
index c89016a3584..29180831583 100644
--- a/srcpkgs/libopenal/template
+++ b/srcpkgs/libopenal/template
@@ -1,7 +1,7 @@
 # Template file for 'libopenal'
 pkgname=libopenal
-version=1.21.0
-revision=1
+version=1.20.1
+revision=2
 wrksrc="openal-soft-${version}"
 build_style=cmake
 configure_args="-DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://openal-soft.org/"
 distfiles="http://openal-soft.org/openal-releases/openal-soft-${version}.tar.bz2"
-checksum=2916b4fc24e23b0271ce0b3468832ad8b6d8441b1830215b28cc4fee6cc89297
+checksum=b6ceb051325732c23f5c8b6d37dbd89534517e6439a87e970882b447c3025d6d
 
 build_options="sndio"
 build_options_default="sndio"
@@ -26,6 +26,12 @@ pre_configure() {
 	esac
 }
 
+pre_configure() {
+	cd native-tools
+	CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= cmake .
+	make ${makejobs}
+}
+
 post_install() {
 	rm -f ${DESTDIR}/usr/share/openal/alsoftrc.sample
 	vsconf alsoftrc.sample
diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 39017a173bc..1b49b9060cf 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,6 +1,6 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.3
+version=0.5.0
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
@@ -17,7 +17,7 @@ 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=e7282a50e17d3d4c4a6d8000d409f6234f468f8113fcb33ee4ed945d9c2f25b8
+checksum=43cba54a3f7220c3cc5baae1e2c19a5af7196bfdb95ff4d0c4979d9fbc6c837e
 conflicts="$(vopt_if libmodplug libmodplug)"
 
 post_install() {
diff --git a/srcpkgs/libplist-python3 b/srcpkgs/libplist-python3
deleted file mode 120000
index 8aeda891de2..00000000000
--- a/srcpkgs/libplist-python3
+++ /dev/null
@@ -1 +0,0 @@
-libplist
\ No newline at end of file
diff --git a/srcpkgs/libplist/libplist-python.INSTALL.msg b/srcpkgs/libplist/libplist-python.INSTALL.msg
deleted file mode 100644
index 99f471a80b8..00000000000
--- a/srcpkgs/libplist/libplist-python.INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-libvirt-python is no longer provided by Void Linux
diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template
index eb3e8773be5..97e6918af7d 100644
--- a/srcpkgs/libplist/template
+++ b/srcpkgs/libplist/template
@@ -1,23 +1,22 @@
 # Template file for 'libplist'
 pkgname=libplist
-version=2.2.0
+version=2.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="automake libtool pkgconf python3 python3-Cython"
-makedepends="python3-devel libglib-devel libxml2-devel"
+hostmakedepends="automake libtool pkgconf python-devel python-Cython"
+makedepends="python-devel libglib-devel libxml2-devel"
 short_desc="Apple Property List library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
-homepage="https://libimobiledevice.org"
-changelog="https://raw.githubusercontent.com/libimobiledevice/libplist/master/NEWS"
+homepage="https://github.com/libimobiledevice/libplist/"
 distfiles="https://github.com/libimobiledevice/libplist/archive/${version}.tar.gz"
-checksum=7e654bdd5d8b96f03240227ed09057377f06ebad08e1c37d0cfa2abe6ba0cee2
+checksum=4b33f9af3f9208d54a3c3e1a8c149932513f451c98d1dd696fe42c06e30b7f03
 
 pre_configure() {
 	sed -i 's,-L$(libdir),,g' cython/Makefile.am
-	export PYTHON_CPPFLAGS=" -I${XBPS_CROSS_BASE}/${py3_inc}"
-	export PYTHON_LDFLAGS=" -L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}"
+	export PYTHON_CPPFLAGS=" -I${XBPS_CROSS_BASE}/usr/include/python2.7"
+	export PYTHON_LDFLAGS=" -L${XBPS_CROSS_BASE}/usr/lib -lpython2.7"
 	autoreconf -fi
 	sed -i "s#\$PYTHON-config#__DOES_NOT_EXIST__#" configure
 }
@@ -25,23 +24,16 @@ pre_configure() {
 libplist++_package() {
 	short_desc+=" - C++ runtime library"
 	pkg_install() {
-		vmove usr/lib/libplist++*.so.*
+		vmove usr/lib/libplist++.so.*
 	}
 }
-
 libplist-python_package() {
-	build_style=meta
-	short_desc+=" - Python2 bindings (removed package)"
-}
-
-libplist-python3_package() {
 	lib32disabled=yes
-	short_desc+=" - Python3 bindings"
+	short_desc+=" - Python bindings"
 	pkg_install() {
-		vmove "${py3_lib}"
+		vmove usr/lib/python2.7
 	}
 }
-
 libplist-devel_package() {
 	depends="libxml2-devel libplist++>=${version}_${revision} libplist>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/libqb/template b/srcpkgs/libqb/template
index 3320b8b9dc2..9de110f7f61 100644
--- a/srcpkgs/libqb/template
+++ b/srcpkgs/libqb/template
@@ -1,11 +1,10 @@
 # Template file for 'libqb'
 pkgname=libqb
 version=2.0.0
-revision=2
+revision=1
 build_style=gnu-configure
+makedepends="libxml++-devel"
 hostmakedepends="pkg-config"
-makedepends="libxml2-devel"
-checkdepends="glib-devel"
 short_desc="High performance logging, tracing, ipc, poll"
 maintainer="Kevin Klopfenstein <kk@sudo-i.net>"
 license="LGPL-2.1-or-later"
@@ -21,9 +20,5 @@ libqb-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
-		for _file in docs/man3/*.3
-		do
-			vman "$_file"
-		done
 	}
 }
diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index 4ac9bb69f75..08805472b2d 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,16 +1,16 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
-version=3.6.0
-revision=1
+version=3.5.0
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools"
 makedepends="qt5-svg-devel"
 short_desc="Qt implementation of freedesktop.org XDG specifications"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/libqtxdg/releases/download/${version}/libqtxdg-${version}.tar.xz"
-checksum=0fefb362eac9120fccd401202f15d092a59fd1aaacfc4b885a33578cdd41cf42
+checksum=41a99b36302f5391321ed1469a05dcba9033778fb27afca03ce320fa6ee4553c
 
 libqtxdg-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/libreadline8/patches/accept-ncursesw.patch b/srcpkgs/libreadline8/patches/accept-ncursesw.patch
deleted file mode 100644
index cf61c3be36d..00000000000
--- a/srcpkgs/libreadline8/patches/accept-ncursesw.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bde0dff47d76a874bcbb5e75a74f6db83b90da5f Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Thu, 5 Nov 2020 02:41:14 +0100
-Subject: [PATCH] add support for using ncursesw pkg-config library
-
----
- aclocal.m4   | 3 +++
- configure    | 4 ++++
- configure.ac | 1 +
- 3 files changed, 8 insertions(+)
-
-diff --git aclocal.m4 aclocal.m4
-index 1413267..16775a9 100644
---- aclocal.m4
-+++ aclocal.m4
-@@ -981,6 +981,9 @@ TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libncurses; then
- TERMCAP_LIB=-lncurses
- TERMCAP_DEP=
-+elif test $bash_cv_termcap_lib = libncursesw; then
-+TERMCAP_LIB=-lncursesw
-+TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libc; then
- TERMCAP_LIB=
- TERMCAP_DEP=
-diff --git configure configure
-index c9b7ade..7d7bce0 100755
---- configure
-+++ configure
-@@ -6328,6 +6328,9 @@ TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libncurses; then
- TERMCAP_LIB=-lncurses
- TERMCAP_DEP=
-+elif test $bash_cv_termcap_lib = libncursesw; then
-+TERMCAP_LIB=-lncursesw
-+TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libc; then
- TERMCAP_LIB=
- TERMCAP_DEP=
-@@ -6363,6 +6366,7 @@ case "$TERMCAP_LIB" in
- -ltinfo)  TERMCAP_PKG_CONFIG_LIB=tinfo ;;
- -lcurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
- -lncurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
-+-lncursesw) TERMCAP_PKG_CONFIG_LIB=ncursesw ;;
- -ltermcap) TERMCAP_PKG_CONFIG_LIB=termcap ;;
- *) TERMCAP_PKG_CONFIG_LIB=termcap ;;
- esac
-diff --git configure.ac configure.ac
-index b73e37b..db788a6 100644
---- configure.ac
-+++ configure.ac
-@@ -202,6 +202,7 @@ case "$TERMCAP_LIB" in
- -ltinfo)  TERMCAP_PKG_CONFIG_LIB=tinfo ;;
- -lcurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
- -lncurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
-+-lncursesw) TERMCAP_PKG_CONFIG_LIB=ncursesw ;;
- -ltermcap) TERMCAP_PKG_CONFIG_LIB=termcap ;;
- *) TERMCAP_PKG_CONFIG_LIB=termcap ;;
- esac
--- 
-2.29.2
-
diff --git a/srcpkgs/libreadline8/patches/no-rpath-and-link.patch b/srcpkgs/libreadline8/patches/no-rpath-and-link.patch
deleted file mode 100644
index 15eadf1524c..00000000000
--- a/srcpkgs/libreadline8/patches/no-rpath-and-link.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 78a3bfc099027df04d01012b91e707c99eaf1c8e Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Thu, 5 Nov 2020 02:49:21 +0100
-Subject: [PATCH] drop rpath and link against the termcap library
-
----
- configure          | 8 ++++----
- configure.ac       | 8 ++++----
- support/shobj-conf | 2 +-
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git configure configure
-index 7d7bce0..eff4e76 100755
---- configure
-+++ configure
-@@ -6823,10 +6823,10 @@ if test -f ${srcdir}/support/shobj-conf; then
- $as_echo_n "checking configuration for building shared libraries... " >&6; }
-         eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
- 
--#	case "$SHLIB_LIBS" in
--#	*curses*|*termcap*|*termlib*)	;;
--#	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
--#	esac
-+	case "$SHLIB_LIBS" in
-+	*curses*|*termcap*|*termlib*)	;;
-+	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-+	esac
- 
- 
- 
-diff --git configure.ac configure.ac
-index db788a6..9ac3eef 100644
---- configure.ac
-+++ configure.ac
-@@ -227,10 +227,10 @@ if test -f ${srcdir}/support/shobj-conf; then
-         AC_MSG_CHECKING(configuration for building shared libraries)
-         eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
- 
--#	case "$SHLIB_LIBS" in
--#	*curses*|*termcap*|*termlib*)	;;
--#	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
--#	esac
-+	case "$SHLIB_LIBS" in
-+	*curses*|*termcap*|*termlib*)	;;
-+	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-+	esac
- 	
-         AC_SUBST(SHOBJ_CC)
-         AC_SUBST(SHOBJ_CFLAGS)
-diff --git support/shobj-conf support/shobj-conf
-index 7920f1b..7ac9c9f 100644
---- support/shobj-conf
-+++ support/shobj-conf
-@@ -128,7 +128,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
- 	SHOBJ_LD='${CC}'
- 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
- 
--	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
-+	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
- 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
- 	;;
- 
--- 
-2.29.2
-
diff --git a/srcpkgs/libreadline8/template b/srcpkgs/libreadline8/template
index 4f24bd643c1..c67a36adcc0 100644
--- a/srcpkgs/libreadline8/template
+++ b/srcpkgs/libreadline8/template
@@ -3,11 +3,11 @@ pkgname=libreadline8
 _dist_ver=8.0
 _patch_ver=004
 version="${_dist_ver}.${_patch_ver}"
-revision=2
+revision=1
 bootstrap=yes
 wrksrc="readline-${_dist_ver}"
 build_style=gnu-configure
-configure_args="--with-curses --enable-multibyte bash_cv_termcap_lib=libncursesw"
+configure_args="--with-curses --enable-multibyte"
 makedepends="ncurses-devel"
 short_desc="GNU Readline Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -34,9 +34,16 @@ post_patch() {
 		patch -s -Np0 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/readline${_dist_ver/./}-${p}
 		msg_normal " Applying patch readline${_dist_ver/./}-$p.\n"
 	done
+	vsed -e 's|-Wl,-rpath,$(libdir) ||g' -i support/shobj-conf
 }
 
-post_install() {
+do_build() {
+	make ${makejobs} LDFLAGS="-lncurses" SHLIB_LIBS="-lncurses"
+}
+
+do_install() {
+	make DESTDIR=${DESTDIR} LDFLAGS="-lncurses" SHLIB_LIBS="-lncurses" install
+
 	# Examples and README, COPYING, INSTALL
 	rm -rf ${DESTDIR}/usr/share/{readline,doc}
 }
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 244e4693583..ce261fc0077 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=7.0.3.1
-revision=1
+version=7.0.1.2
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
@@ -92,7 +92,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-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz
  ${_addurl}/ltm-1.0.zip
  ${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  ${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
@@ -116,10 +116,10 @@ distfiles="
  ${_addurl}/ReemKufi-0.7.zip
  ${_addurl}/Scheherazade-2.100.zip
 "
-checksum="6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d
- 959001bc692a67fd65296a0f33179a33414c0754182908396756849da1fee034
- eb1ce39cb90b7c04f69af6f47c75cb65526634315d12230e638e3a561b9b9293
- 442a2a1931549edbdbc6ab8f9fbc6b8e7088fde4d5806cda82263080d3617168
+checksum="6363ee2a7cd1389620bd1933c41be8fa59a8f36ff46c51d3f91e5b31631c7832
+ 80dd257bb073b408cf3f4fedf762af832f80a419caadf342c4a055c03fb5e33c
+ b97db437dc7129f5d65b3cb07181e522dfb257236a68c5347bfe2acf40b215c0
+ e6f75aa0ef0924b5312f06601397b7abe0a326036d103dc96444eb0a071fd631
  1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
  983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
@@ -152,7 +152,7 @@ checksum="6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d
  7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
  a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
  085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
- 3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760
+ f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0
  083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
  c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
  4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
@@ -212,7 +212,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-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz
  ltm-1.0.zip
  368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
  c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
@@ -538,7 +538,7 @@ do_install() {
 
 libreoffice-common_package() {
 	short_desc+=" - Common files"
-	depends="hunspell hyphen mythes openldap libreoffice-i18n-en-US>=${version}_${revision}"
+	depends="hunspell hyphen mythes openldap"
 	skiprdeps=/usr/lib/libreoffice/program/libofficebean.so
 	pkg_install() {
 		_split common
diff --git a/srcpkgs/libsigrokdecode/patches/0001-configure.ac-Add-support-for-Python-3.9.patch b/srcpkgs/libsigrokdecode/patches/0001-configure.ac-Add-support-for-Python-3.9.patch
deleted file mode 100644
index 133f087c63d..00000000000
--- a/srcpkgs/libsigrokdecode/patches/0001-configure.ac-Add-support-for-Python-3.9.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9b0ad5177bd692f7556a4756bdbd2da81d9c34ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Tue, 4 Aug 2020 09:19:44 +0200
-Subject: [PATCH] configure.ac: Add support for Python 3.9.
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git configure.ac configure.ac
-index f9958b3..2917cb3 100644
---- configure.ac
-+++ configure.ac
-@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary])
- # first, since usually only that variant will add "-lpython3.8".
- # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
- SR_PKG_CHECK([python3], [SRD_PKGLIBS],
--	[python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
-+	[python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
- AS_IF([test "x$sr_have_python3" = xno],
- 	[AC_MSG_ERROR([Cannot find Python 3 development headers.])])
- 
--- 
-2.29.2
-
diff --git a/srcpkgs/libsigrokdecode/template b/srcpkgs/libsigrokdecode/template
index 8be3b736373..d4f4ec15339 100644
--- a/srcpkgs/libsigrokdecode/template
+++ b/srcpkgs/libsigrokdecode/template
@@ -1,9 +1,9 @@
 # Template file for 'libsigrokdecode'
 pkgname=libsigrokdecode
 version=0.5.3
-revision=3
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config python3 autoconf automake"
+hostmakedepends="pkg-config python3"
 makedepends="glib-devel python3-devel"
 checkdepends="check-devel"
 short_desc="C library provides basic API for running sigrok protocol decoders"
@@ -13,10 +13,6 @@ homepage="https://sigrok.org/"
 distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0
 
-pre_configure() {
-	autoreconf
-}
-
 libsigrokdecode-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template
index 3e5726d2fc6..1e4d291b0ab 100644
--- a/srcpkgs/libsndfile/template
+++ b/srcpkgs/libsndfile/template
@@ -3,13 +3,13 @@ pkgname=libsndfile
 version=1.0.30
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config python3"
+hostmakedepends="pkg-config python"
 makedepends="alsa-lib-devel libvorbis-devel libflac-devel sqlite-devel opus-devel"
 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"
+homepage="http://www.mega-nerd.com/libsndfile"
+distfiles="https://github.com/erikd/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
 checksum=9df273302c4fa160567f412e10cc4f76666b66281e7ba48370fb544e87e4611a
 
 libsndfile-progs_package() {
diff --git a/srcpkgs/libsysstat/template b/srcpkgs/libsysstat/template
index e37f8207468..e98be5b0765 100644
--- a/srcpkgs/libsysstat/template
+++ b/srcpkgs/libsysstat/template
@@ -1,16 +1,16 @@
 # Template file for 'libsysstat'
 pkgname=libsysstat
-version=0.4.4
+version=0.4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 short_desc="Qt-based interface to system statistics"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/libsysstat/releases/download/${version}/libsysstat-${version}.tar.xz"
-checksum=3997d17692d2ea467d384517aedb8fcc4050f2f66114a1405d42cef0adaafa6b
+checksum=fca482b60fab63bd1eddb594631c76c1373a3b1fcdba19129d49653813e1e967
 replaces="lxde-libsysstat>=0"
 
 libsysstat-devel_package() {
diff --git a/srcpkgs/libusbmuxd/template b/srcpkgs/libusbmuxd/template
index e3ae03e51b9..0592cb5000c 100644
--- a/srcpkgs/libusbmuxd/template
+++ b/srcpkgs/libusbmuxd/template
@@ -1,6 +1,6 @@
 # Template file for 'libusbmuxd'
 pkgname=libusbmuxd
-version=2.0.2
+version=2.0.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -8,10 +8,9 @@ makedepends="libusb-devel libplist-devel"
 short_desc="USB Multiplex Daemon library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
-homepage="https://libimobiledevice.org"
-changelog="https://raw.githubusercontent.com/libimobiledevice/libusbmuxd/master/NEWS"
+homepage="https://marcan.st/blog/iphonelinux/usbmuxd/"
 distfiles="https://github.com/libimobiledevice/libusbmuxd/archive/${version}.tar.gz"
-checksum=8ae3e1d9340177f8f3a785be276435869363de79f491d05d8a84a59efc8a8fdc
+checksum=f93faf3b3a73e283646f4d62b3421aeccf58142266b0eb22b2b13dd4b2362eb8
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 3e9934f65da..5e1f136640e 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=6.9.0
-revision=1
+version=6.6.0
+revision=2
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel libvirt-devel libapparmor-devel"
@@ -11,4 +11,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=772cfeea1660bf2635c773ebcbff70c0d47b9cd6421cbd0d9d7203fac7296800
+checksum=68763f7b7b955032665aa4e0ea0668fc45067574bf2bf6b9f091ffdfd71aea25
diff --git a/srcpkgs/libvirt/patches/fix-virFileSetCOW.patch b/srcpkgs/libvirt/patches/fix-virFileSetCOW.patch
new file mode 100644
index 00000000000..a0fc0786dec
--- /dev/null
+++ b/srcpkgs/libvirt/patches/fix-virFileSetCOW.patch
@@ -0,0 +1,27 @@
+https://www.redhat.com/archives/libvir-list/2020-August/msg00259.html
+
+When COW is not explicitly requested to be disabled or enabled, the
+function is supposed to do nothing on non-BTRFS file systems.
+
+Fixes commit 7230bc95aa78379c9ee20cf59394c5fc4305b75b.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1866157
+
+Signed-off-by: Jiri Denemark <jdenemar redhat com>
+---
+ src/util/virfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/util/virfile.c src/util/virfile.c
+index 6ada3a708c..7f22884b07 100644
+--- src/util/virfile.c
++++ src/util/virfile.c
+@@ -4522,7 +4522,7 @@ virFileSetCOW(const char *path,
+     }
+ 
+     if (buf.f_type != BTRFS_SUPER_MAGIC) {
+-        if (state == VIR_TRISTATE_BOOL_ABSENT) {
++        if (state != VIR_TRISTATE_BOOL_ABSENT) {
+             virReportSystemError(ENOSYS,
+                                  _("unable to control COW flag on '%s', not btrfs"),
+                                  path);
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 4da40ef692b..cc07eca3d0b 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,53 +1,49 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=6.9.0
-revision=1
-build_style=meson
-configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
-hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
- iptables libxslt docbook-xsl dnsmasq libapparmor-devel python3-docutils gettext"
-makedepends="readline-devel libcap-ng-devel attr-devel gnutls-devel
- libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel
- device-mapper-devel eudev-libudev-devel libblkid-devel libpciaccess-devel
- avahi-libs-devel polkit-devel yajl-devel jansson-devel python3-devel
- libssh2-devel fuse-devel libtirpc-devel libapparmor-devel"
-depends="iptables dnsmasq"
+version=6.6.0
+revision=4
+build_wrksrc="build"
+build_style=gnu-configure
+configure_script="../configure"
+configure_args="--without-hal --with-storage-lvm --with-qemu
+ --with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf
+ --with-interface --disable-static --with-apparmor --with-secdriver-apparmor
+ --with-apparmor-profiles"
 short_desc="Virtualization API for controlling virtualization engines"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 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=0d8427ee1d0f448fb339f847838f63b1e7ca0c4acbd14f1faacb129c795cc0c1
+checksum=94e52ddd2d71b650e1a7eb5ab7e651f9607ecee207891216714020b8ff081ef9
 
 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649
 system_accounts="libvirt"
 libvirt_groups="disk,kvm"
 
+hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
+ iptables libxslt docbook-xsl dnsmasq python3 libapparmor-devel python3-docutils
+ gettext"
+makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel
+ gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel
+ libparted-devel device-mapper-devel dbus-devel eudev-libudev-devel libblkid-devel
+ libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel jansson-devel
+ python3-devel libssh2-devel fuse-devel libtirpc-devel
+ libapparmor-devel"
+depends="iptables dnsmasq"
+
 case "$XBPS_TARGET_MACHINE" in
-	i686*) makedepends+=" libnuma-devel" ;;
-	x86_64*) makedepends+=" libnuma-devel xen-devel" ;;
-	*) ;;
+	i686*) configure_args+=" --without-xl"; makedepends+=" libnuma-devel";;
+	x86_64*) configure_args+=" --with-xl"; makedepends+=" libnuma-devel xen-devel";;
+	*) configure_args+=" --without-xen";;
 esac
-
 case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc"
+	*-musl) CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc"
 		hostmakedepends+=" rpcsvc-proto"
 		;;
-	*)
-		# LTO apparently causes the linker to confuse the glibc symbol
-		# xdr_int64_t with that provided by libtirpc, causing a crash.
-		# https://gitlab.com/libvirt/libvirt/-/issues/92
-		configure_args+=" -Db_lto=false"
-		;;
 esac
 
-conf_files="
- /etc/libvirt/nwfilter/*.xml
- /etc/libvirt/qemu/networks/*.xml
- /etc/libvirt/*.conf"
-
+conf_files="/etc/libvirt/nwfilter/*.xml /etc/libvirt/qemu/networks/*.xml /etc/libvirt/*.conf"
 make_dirs="
  /var/lib/libvirt/uml 0755 root root
  /var/lib/libvirt/qemu/nvram 0755 root root
@@ -62,6 +58,14 @@ make_dirs="
  /var/libvirt/boot 0755 root root
  /var/cache/libvirt/qemu 0755 root root"
 
+post_extract() {
+	mkdir -p build
+}
+
+pre_configure() {
+	autoreconf -fi ../
+}
+
 post_install() {
 	# runit services
 	vsv libvirtd
diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 5413fedd51e..d4a732a3859 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -1,6 +1,6 @@
 # Template file for 'libwacom'
 pkgname=libwacom
-version=1.6
+version=1.5
 revision=1
 build_style=meson
 build_helper="qemu"
@@ -13,7 +13,7 @@ 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=6b349fb73c8edcf0288d17c49049648214924846b6a58914c2ed3477ff36d47b
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..6a01dbd86cf 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -1,6 +1,6 @@
 # Template file for 'libwnck'
 pkgname=libwnck
-version=3.36.0
+version=3.32.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bc508150b3ed5d22354b0e6774ad4eee465381ebc0ace45eb0e2d3a4186c925f
+checksum=9595835cf28d0fc6af5526a18f77f2fcf3ca8c09e36741bb33915b6e69b8e3ca
 
 build_options="gir"
 build_options_default="gir"
diff --git a/srcpkgs/libykcs11 b/srcpkgs/libykcs11
index 16a792b7e47..b1ee8840e41 120000
--- a/srcpkgs/libykcs11
+++ b/srcpkgs/libykcs11
@@ -1 +1 @@
-yubico-piv-tool
\ No newline at end of file
+ykpivmgr
\ No newline at end of file
diff --git a/srcpkgs/libykcs11-devel b/srcpkgs/libykcs11-devel
index 16a792b7e47..b1ee8840e41 120000
--- a/srcpkgs/libykcs11-devel
+++ b/srcpkgs/libykcs11-devel
@@ -1 +1 @@
-yubico-piv-tool
\ No newline at end of file
+ykpivmgr
\ No newline at end of file
diff --git a/srcpkgs/libykpiv b/srcpkgs/libykpiv
index 16a792b7e47..b1ee8840e41 120000
--- a/srcpkgs/libykpiv
+++ b/srcpkgs/libykpiv
@@ -1 +1 @@
-yubico-piv-tool
\ No newline at end of file
+ykpivmgr
\ No newline at end of file
diff --git a/srcpkgs/libykpiv-devel b/srcpkgs/libykpiv-devel
index 16a792b7e47..b1ee8840e41 120000
--- a/srcpkgs/libykpiv-devel
+++ b/srcpkgs/libykpiv-devel
@@ -1 +1 @@
-yubico-piv-tool
\ No newline at end of file
+ykpivmgr
\ No newline at end of file
diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index 7c89018651f..03f6cf43237 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.80
+version=2.21.7
 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=052fa2af076cf9b6ac0005b04e649327d38842f3213dee41774b8c29ff55d3b0
+checksum=d6ed668e48752803acaa430b7529a13d7eba5e05ec4864170d3aa5729eb66de7
 
 do_install() {
 	vmkdir usr
diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 253dd698d7f..ba073098e02 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,28 +1,30 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.21.80
+version=2.21.7
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
 configure_script="../configure"
 configure_args="--disable-documentation ac_cv_func_isinf=yes
  --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre"
-hostmakedepends="autogen automake bison flex fontforge gettext guile1.8 perl
- pkg-config python3 t1utils tar texinfo texlive"
-makedepends="gc-devel guile1.8-devel libltdl-devel pango-devel"
-depends="ghostscript python3"
+hostmakedepends="autogen automake flex fontforge gettext gnupg guile1.8 pkg-config
+ t1utils tar texinfo texlive"
+makedepends="gc-devel guile1.8-devel libltdl-devel pango-devel python-devel"
+depends="python ghostscript"
 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=64296eff097e5c5bd0b27a45ea2261b151099534d886119a414eb8947e34aec4
-python_version=3
+checksum=058a18558944305aa7b8bca1a1098dce33a177cf108ed7eafeecdc0e7dd754ff
+python_version=2
 
 if [ -n "${CROSS_BUILD}" ]; then
-	# needs guile-config-1.8
-	hostmakedepends+=" guile1.8-devel"
+	# needs guile-config-1.8 and python-config
+	hostmakedepends+=" guile1.8-devel python-devel"
 	makedepends+=" libfl-devel"
+	configure_args+=" --with-python-lib=python2.7
+	 --with-python-include=${XBPS_CROSS_BASE}/usr/include/python2.7"
 fi
 
 post_extract() {
diff --git a/srcpkgs/linux4.14/files/ppc-dotconfig b/srcpkgs/linux4.14/files/ppc-dotconfig
index 19046164278..33b4ce8e671 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.173 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -661,7 +661,6 @@ CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=y
 # CONFIG_HAS_RAPIDIO is not set
 # CONFIG_RAPIDIO is not set
-CONFIG_PPC_RTAS_FILTER=y
 # CONFIG_NONSTATIC_KERNEL is not set
 
 #
@@ -3346,7 +3345,6 @@ CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_SLAVE is not set
-# CONFIG_SPI_DYNAMIC is not set
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
 CONFIG_PPS=m
diff --git a/srcpkgs/linux4.14/files/ppc64-dotconfig b/srcpkgs/linux4.14/files/ppc64-dotconfig
index d54831de0c2..dd4dc7937ff 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.173 Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -839,7 +839,6 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
-CONFIG_PPC_RTAS_FILTER=y
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_KERNEL_START=0xc000000000000000
@@ -3790,7 +3789,6 @@ 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
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 42e5eb0bf04..7665632ce67 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.204
+version=4.14.199
 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=9e832899ec75dbfce393c9f7a07df24183b28f0bb95ad4dd8b1fa027bc668ad9
+checksum=02f3432a262b3804745501f8c3c51d735133af48a39909df8b031d0b9653d4f9
 python_version=2 #unverified
 patch_args="-Np1"
 
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 18e1ab573e9..8ca2ee9826a 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.59 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: powerpc-linux-gnu-gcc (GCC) 9.1.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=90100
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -461,7 +461,6 @@ CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=y
 # CONFIG_RAPIDIO is not set
-CONFIG_PPC_RTAS_FILTER=y
 
 #
 # Advanced setup
@@ -514,7 +513,6 @@ 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
@@ -1633,7 +1631,6 @@ 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
@@ -1798,6 +1795,7 @@ CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -4562,10 +4560,10 @@ 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_CMDLINE=y
+CONFIG_FB_NOTIFY=y
 CONFIG_FB_DDC=y
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
@@ -4672,6 +4670,7 @@ 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
@@ -5183,6 +5182,7 @@ CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
 CONFIG_USB_CYPRESS_CY7C63=m
@@ -5648,6 +5648,7 @@ CONFIG_IOMMU_SUPPORT=y
 # Rpmsg drivers
 #
 # CONFIG_RPMSG_VIRTIO is not set
+# CONFIG_SOUNDWIRE is not set
 
 #
 # SOC (System On Chip) specific Drivers
diff --git a/srcpkgs/linux4.19/files/ppc64-dotconfig b/srcpkgs/linux4.19/files/ppc64-dotconfig
index bbd7e8eac5a..ac3aae65e7a 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.59 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64-linux-gnu-gcc (GCC) 9.3.0
+# Compiler: powerpc64-linux-gnu-gcc (GCC) 9.1.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=90100
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -403,10 +403,10 @@ 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=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 
 #
@@ -619,7 +619,6 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
-CONFIG_PPC_RTAS_FILTER=y
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_KERNEL_START=0xc000000000000000
@@ -686,7 +685,6 @@ 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
@@ -2002,7 +2000,6 @@ 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
@@ -2180,6 +2177,7 @@ CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -3925,7 +3923,6 @@ 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
@@ -5476,10 +5473,10 @@ 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_CMDLINE=y
+CONFIG_FB_NOTIFY=y
 CONFIG_FB_DDC=m
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
@@ -5620,6 +5617,9 @@ 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
@@ -6352,6 +6352,7 @@ CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
 CONFIG_USB_CYPRESS_CY7C63=m
@@ -7245,6 +7246,7 @@ CONFIG_RPMSG=m
 CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_VIRTIO=m
+# CONFIG_SOUNDWIRE is not set
 
 #
 # SOC (System On Chip) specific Drivers
diff --git a/srcpkgs/linux4.19/files/ppc64le-dotconfig b/srcpkgs/linux4.19/files/ppc64le-dotconfig
index 240d8ea467b..8a29f008e67 100644
--- a/srcpkgs/linux4.19/files/ppc64le-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64le-dotconfig
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.155 Kernel Configuration
+# Linux/powerpc 4.19.110 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: powerpc64le-linux-gnu-gcc (GCC) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90300
@@ -18,7 +18,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_1"
+CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -340,10 +340,10 @@ 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=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 
 #
@@ -533,7 +533,6 @@ CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
 CONFIG_RAPIDIO_RXS_GEN3=m
-CONFIG_PPC_RTAS_FILTER=y
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_KERNEL_START=0xc000000000000000
@@ -602,7 +601,6 @@ 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
@@ -2090,6 +2088,7 @@ CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -3761,7 +3760,6 @@ 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
@@ -5411,6 +5409,9 @@ 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
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index fc0ddc35007..d45fd7a2471 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.155
+version=4.19.154
 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=cbc648f5405cb2b554b7a0f23885742d9969a11d22692287ee756adf940a48d2
+checksum=698c908c846b9ba2ba545cd229a67571fe4de18bb5547429a00d786abe556646
 python_version=2 #unverified
 patch_args="-Np1"
 
diff --git a/srcpkgs/linux4.4/files/ppc-dotconfig b/srcpkgs/linux4.4/files/ppc-dotconfig
index ceadd703ad6..518e8734dac 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.216 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -1951,6 +1951,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
+CONFIG_ADB_PMU_LED_IDE=y
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -4287,6 +4288,7 @@ 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
diff --git a/srcpkgs/linux4.4/files/ppc64-dotconfig b/srcpkgs/linux4.4/files/ppc64-dotconfig
index d3b87911931..b86e7fe10bb 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.216 Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -4947,6 +4947,8 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
diff --git a/srcpkgs/linux4.9/files/ppc-dotconfig b/srcpkgs/linux4.9/files/ppc-dotconfig
index 9dbe117dc17..8ae3bb512ee 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.232 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -4443,6 +4443,7 @@ 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
diff --git a/srcpkgs/linux4.9/files/ppc64-dotconfig b/srcpkgs/linux4.9/files/ppc64-dotconfig
index 0d070e6133e..6351e58de6b 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.232 Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -5187,6 +5187,8 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index 1a5b414c00b..8719e9df4ee 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.75 Kernel Configuration
+# Linux/powerpc 5.4.36 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: powerpc-linux-musl-gcc (GCC) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90300
@@ -12,6 +12,7 @@ CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -21,7 +22,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_1"
+CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -426,7 +427,6 @@ CONFIG_ISA_DMA_API=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
 # CONFIG_FSL_LBC is not set
-CONFIG_PPC_RTAS_FILTER=y
 # end of Bus options
 
 #
@@ -486,7 +486,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
 CONFIG_HAVE_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
@@ -1905,6 +1904,7 @@ CONFIG_SCSI_NETLINK=y
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -4952,6 +4952,7 @@ 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
diff --git a/srcpkgs/linux5.4/files/ppc64-dotconfig b/srcpkgs/linux5.4/files/ppc64-dotconfig
index d3101536c2d..6312ae960bd 100644
--- a/srcpkgs/linux5.4/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64-dotconfig
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.75 Kernel Configuration
+# Linux/powerpc 5.4.36 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: powerpc64-linux-gnu-gcc (GCC) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90300
@@ -12,6 +12,7 @@ CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -21,7 +22,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_1"
+CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -566,7 +567,6 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_FSL_LBC=y
-CONFIG_PPC_RTAS_FILTER=y
 # end of Bus options
 
 CONFIG_NONSTATIC_KERNEL=y
@@ -639,7 +639,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
 CONFIG_HAVE_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
@@ -2326,6 +2325,7 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -4159,7 +4159,6 @@ 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
@@ -6042,6 +6041,9 @@ 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
diff --git a/srcpkgs/linux5.4/files/ppc64le-dotconfig b/srcpkgs/linux5.4/files/ppc64le-dotconfig
index 5196e608448..8be44956298 100644
--- a/srcpkgs/linux5.4/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc64le-dotconfig
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.75 Kernel Configuration
+# Linux/powerpc 5.4.36 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 9.3.0
+# Compiler: powerpc64le-linux-musl-gcc (GCC) 9.3.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90300
@@ -12,6 +12,7 @@ CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -21,7 +22,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="_1"
+CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -491,7 +492,6 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_FSL_LBC=y
-CONFIG_PPC_RTAS_FILTER=y
 # end of Bus options
 
 CONFIG_NONSTATIC_KERNEL=y
@@ -566,7 +566,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
 CONFIG_HAVE_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
@@ -2228,6 +2227,7 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -3988,7 +3988,6 @@ 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
@@ -5826,6 +5825,9 @@ 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
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 312a8a9d629..8dc458187de 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.75
+version=5.4.73
 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=d2466fd6eb5433e7bf287b617b11b2640c65a7ea93a57eb7a80d7f537cbc1470
+checksum=5a424b403b726bbe7dfa1d1524e431676c4a64f22a8db524534ed678bfe576b2
 python_version=3
 patch_args="-Np1"
 
diff --git a/srcpkgs/linux5.8/template b/srcpkgs/linux5.8/template
index 31b22e6e7d9..5b87766375e 100644
--- a/srcpkgs/linux5.8/template
+++ b/srcpkgs/linux5.8/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.8'
 pkgname=linux5.8
-version=5.8.18
+version=5.8.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=4ab4a3f694b7b4cfbe78871eab34c8039ad33692144c45c669827a594da85534
+checksum=568464fce14e8dd070c8f7249dfbdfbe11c87612dfd08520fb73d359b3de3c03
 python_version=3
 patch_args="-Np1"
 
diff --git a/srcpkgs/linux5.9-dbg b/srcpkgs/linux5.9-dbg
deleted file mode 120000
index 399a8d3c414..00000000000
--- 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 399a8d3c414..00000000000
--- 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 85916f13d33..00000000000
--- 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 5aa167fc485..00000000000
--- a/srcpkgs/linux5.9/files/arm64-dotconfig
+++ /dev/null
@@ -1,11299 +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_V